From 70aad7d304c3ba42557c4fe06d70b7eedce8365f Mon Sep 17 00:00:00 2001
From: Guido Guenther <agx@sigxcpu.org>
Date: Fri, 8 Feb 2008 16:36:03 +0100
Subject: document default tag formats (Closes: #464100)

---
 docs/chapters/building.sgml         | 2 +-
 docs/chapters/import.sgml           | 6 ++++--
 docs/manpages/git-buildpackage.sgml | 3 ++-
 docs/manpages/git-dch.sgml          | 3 ++-
 docs/manpages/git-import-dsc.sgml   | 6 ++++--
 docs/manpages/git-import-orig.sgml  | 3 ++-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml
index a5c66cc..16360b6 100644
--- a/docs/chapters/building.sgml
+++ b/docs/chapters/building.sgml
@@ -24,7 +24,7 @@
     <option>--git-keyid</option> options. To safe typing these option can be
     specified via the configuration files. You can futhermore change the tag
     format used when creating tags with the <option>debian-tag</option>
-    option.</para>
+    option, the default is <replaceable>debian/&lt;version&gt;</replaceable>.</para>
     <sect1 id="gbp.building.export">
     <title>Using a separate build dir</title>
     <para>Tools like &svn-buildpackage; use a separate build-area. To achieve a similar behaviour
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 1bbca3f..7ff450c 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -27,8 +27,10 @@
 &git-import-orig; <filename>/path/to/package_0.2.tar.bz2</filename>
 &git-import-orig; <filename>/path/to/package-0.2/</filename>
     </screen>
-    This puts the upstream souces onto the <option>upstream-branch</option>.
-    The result of this is then merged onto the <option>debian-branch</option>
+    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>).
+    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
     <option>--debian-branch</option> options. You can also filter out content
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 2f1d998..911f98d 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -160,7 +160,8 @@
         <term><option>--git-debian-tag=</option><replaceable>tag-format</replaceable>
         </term>
         <listitem>
-          <para>use this tag format when tagging Debian versions</para>
+          <para>use this tag format when tagging Debian versions,
+  	  default is <replaceable>debian/&lt;version&gt;</replaceable></para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 0208a65..9f1eccb 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -80,7 +80,8 @@
         <term><option>--debian-tag=</option><replaceable>tag-format</replaceable>
         </term>
         <listitem>
-          <para>tag format used, when tagging debian versions</para>
+          <para>tag format used, when tagging debian versions,
+  	  default is <replaceable>debian/&lt;version&gt;</replaceable></para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 38940f7..6b1746e 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -86,14 +86,16 @@
         <term><option>--debian-tag=</option><replaceable>tag-format</replaceable>
         </term>
         <listitem>
-          <para>use this tag format when tagging Debian versions</para>
+          <para>use this tag format when tagging Debian versions,
+	  default is <replaceable>debian/&lt;version&gt;</replaceable></para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--upstream-tag=</option><replaceable>tag-format</replaceable>
         </term>
         <listitem>
-          <para>use this tag format when tagging upstream versions</para>
+          <para>use this tag format when tagging upstream versions, 
+	  default is <replaceable>upstream/&lt;version&gt;</replaceable></para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index a8900dd..7e8fc1b 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -111,7 +111,8 @@
         <term><option>--upstream-tag=</option><replaceable>tag-format</replaceable>
         </term>
         <listitem>
-          <para>use this tag format when tagging upstream versions</para>
+          <para>use this tag format when tagging upstream versions,
+	  default is <replaceable>upstream/&lt;version&gt;</replaceable></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-- 
cgit v1.2.3