Fix typos in documentation and man pages

Signed-off-by: Guido Günther <agx@sigxcpu.org>

13 files changed, 26 insertions, 26 deletions

diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml
index 3b32fbbf..a73cfa5f 100644
--- a/docs/chapters/building.sgml
+++ b/docs/chapters/building.sgml
@@ -32,7 +32,7 @@
     extracting the current version from the changelog. If you want &gpg; signed
     tags you can use the <option>--git-sign</option> and
     <option>--git-keyid</option> options. To save typing these option can be
-    specified via the configuration files. You can futhermore change the tag
+    specified via the configuration files. You can furthermore change the tag
     format used when creating tags with the <option>debian-tag</option>
     option, the default is <replaceable>debian/&lt;version&gt;</replaceable>.</para>
     <sect1 id="gbp.building.export">
@@ -42,7 +42,7 @@
 <screen>
 &gbp-buildpackage; <option>--git-export-dir</option>=<replaceable>../build-area/</replaceable>
 </screen>
-    <para>This will export the head of the ecurrent branch to
+    <para>This will export the head of the current branch to
     <replaceable>../build-area/package-version</replaceable>, build the
     package. If you don't want to export the current branch head you can use
     <option>--git-export</option> to export any treeish object, here are some
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index 43d54303..d0ae6e4b 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -4,7 +4,7 @@
     <variablelist>
       <varlistentry>
       <term>/etc/git-buildpackage/gbp.conf</term>
-      <listitem><para>system wide configuraton</para></listitem>
+      <listitem><para>system wide configuration</para></listitem>
       </varlistentry>
       <varlistentry>
       <term>~/.gbp.conf</term>
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index c9b1c093..1c05ffc0 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -3,7 +3,7 @@
 
     <sect1 id="gbp.import.existing">
     <title>Importing already existing &debian; packages</title>
-    <para>Importing an already exsting &debian; package into a &git; repository is as easy as:
+    <para>Importing an already existing &debian; package into a &git; repository is as easy as:
     <screen>
 &gbp-import-dsc; package_0.1-1.dsc
     </screen>
@@ -56,7 +56,7 @@ by version number.
 &gbp-import-orig; <filename>/path/to/package_0.2.tar.bz2</filename>
 &gbp-import-orig; <filename>/path/to/package-0.2/</filename>
     </screen>
-    This puts the upstream souces onto the <option>upstream-branch</option> and
+    This puts the upstream sources onto the <option>upstream-branch</option> and
     tags them accordingly (the default tag format is
     <replaceable>upstream/%(version)s</replaceable>).
     The result is then merged onto the <option>debian-branch</option>
@@ -208,7 +208,7 @@ EOF
 
 	<para>
 	  In order to help &gbp-buildpackage; to find upstream tags you need to specify the format
-	  using the <option>--git-upstream-tag</option> comand line option or the the <option>upstream-tag</option>
+	  using the <option>--git-upstream-tag</option> command line option or the the <option>upstream-tag</option>
 	  configuration variable.
 	</para>
 
@@ -237,7 +237,7 @@ upstream-tag = v%(version)s
 	</para>
 
 	<para>First we clone the upstream repository. To avoid any dis ambiguities between the &debian; packaging repository
-	  and the upstream repository we name the upstream repository <replaceable>ustream</replaceable> instead of the
+	  and the upstream repository we name the upstream repository <replaceable>upstream</replaceable> instead of the
 	  default <replaceable>origin</replaceable>.
 	  <screen>
 	    git clone --no-checkout -o upstream git://git.example.com/libgbp.git
diff --git a/docs/chapters/intro.sgml b/docs/chapters/intro.sgml
index 990ca95e..80563bed 100644
--- a/docs/chapters/intro.sgml
+++ b/docs/chapters/intro.sgml
@@ -28,7 +28,7 @@
 
 <sect1 id="gbp.repository">
 	<title>Repository Layout and Terminology</title>
