docs: make refentry ids of manpages more consistent

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

14 files changed, 20 insertions, 20 deletions

diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml
index c6e959d3..5005416a 100644
--- a/docs/chapters/building.sgml
+++ b/docs/chapters/building.sgml
@@ -87,7 +87,7 @@ export-dir=../build-area
     <title>Running lintian</title>
 	<para>&git-buildpackage; exports several variables into the
 	<option>posttag</option>'s environment (for details see the <xref
-	linkend="gbp.man.git.buildpackage">).
+	linkend="man.git.buildpackage">).
 	To invoke &lintian; we need to tell it where to find the changes file:
 <programlisting>
 <command>git-buildpackage</command> <option>--git-postbuild</option>=<replaceable>'lintian $GBP_CHANGES_FILE'</replaceable>
@@ -155,7 +155,7 @@ echo "done."
     <title>Running postexport hook</title>
     <para>&git-buildpackage; exports several variables into the
 	<option>postexport</option>'s environment (for details see
-	the <xref linkend="gbp.man.git.buildpackage">). The motivation
+	the <xref linkend="man.git.buildpackage">). The motivation
 	for the postexport action is to allow further adjustment of
 	the sources prior to building the package. A typical use case
 	scenario is to allow creating multiple source and binary
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index cb9bd5e0..1cbe0b7d 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -91,6 +91,6 @@ upstream-branch=notdfsgclean
 git-log=--no-merges
 </programlisting>
 <para>
-For more details see the <xref linkend="gbp.man.gbp.conf"> manual page.
+For more details see the <xref linkend="man.gbp.conf"> manual page.
 </para>
 </chapter>
diff --git a/docs/manpages/gbp-clone.sgml b/docs/manpages/gbp-clone.sgml
index 9c32d0c8..45c7e2fe 100644
--- a/docs/manpages/gbp-clone.sgml
+++ b/docs/manpages/gbp-clone.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.clone">
+<refentry id="man.gbp.clone">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/gbp-create-remote-repo.sgml b/docs/manpages/gbp-create-remote-repo.sgml
index 93cf9268..aa49e629 100644
--- a/docs/manpages/gbp-create-remote-repo.sgml
+++ b/docs/manpages/gbp-create-remote-repo.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.create.remote.repo">
+<refentry id="man.gbp.create.remote.repo">
   <refentryinfo>
     <address>
       &dhemail;
@@ -83,7 +83,7 @@
         </term>
         <listitem>
 	  <para>Name of a config file section in <filename>gbp.conf</filename>
-          that specifies the above paramters. See <xref linkend="gbp.man.gbp.conf">
+          that specifies the above paramters. See <xref linkend="man.gbp.conf">
           manpage for details.
 	  </para>
         </listitem>
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index 7e4dff29..00cafedc 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.pq">
+<refentry id="man.gbp.pq">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml
index f8a50a92..c100660b 100644
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.pull">
+<refentry id="man.gbp.pull">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/gbp.conf.sgml b/docs/manpages/gbp.conf.sgml
index 4336fc48..a0824e4b 100644
--- a/docs/manpages/gbp.conf.sgml
+++ b/docs/manpages/gbp.conf.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.conf">
+<refentry id="man.gbp.conf">
   <refentryinfo>
     <address>
       &dhemail;
@@ -68,7 +68,7 @@
 <para>
 
 <option>key=value</option> pairs of the command sections reflect the command line
-options and their settings. For example <xref linkend="gbp.man.git.buildpackage">
+options and their settings. For example <xref linkend="man.git.buildpackage">
 manualpage contains the <option>--git-export-dir</option>=<parameter>diirectory</parameter>
 option which can be turned into configuration file setting by dropping the
 <option>--git</option> prefix with:
@@ -81,7 +81,7 @@ option which can be turned into configuration file setting by dropping the
 
 <para>
 Notice that some option are actually repeatable, or take Python lists.
-For example the <xref linkend="gbp.man.git.import.orig"> commmand has the
+For example the <xref linkend="man.git.import.orig"> commmand has the
 <option>--filter</option>=<parameter>pattern</parameter> option which can
 be truned into a configuration file option like this:
 </para>
@@ -103,7 +103,7 @@ An alternative way is to write it using Python list syntax:
 
 <para>
 Boolean options can bei either <option>True</option> or <option>False</option>. For example
-<xref linkend="gbp.man.git.import.orig">; has the <option>--pristine-tar</option> and
+<xref linkend="man.git.import.orig">; has the <option>--pristine-tar</option> and
 <option>--no-pristine-tar</option> options which translate to:
 </para>
 <programlisting>
@@ -133,7 +133,7 @@ can't be configured via gbp.conf.
 </note>
 
 <para>
-<xref linkend="gbp.man.gbp.create.remote.repo"> can additionally parse remote site
+<xref linkend="man.gbp.create.remote.repo"> can additionally parse remote site
 configurations from <filename>gbp.conf</filename>. For example a configration like:
 </para>
 
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 7b06b859..a4151613 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.buildpackage">
+<refentry id="man.git.buildpackage">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 07f003e9..a009a589 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.dch">
+<refentry id="man.git.dch">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index fd049797..cb73fed4 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.import.dsc">
+<refentry id="man.git.import.dsc">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/git-import-dscs.sgml b/docs/manpages/git-import-dscs.sgml
index 79fee247..3496cb11 100644
--- a/docs/manpages/git-import-dscs.sgml
+++ b/docs/manpages/git-import-dscs.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.import.dscs">
+<refentry id="man.git.import.dscs">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index fb9f7a94..610f3ba2 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.import.orig">
+<refentry id="man.git.import.orig">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.sgml
index 70c16cca..70d1ca7f 100644
--- a/docs/manpages/man.conffiles.sgml
+++ b/docs/manpages/man.conffiles.sgml
@@ -1,4 +1,4 @@
     <title>CONFIGURATION FILES</title>
     <para>Several <filename>gbp.conf</filename> files are parsed 
     to set defaults for the above commandline arguments. See the
-    <xref linkend="gbp.man.gbp.conf"> manpage for details.</para>
+    <xref linkend="man.gbp.conf"> manpage for details.</para>
diff --git a/docs/manual.sgml b/docs/manual.sgml
index 4b9026fa..eab37452 100644
--- a/docs/manual.sgml
+++ b/docs/manual.sgml
@@ -25,7 +25,7 @@
   &ch.cfgfile;
   &ch.special;
 
-  <appendix id="gbp.man.reference">
+  <appendix id="man.reference">
     <title>Command Reference</title>
     &man.git.buildpackage;
     &man.git.importdsc;