Make Debian and Git spelling consistent

7 files changed, 27 insertions, 27 deletions

diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.sgml
index 0e5561e..8048b1e 100644
--- a/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@ -14,7 +14,7 @@
   <refnamediv>
     <refname>git-buildpackage</refname>
     <refname>gbp-buildpackage</refname>
-    <refpurpose>Build Debian packages from a Git repository</refpurpose>
+    <refpurpose>Build &debian; packages from a &git; repository</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -66,7 +66,7 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-    &gbp-buildpackage; is used to build Debian source and .deb packages from
+    &gbp-buildpackage; is used to build &debian; source and .deb packages from
     a &git; repository.
     </para>
     <para>
@@ -416,7 +416,7 @@
         </term>
         <listitem>
           <para>
-          use this tag format when tagging Debian versions, default is
+          use this tag format when tagging &debian; versions, default is
           <replaceable>debian/%(version)s</replaceable>
           </para>
         </listitem>
@@ -435,7 +435,7 @@
         <term><option>--git-debian-tag-msg=</option><replaceable>tag-msg-format</replaceable>
         </term>
         <listitem>
-          <para>use this tag message format when signing Debian versions,
+          <para>use this tag message format when signing &debian; versions,
 	  default is <replaceable>%(pkg)s Debian release %(version)s</replaceable></para>
         </listitem>
       </varlistentry>
@@ -607,7 +607,7 @@
   <refsect1>
     <title>EXAMPLES</title>
     <para>
-    Build a Debian package using &git-pbuilder; which in turn invokes
+    Build a &debian; package using &git-pbuilder; which in turn invokes
     &cowbuildercmd;.  Instruct cowbuilder to build within a Wheezy chroot for
     i386.
     </para>
diff --git a/docs/manpages/gbp-create-remote-repo.sgml b/docs/manpages/gbp-create-remote-repo.sgml
index e8f6a09..ea22d83 100644
--- a/docs/manpages/gbp-create-remote-repo.sgml
+++ b/docs/manpages/gbp-create-remote-repo.sgml
@@ -93,7 +93,7 @@
         <term><option>--debian-branch</option>=<replaceable>branch_name</replaceable>
         </term>
         <listitem>
-	  <para>The branch in the Git repository the Debian package is being
+	  <para>The branch in the &git; repository the &debian; package is being
 	  developed on, default is <replaceable>master</replaceable>.</para>
         </listitem>
       </varlistentry>
diff --git a/docs/manpages/gbp-dch.sgml b/docs/manpages/gbp-dch.sgml
index 8ffdc4f..22ab568 100644
--- a/docs/manpages/gbp-dch.sgml
+++ b/docs/manpages/gbp-dch.sgml
@@ -15,7 +15,7 @@
   <refnamediv>
     <refname>git-dch;</refname>
     <refname>gbp-dch;</refname>
-    <refpurpose>Generate the Debian changelog from git commit messages</refpurpose>
+    <refpurpose>Generate the &debian; changelog from git commit messages</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -62,7 +62,7 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-    &gbp-dch; reads git commit messages and generates the Debian changelog from
+    &gbp-dch; reads git commit messages and generates the &debian; changelog from
     it. If no arguments are given &gbp-dch; starts from the last tagged Debian
     package version up to the current tip of the current branch. If the
     distribution of the topmost section in
diff --git a/docs/manpages/gbp-import-dsc.sgml b/docs/manpages/gbp-import-dsc.sgml
index e635a3d..965cc87 100644
--- a/docs/manpages/gbp-import-dsc.sgml
+++ b/docs/manpages/gbp-import-dsc.sgml
@@ -15,7 +15,7 @@
   <refnamediv>
     <refname>git-import-dsc</refname>
     <refname>gbp-import-dsc</refname>
-    <refpurpose>Import Debian packages into a Git repository</refpurpose>
+    <refpurpose>Import &debian; packages into a &git; repository</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -51,9 +51,9 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-    &gbp-import-dsc; imports a Debian source package into a &git; repository,
+    &gbp-import-dsc; imports a &debian; source package into a &git; repository,
     notes the package version in the commit logs, and commits the change. All
-    information, including package name, version, Debian  diffs, and upstream
+    information, including package name, version, &debian;  diffs, and upstream
     source is automatically detected from the source package.
     </para>
   </refsect1>
@@ -105,7 +105,7 @@
         </term>
         <listitem>
           <para>