-	<para>It is recommended to have the &debian; packaging on a seprate
+	<para>It is recommended to have the &debian; packaging on a separate
 	branch than the upstream source <footnote><para>this, of course, has
 	no meaning for &debian; native packages</para></footnote>.
 	This is necessary to be able to import
@@ -87,7 +87,7 @@
 	you have to use <command>git push</command> in order to publish your
 	changes to remote repositories like <ulink
 	url="http://git.debian.org/">git.debian.org</ulink>, this can also be
-	automized with &gbp-buildpackage;'s <option>post-tag</option>
+	automatized with &gbp-buildpackage;'s <option>post-tag</option>
 	hook.</para>
 </sect1>
 
@@ -120,7 +120,7 @@
 	<option>--no-merge</option>.  After resolving any potential conflicts
 	go back to the second step.  </para></listitem>
     </orderedlist>
-    <para>These steps will be explaind in more details in the following sections.</para>
+    <para>These steps will be explained in more details in the following sections.</para>
 </sect1>
 
 </chapter>
diff --git a/docs/chapters/releases.sgml b/docs/chapters/releases.sgml
index 64ad2061..172b8db5 100644
--- a/docs/chapters/releases.sgml
+++ b/docs/chapters/releases.sgml
@@ -26,7 +26,7 @@
 &gbp-dch; <option>--snapshot</option>
 </screen>
    <para>will generate a snapshot release with a specially crafted version number
-   and a warning in the changelog that this is a snapshort release:
+   and a warning in the changelog that this is a snapshot release:
    </para>
 <programlisting>
 git-buildpackage (0.3.7~1.gbp470ce2) UNRELEASED; urgency=low
@@ -56,7 +56,7 @@ git-buildpackage (0.3.7~1.gbp470ce2) UNRELEASED; urgency=low
 </screen>
    <para>
    This will add no further entries but simply remove the specially crafted
-   version number and the snapshort header. Again you can use any commit id
+   version number and the snapshot header. Again you can use any commit id
    or tag instead of <option>HEAD</option> if you want to add further changelog
    entries - or you can (of course) use <option>--auto</option> again.
    </para>
@@ -109,7 +109,7 @@ To exclude a commit from the generated changelog use:
 Gbp-Dch: Ignore
 </screen>
 This is e.g. useful if you're just fixing up a previous commit and couldn't
-ammend it or for other janitorial commits that really don't need to end up in
+amend it or for other janitorial commits that really don't need to end up in
 the changelog. For example, the following git commit message
 <screen>
 Set correct branchnames in debian/gbp.conf
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index 7776330f..e50ac066 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -29,7 +29,7 @@
 &gitcmd; <option>checkout</option> dfsg_clean
 &gitcmd; <option>pull</option> <filename>.</filename> upstream
     </screen>
-    <para>Now make this checkout dfsg clean (preverably by a cleanup script), commit
+    <para>Now make this checkout dfsg clean (preferably by a cleanup script), commit
     your changes and merge to your <option>debian-branch</option>:</para>
     <screen>
 cleanup-script.sh
diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.sgml
index 3895e14f..6366bd49 100644
--- a/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@ -348,7 +348,7 @@
         </term>
         <listitem>
           <para>
-          excecute <replaceable>COMMAND</replaceable> after tagging a new
+          execute <replaceable>COMMAND</replaceable> after tagging a new
           version.
           </para>
           <para>
diff --git a/docs/manpages/gbp-create-remote-repo.sgml b/docs/manpages/gbp-create-remote-repo.sgml
index ea22d83d..42b0fe58 100644
--- a/docs/manpages/gbp-create-remote-repo.sgml
+++ b/docs/manpages/gbp-create-remote-repo.sgml
@@ -66,7 +66,7 @@
         <term><option>--remote-name</option>=<replaceable>name</replaceable>
         </term>
         <listitem>
-	  <para>What name git will use when refering to that repository, e.g.
+	  <para>What name git will use when referring to that repository, e.g.
 	  'origin'.</para>
         </listitem>
       </varlistentry>
