5 files changed, 57 insertions, 4 deletions
diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.sgml
index d0b5a134..4b4930bd 100644
--- a/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@ -36,7 +36,7 @@
       <arg><option>--git-dist=</option><replaceable>DIST</replaceable></arg>
       <arg><option>--git-arch=</option><replaceable>ARCH</replaceable></arg>
       <arg><option>--git-[no-]pbuilder-autoconf</option></arg>
-      <arg><option>--git-pbuilder-options</option></arg>
+      <arg><option>--git-pbuilder-options</option>=<replaceable>PBUILDER_OPTIONS</replaceable></arg>
       <arg><option>--git-[no-]sign-tags</option></arg>
       <arg><option>--git-keyid=</option><replaceable>GPG-KEYID</replaceable></arg>
       <arg><option>--git-posttag=</option><replaceable>COMMAND</replaceable></arg>
@@ -45,8 +45,9 @@
       <arg><option>--git-prebuild=</option><replaceable>COMMAND</replaceable></arg>
       <arg><option>--git-[no-]build</option></arg>
       <arg><option>--git-[no-]hooks</option></arg>
-      <arg><option>--git-debian-tag=</option><replaceable>TAG-FORMAT</replaceable></arg>
-      <arg><option>--git-upstream-tag=</option><replaceable>TAG-FORMAT</replaceable></arg>
+      <arg><option>--git-debian-tag=</option><replaceable>tag-format</replaceable></arg>
+      <arg><option>--git-upstream-tag=</option><replaceable>tag-format</replaceable></arg>
+      <arg><option>--git-debian-tag-msg=</option><replaceable>tag-msg-format</replaceable></arg>
       <arg><option>--git-force-create</option></arg>
       <arg><option>--git-no-create-orig</option></arg>
       <arg><option>--git-upstream-tree=</option><replaceable>[TAG|BRANCH|TREEISH]</replaceable></arg>
@@ -442,6 +443,14 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>--git-debian-tag-msg=</option><replaceable>tag-msg-format</replaceable>
+        </term>
+        <listitem>
+          <para>use this tag message format when signing Debian versions,
+	  default is <replaceable>%(pkg)s Debian release %(version)s</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--git-force-create</option>
         </term>
         <listitem>
diff --git a/docs/manpages/gbp-dch.sgml b/docs/manpages/gbp-dch.sgml
index 8ffdc4f6..0959ca22 100644
--- a/docs/manpages/gbp-dch.sgml
+++ b/docs/manpages/gbp-dch.sgml
@@ -372,6 +372,17 @@
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--customizations=</option><replaceable>customization-file</replaceable>
+        </term>
+        <listitem>
+          <para>
+          Load Python code from <replaceable>customization-file</replaceable>.
+          At the moment, the only useful thing the code can do is define a
+          custom format_changelog_entry() function.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index 714a5340..db3433bc 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -77,7 +77,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--merge</option></term>
+        <term><option>--[no-]merge</option></term>
         <listitem>
           <para>
           Merge the upstream branch to the debian branch after import
@@ -232,6 +232,15 @@
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--[no-]interactive</option></term>
+        <listitem>
+          <para>
+          Run command interactively, i.e. ask package name and version if
+          needed.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index e0942083..f1afb04d 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -23,6 +23,7 @@
       <arg><option>--[no-]patch-numbers</option></arg>
       <arg><option>--topic=</option><replaceable>topic</replaceable></arg>
       <arg><option>--time-machine=</option><replaceable>num</replaceable></arg>
+      <arg><option>--[no-]drop</option></arg>
       <arg><option>--force</option></arg>
       <group choice="plain">
         <arg><option>drop</option></arg>
@@ -157,6 +158,13 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>--[no-]drop</option></term>
+        <listitem>
+          <para>Whether to drop (delete) the patch queue branch after
+          a succesful export</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--force</option></term>
         <listitem>
           <para>In case of import even import if the branch already
diff --git a/docs/manpages/gbp.sgml b/docs/manpages/gbp.sgml
index 00c9e77f..c0fdddc7 100644
--- a/docs/manpages/gbp.sgml
+++ b/docs/manpages/gbp.sgml
@@ -21,6 +21,8 @@
       &gbp;
       <group choice='req'>
 	<arg><option>--help</option></arg>
+	<arg><option>--version</option></arg>
+	<arg><option>--list-cmds</option></arg>
 	<arg><option>command</option><arg choice='opt' rep='repeat'><option>args</option></arg></arg>
       </group>
     </cmdsynopsis>
@@ -41,6 +43,20 @@
           <para>Print help</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--version</option>
+        </term>
+        <listitem>
+          <para>Print the programs version</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--list-cmds</option>
+        </term>
+        <listitem>
+          <para>List all available commands</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>