aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2012-02-25 15:57:48 +0100
committerGuido Günther <agx@sigxcpu.org>2012-02-25 15:57:48 +0100
commit09e40806c66401745ef2bdc3d0d89f7bd07fb395 (patch)
tree1a625e87d40b5638359c60c7049b2f321a0f8b40
parent10188096fca7f74f9af047a5be82fa1b2279dd45 (diff)
docs: makeversion pattern match the code
Closes: #650465
-rw-r--r--docs/chapters/import.sgml2
-rw-r--r--docs/manpages/git-buildpackage.sgml2
-rw-r--r--docs/manpages/git-dch.sgml2
-rw-r--r--docs/manpages/git-import-dsc.sgml4
-rw-r--r--docs/manpages/git-import-orig.sgml2
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 54d23b8..a05b8af 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -52,7 +52,7 @@ by version number.
</screen>
This puts the upstream souces onto the <option>upstream-branch</option> and
tags them accordingly (the default tag format is
- <replaceable>upstream/&lt;version&gt;</replaceable>).
+ <replaceable>upstream/%(version)s</replaceable>).
The result is then merged onto the <option>debian-branch</option>
and a new &debian; changelog entry is created. You can again specify
different branch names via the <option>--upstream-branch</option> and
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 4a452ce..eaf33f4 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -292,7 +292,7 @@
</term>
<listitem>
<para>use this tag format when tagging Debian versions,
- default is <replaceable>debian/&lt;version&gt;</replaceable></para>
+ default is <replaceable>debian/%(version)s</replaceable></para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 5529676..5953a0a 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -96,7 +96,7 @@
</term>
<listitem>
<para>tag format used, when tagging debian versions,
- default is <replaceable>debian/&lt;version&gt;</replaceable></para>
+ default is <replaceable>debian/%(version)s</replaceable></para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 74f1fa8..0181120 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -102,7 +102,7 @@
</term>
<listitem>
<para>use this tag format when tagging Debian versions,
- default is <replaceable>debian/&lt;version&gt;</replaceable></para>
+ default is <replaceable>debian/%(version)s</replaceable></para>
</listitem>
</varlistentry>
<varlistentry>
@@ -110,7 +110,7 @@
</term>
<listitem>
<para>use this tag format when tagging upstream versions,
- default is <replaceable>upstream/&lt;version&gt;</replaceable></para>
+ default is <replaceable>upstream/%(version)s</replaceable></para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index b768fa9..56f5660 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -116,7 +116,7 @@
</term>
<listitem>
<para>use this tag format when tagging upstream versions,
- default is <replaceable>upstream/&lt;version&gt;</replaceable></para>
+ default is <replaceable>upstream/%(versions)s</replaceable></para>
</listitem>
</varlistentry>
<varlistentry>