@@ -84,7 +84,7 @@
         </term>
         <listitem>
 	  <para>Name of a config file section in <filename>gbp.conf</filename>
-          that specifies the above paramters. See <xref linkend="man.gbp.conf">
+          that specifies the above parameters. See <xref linkend="man.gbp.conf">
           manpage for details.
 	  </para>
         </listitem>
diff --git a/docs/manpages/gbp-dch.sgml b/docs/manpages/gbp-dch.sgml
index 04e26024..888d9876 100644
--- a/docs/manpages/gbp-dch.sgml
+++ b/docs/manpages/gbp-dch.sgml
@@ -445,7 +445,7 @@
             when <option>--full</option> is not given).
 	  </para>
 	  <para>
-	    Insteaad of <option>Gbp-Dch</option> the
+	    Instead of <option>Gbp-Dch</option> the
 	    deprecated <option>Git-Dch</option> is still supported.
           </para>
         </listitem>
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index ec10d231..1ed93a30 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -103,7 +103,7 @@
 	    identical to the newly imported tree but preserves the
 	    content of the <filename>debian/</filename> directory
 	    while keeping the current head as well as the newly
-	    iportant trees as parents of the generated commit. This is
+	    important trees as parents of the generated commit. This is
 	    similar to a <option>theirs</option> merge strategy while
 	    preserving <filename>debian/</filename>.
           </para>
@@ -264,7 +264,7 @@
   <refsect1>
     <title>EXAMPLES</title>
     <para>
-    Download and import a new upstream version using the informantion from <filename>debian/watch</filename>
+    Download and import a new upstream version using the information from <filename>debian/watch</filename>
     </para>
     <screen>
       &gbp-import-orig; --uscan
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index d4d2774b..d913ef8e 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -107,7 +107,7 @@
           <command>git-am</command>. Use <option>--topic</option> if you want
           the patch to appear in a separate subdir when exporting the patch queue
           using <option>export</option>. This can be used to separate upstream
-          pathes from &debian; specific patches.
+          patches from &debian; specific patches.
           </para>
         </listitem>
       </varlistentry>
@@ -193,7 +193,7 @@
         <term><option>--[no-]drop</option></term>
         <listitem>
           <para>Whether to drop (delete) the patch queue branch after
-          a succesful export</para>
+          a successful export</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml
index fd658c8d..cfec3d57 100644
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.sgml
@@ -115,7 +115,7 @@
       <varlistentry>
         <term><option>1</option></term>
         <listitem>
-	  <para>An error occured during the pull, see the printed error message for details.</para>
+	  <para>An error occurred during the pull, see the printed error message for details.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/docs/manpages/gbp.conf.sgml b/docs/manpages/gbp.conf.sgml
index b48d9e15..c3feb827 100644
--- a/docs/manpages/gbp.conf.sgml
+++ b/docs/manpages/gbp.conf.sgml
@@ -87,7 +87,7 @@ option which can be turned into configuration file setting by dropping the
 Notice that some option can take Python like lists.
 For example the <xref linkend="man.gbp.import.orig"> commmand has the
 <option>--filter</option>=<parameter>pattern</parameter> option which can
-be truned into a configuration file option like this:
+be turned into a configuration file option like this:
 </para>
 
 <programlisting>
@@ -128,7 +128,7 @@ can't be configured via gbp.conf.
 
 <para>
 <xref linkend="man.gbp.create.remote.repo"> can additionally parse remote site
-configurations from <filename>gbp.conf</filename>. For example a configration like:
+configurations from <filename>gbp.conf</filename>. For example a configuration like:
 </para>
 
 <programlisting>
@@ -148,7 +148,7 @@ gbp-create-remote-repo --remote-config=pkg-libvirt
 </programlisting>
 
 <para>
-This can be useful if you're often creating new remote repositores for
+This can be useful if you're often creating new remote repositories for
 different projects.
 </para>