docs: fix syntax errors

noticed during XML conversion

9 files changed, 19 insertions, 16 deletions

diff --git a/docs/chapters/intro.xml b/docs/chapters/intro.xml
index fceff318..88c45a6c 100644
--- a/docs/chapters/intro.xml
+++ b/docs/chapters/intro.xml
@@ -15,7 +15,7 @@
       downstream modifications</para></listitem>
       <listitem><para>Import new upstream versions from tarballs with optionally filters applied</para></listitem>
       <listitem><para>Recreate the upstream tarball from information stored in &git;</para></listitem>
-      <listitem><para>Maintain a consistent branch and tag naming within a &git repository, across
+      <listitem><para>Maintain a consistent branch and tag naming within a &git; repository, across
 	  repositories or across a team of developers</para></listitem>
       <listitem><para>Automatically sign generated tags</para></listitem>
       <listitem><para>Make sure you have committed all changes to the right
diff --git a/docs/chapters/patches.xml b/docs/chapters/patches.xml
index e020cfd3..9efa61f0 100644
--- a/docs/chapters/patches.xml
+++ b/docs/chapters/patches.xml
@@ -158,6 +158,7 @@
   build the package as usual.
 </para>
 
+</sect1>
 <sect1 id="gbp.patches.newupstream">
   <title>Importing a new upstream version</title>
 
@@ -241,7 +242,7 @@
 </programlisting>
 
 <para>
-  or you can invoke &gitcmd <option>rebase</option> directly:
+  or you can invoke &gitcmd; <option>rebase</option> directly:
 </para>
 
 <programlisting>
@@ -360,7 +361,7 @@
 
 <para>
   Note that you can you can push out patch-queue branches. Other team
-  members must just be aware that that branches in the patch-queue/
+  members must just be aware that branches in the patch-queue/
   namespace are being rebased frequently and therefore cause
   non fast-forward updates.
 </para>
diff --git a/docs/chapters/special.xml b/docs/chapters/special.xml
index 66eaebad..789ace6d 100644
--- a/docs/chapters/special.xml
+++ b/docs/chapters/special.xml
@@ -142,7 +142,7 @@ EOF
     Whenever you need to work on an arbitrary &debian; package, you can check it
     right into &git; with one command:
 <programlisting>
-  &gbp-import-dsc apt:<filename>package</filename>
+  &gbp-import-dsc; apt:<filename>package</filename>
   cd <filename>package</filename>
   &gitcmd; branch debian
 </programlisting>
@@ -164,7 +164,7 @@ EOF
     fetch the source package from a URL:
 
 <programlisting>
-  &gbp-import-dsc <filename>http://mentors.debian.net/debian/pool/main/i/ipsec-tools/ipsec-tools_0.7.3-9.dsc</filename>
+  &gbp-import-dsc; <filename>http://mentors.debian.net/debian/pool/main/i/ipsec-tools/ipsec-tools_0.7.3-9.dsc</filename>
 </programlisting>
 
    The import works incrementally; you can import new versions on top of
@@ -206,7 +206,7 @@ means.
       for the packaging.
     </para>
 <programlisting>
-  &gbp-buildpackage --git-ignore-new --git-force-create --git-upstream-tree=SLOPPY --git-no-pristine-tar
+  &gbp-buildpackage; --git-ignore-new --git-force-create --git-upstream-tree=SLOPPY --git-no-pristine-tar
 </programlisting>
     <para>
       The important part is the <emphasis>SLOPPY</emphasis> above. The
@@ -229,4 +229,5 @@ means.
       See the <command>dpkg-source</command> manpage for
       details.
    </para>
+   </sect1>
 </chapter>
diff --git a/docs/common.ent b/docs/common.ent
index 2e3d09b6..dae43c70 100644
--- a/docs/common.ent
+++ b/docs/common.ent
@@ -27,9 +27,9 @@
   <!ENTITY gbp-import-orig	"<command>gbp&nbsp;import-orig</command>">
   <!ENTITY gbp-import-srpm      "<command>gbp&nbsp;import-srpm</command>">
   <!ENTITY gbp-pq		"<command>gbp&nbsp;pq</command>">