-          use this tag format when tagging Debian versions,
+          use this tag format when tagging &debian; versions,
           default is <replaceable>debian/%(version)s</replaceable>
           </para>
         </listitem>
@@ -125,7 +125,7 @@
         </term>
         <listitem>
           <para>
-          Don't create Debian tag after importing the Debian patch. This can be
+          Don't create &debian; tag after importing the &debian; patch. This can be
           useful if you already created a package but want to further work on
           it after importing it into git.
           </para>
@@ -185,7 +185,7 @@
         </term>
         <listitem>
           <para>
-          When importing the Debian patch, use the author identity as
+          When importing the &debian; patch, use the author identity as
           committer identity.
           </para>
         </listitem>
@@ -195,11 +195,11 @@
         </term>
         <listitem>
           <para>
-          When importing the Debian patch, use the author date as
+          When importing the &debian; patch, use the author date as
           committer date.
           <warning>
             <para>
-            Git will subtly misbehave if the committer date of a commit is not
+            &git; will subtly misbehave if the committer date of a commit is not
             later than or equal to all its parents.
             </para>
           </warning>
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index d6fb269..6b0993f 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -80,7 +80,7 @@
         <term><option>--[no-]merge</option></term>
         <listitem>
           <para>
-          Merge the upstream branch to the debian branch after import
+          Merge the upstream branch to the &debian; branch after import
           </para>
         </listitem>
       </varlistentry>
@@ -89,7 +89,7 @@
         </term>
         <listitem>
           <para>
-          The branch in the Git repository the upstream sources are put
+          The branch in the &git; repository the upstream sources are put
           onto. Default is <replaceable>upstream</replaceable>.
           </para>
         </listitem>
@@ -99,7 +99,7 @@
         </term>
         <listitem>
           <para>
-          The branch in the Git repository the Debian package is being
+          The branch in the &git; repository the &debian; package is being
           developed on, default is <replaceable>master</replaceable>. After
           importing the new sources on the upstream branch, &gbp-import-orig;
           will try to merge the new version onto this branch.
@@ -189,7 +189,7 @@
         <listitem>
           <para>
           Whether to create and keep a symlink from the upstream tarball
-          to a Debian policy conformant upstream tarball name located in
+          to a &debian; policy conformant upstream tarball name located in
           <filename class="directory">../</filename>.
           </para>
           <para>
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index f1afb04..ae1c09f 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -37,11 +37,11 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-    &gbp-pq; helps one to manage quilt patches in Debian packages that are
+    &gbp-pq; helps one to manage quilt patches in &debian; packages that are
     maintained with &gbp;. This is especially useful with packages using the
     3.0 (quilt) source format. With &gbp-pq; you can maintain the quilt patches
     that should be applied to a package on a separate branch called patch-queue
-    branch. So if your Debian package lives on
+    branch. So if your &debian; package lives on
     <replaceable>master</replaceable> the associated patch-queue branch will be
     called <replaceable>patch-queue/master</replaceable>.
     </para>
@@ -105,7 +105,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.
+          pathes from &debian; specific patches.
           </para>
         </listitem>
       </varlistentry>
diff --git a/docs/manpages/gbp.sgml b/docs/manpages/gbp.sgml
index c0fdddc..4ba7569 100644
--- a/docs/manpages/gbp.sgml
+++ b/docs/manpages/gbp.sgml
@@ -14,7 +14,7 @@
   </refmeta>
   <refnamediv>
     <refname>&gbp;</refname>
-    <refpurpose>Maintain Debian packages in Git</refpurpose>
+    <refpurpose>Maintain &debian; packages in &git;</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -30,7 +30,7 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-    &gbp; is used to maintain Debian source packages in the &git; version control system.
+    &gbp; is used to maintain &debian; source packages in the &git; version control system.
     </para>
   </refsect1>
   <refsect1>
@@ -88,7 +88,7 @@
         <term>import-dsc
         </term>
         <listitem>
-          <para>Import a Debian source package into a &git; repository</para>
+          <para>Import a &debian; source package into a &git; repository</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -97,7 +97,7 @@
         <term>import-dscs
         </term>
         <listitem>
-          <para>Import several Debian source packages into a &git; repository, sorted
+          <para>Import several &debian; source packages into a &git; repository, sorted
 	  by version number</para>
         </listitem>
       </varlistentry>