-  <!ENTITY gbp-pq-export	"<command>gbp&nbsp;pq&nbsp<option>export</option></command>">
-  <!ENTITY gbp-pq-import	"<command>gbp&nbsp;pq&nbsp<option>import</option></command>">
-  <!ENTITY gbp-pq-rebase	"<command>gbp&nbsp;pq&nbsp<option>rebase</option></command>">
+  <!ENTITY gbp-pq-export	"<command>gbp&nbsp;pq&nbsp;<option>export</option></command>">
+  <!ENTITY gbp-pq-import	"<command>gbp&nbsp;pq&nbsp;<option>import</option></command>">
+  <!ENTITY gbp-pq-rebase	"<command>gbp&nbsp;pq&nbsp;<option>rebase</option></command>">
   <!ENTITY gbp-pq-rpm           "<command>gbp&nbsp;pq-rpm</command>">
   <!ENTITY gbp-pristine-tar	"<command>gbp&nbsp;pristine-tar</command>">
   <!ENTITY gbp-pull		"<command>gbp&nbsp;pull</command>">
diff --git a/docs/manpages/gbp-buildpackage-rpm.xml b/docs/manpages/gbp-buildpackage-rpm.xml
index 7de20ed3..251bf528 100644
--- a/docs/manpages/gbp-buildpackage-rpm.xml
+++ b/docs/manpages/gbp-buildpackage-rpm.xml
@@ -639,7 +639,7 @@
     <para>
     <xref linkend="man.gbp.import.srpm"/>,
     <xref linkend="man.gbp.pq.rpm"/>,
-    <xref linkend="man.gbp.rpm.ch">,
+    <xref linkend="man.gbp.rpm.ch"/>,
     <citerefentry>
       <refentrytitle>rpmbuild</refentrytitle>
       <manvolnum>8</manvolnum>
diff --git a/docs/manpages/gbp-buildpackage.xml b/docs/manpages/gbp-buildpackage.xml
index a3135a4c..e42edf49 100644
--- a/docs/manpages/gbp-buildpackage.xml
+++ b/docs/manpages/gbp-buildpackage.xml
@@ -609,12 +609,13 @@
               &gbp.conf;.
             </para>
           </listitem>
+	</varlistentry>
       </variablelist>
     </refsect2>
     <refsect2>
       <title>Build area options</title>
       <para>
-	&gbp-buildpackage can export the source tree to a different
+	&gbp-buildpackage; can export the source tree to a different
 	build-area before performing the build. This options specify
 	if and how this is done:
       </para>
diff --git a/docs/manpages/gbp-dch.xml b/docs/manpages/gbp-dch.xml
index 2613d22a..0cfd9bdc 100644
--- a/docs/manpages/gbp-dch.xml
+++ b/docs/manpages/gbp-dch.xml
@@ -128,7 +128,7 @@
       you're not using the defaults check
       the <option>--upstream-tag</option>
       and <option>--debian-tag</option> options and make sure they match
-      the tags created by e.g. &gbp-import-orig (when using tarballs)
+      the tags created by e.g. &gbp-import-orig; (when using tarballs)
       or upstream's tagging pattern (when using upstream's git directly).
     </para>
   </refsect1>
diff --git a/docs/manpages/gbp-import-srpm.xml b/docs/manpages/gbp-import-srpm.xml
index 94a74d7e..ead40e67 100644
--- a/docs/manpages/gbp-import-srpm.xml
+++ b/docs/manpages/gbp-import-srpm.xml
@@ -248,7 +248,7 @@
     <para>
       <xref linkend="man.gbp.buildpackage.rpm"/>,
       <xref linkend="man.gbp.pq.rpm"/>,
-      <xref linkend="man.gbp.rpm.ch">,
+      <xref linkend="man.gbp.rpm.ch"/>,
       <xref linkend="man.gbp.conf"/>,
       &man.seealso.common;
     </para>
diff --git a/docs/manpages/gbp-rpm-ch.xml b/docs/manpages/gbp-rpm-ch.xml
index 4e4621b3..e0f0d9d7 100644
--- a/docs/manpages/gbp-rpm-ch.xml
+++ b/docs/manpages/gbp-rpm-ch.xml
@@ -338,9 +338,9 @@
   <refsect1>
     <title>SEE ALSO</title>
     <para>
-      <xref linkend="man.gbp.buildpackage.rpm">,
-      <xref linkend="man.gbp.import.srpm">,
-      <xref linkend="man.gbp.conf">,
+      <xref linkend="man.gbp.buildpackage.rpm"/>,
+      <xref linkend="man.gbp.import.srpm"/>,
+      <xref linkend="man.gbp.conf"/>,
       &man.seealso.common;
       <ulink url="https://honk.sigxcpu.org/cl2vcs">
       <citetitle>Cl2vcs</citetitle></ulink>,