aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2012-03-11 19:10:02 +0100
committerGuido Günther <agx@sigxcpu.org>2012-03-11 19:17:32 +0100
commit83dcb280a134e06876af5764033219c810f8d7e5 (patch)
tree22e9b2c802a63557d45600c2d1337963c24eccd4
parentd9571e601a70c9db95b46b36c9e17a94f77136ed (diff)
Move gbp.conf manpage to section 5 and add references
from the other manpages
-rw-r--r--debian/manpages1
-rw-r--r--docs/Makefile2
-rw-r--r--docs/common.ent1
-rw-r--r--docs/manpages/gbp-clone.sgml4
-rw-r--r--docs/manpages/gbp-create-remote-repo.sgml4
-rw-r--r--docs/manpages/gbp-pq.sgml4
-rw-r--r--docs/manpages/gbp-pull.sgml4
-rw-r--r--docs/manpages/gbp.conf.sgml4
-rw-r--r--docs/manpages/git-buildpackage.sgml4
-rw-r--r--docs/manpages/git-dch.sgml7
-rw-r--r--docs/manpages/git-import-dsc.sgml4
-rw-r--r--docs/manpages/git-import-dscs.sgml4
-rw-r--r--docs/manpages/git-import-orig.sgml4
-rw-r--r--docs/manpages/man.conffiles.sgml32
14 files changed, 45 insertions, 34 deletions
diff --git a/debian/manpages b/debian/manpages
index 7fc9e0a..09c93b1 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1,2 @@
docs/*.1
+docs/*.5
diff --git a/docs/Makefile b/docs/Makefile
index b10ec10..a4b4404 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -39,5 +39,5 @@ $(VERSION_ENT): $(GBP_VERSION)
clean:
-rm -r manual-html/
- -rm *.1 manpage.* $(VERSION_ENT)
+ -rm *.1 *.5 manpage.* $(VERSION_ENT)
diff --git a/docs/common.ent b/docs/common.ent
index 9c1b289..2ac025b 100644
--- a/docs/common.ent
+++ b/docs/common.ent
@@ -1,6 +1,7 @@
<!ENTITY dhfirstname "<firstname>Guido</firstname>">
<!ENTITY dhsurname "<surname>Guenther</surname>">
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhconfsection "<manvolnum>5</manvolnum>">
<!ENTITY dhemail "<email>agx@sigxcpu.org</email>">
<!ENTITY dhusername "Guido Guenther">
<!ENTITY git-buildpackage "<command>git-buildpackage</command>">
diff --git a/docs/manpages/gbp-clone.sgml b/docs/manpages/gbp-clone.sgml
index 31c2fed..9c32d0c 100644
--- a/docs/manpages/gbp-clone.sgml
+++ b/docs/manpages/gbp-clone.sgml
@@ -103,6 +103,10 @@
<citerefentry>
<refentrytitle>gbp-pull</refentrytitle>
<manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
</citerefentry>
</para>
</refsect1>
diff --git a/docs/manpages/gbp-create-remote-repo.sgml b/docs/manpages/gbp-create-remote-repo.sgml
index 5e59511..0a21d35 100644
--- a/docs/manpages/gbp-create-remote-repo.sgml
+++ b/docs/manpages/gbp-create-remote-repo.sgml
@@ -127,6 +127,10 @@
<citerefentry>
<refentrytitle>gbp-pull</refentrytitle>
<manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
</citerefentry>
</para>
</refsect1>
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index cb0df02..7e4dff2 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -197,6 +197,10 @@
<refentrytitle>quilt</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
+ </citerefentry>
</para>
</refsect1>
<refsect1>
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml
index 44d667e..f8a50a9 100644
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.sgml
@@ -140,6 +140,10 @@
<citerefentry>
<refentrytitle>gbp-pq</refentrytitle>
<manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
</citerefentry>
</para>
</refsect1>
diff --git a/docs/manpages/gbp.conf.sgml b/docs/manpages/gbp.conf.sgml
index 81296cf..e0330d7 100644
--- a/docs/manpages/gbp.conf.sgml
+++ b/docs/manpages/gbp.conf.sgml
@@ -10,7 +10,7 @@
</refentryinfo>
<refmeta>
<refentrytitle>gbp.conf</refentrytitle>
- &dhsection;
+ &dhconfsection;
</refmeta>
<refnamediv>
<refname>&gbp.conf;</refname>
@@ -227,7 +227,7 @@ the above list of configuration files.</para></listitem>
<citerefentry>
<refentrytitle>git-buildpackage</refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>,
+ </citerefentry>
</para>
</refsect1>
<refsect1>
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index eaf33f4..82ce61e 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -430,6 +430,10 @@
<refentrytitle>git-pbuilder</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
+ </citerefentry>
&man.seealso.common;
</para>
</refsect1>
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 5953a0a..3059f8d 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -326,11 +326,14 @@
<refentrytitle>git-import-orig</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
+ </citerefentry>,
&man.seealso.common;
<ulink url="https://honk.sigxcpu.org/cl2vcs">
- <citetitle>Cl2vcs</citetitle></ulink>
+ <citetitle>Cl2vcs</citetitle></ulink>,
</para>
-
</refsect1>
<refsect1>
<title>AUTHOR</title>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 0181120..d25d9a5 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -197,6 +197,10 @@
<refentrytitle>dget</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
+ </citerefentry>,
&man.seealso.common;
</para>
</refsect1>
diff --git a/docs/manpages/git-import-dscs.sgml b/docs/manpages/git-import-dscs.sgml
index 5ba8b0d..79fee24 100644
--- a/docs/manpages/git-import-dscs.sgml
+++ b/docs/manpages/git-import-dscs.sgml
@@ -96,6 +96,10 @@ options shipped in the package source.</para>
<refentrytitle>git-dch</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
+ </citerefentry>,
&man.seealso.common;
</para>
</refsect1>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 56f5660..b8095e0 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -187,6 +187,10 @@
<refentrytitle>git-dch</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
+ <citerefentry>
+ <refentrytitle>gbp.conf</refentrytitle>
+ &dhconfsection;
+ </citerefentry>,
&man.seealso.common;
</para>
diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.sgml
index c94253d..70c16cc 100644
--- a/docs/manpages/man.conffiles.sgml
+++ b/docs/manpages/man.conffiles.sgml
@@ -1,30 +1,4 @@
<title>CONFIGURATION FILES</title>
- <para>Four configuration files are parsed to set defaults for the above
- commandline arguments: </para>
- <variablelist>
- <varlistentry>
- <term>/etc/git-buildpackage/gbp.conf</term>
- <listitem><para>system wide configuraton</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>~/.gbp.conf</term>
- <listitem><para>per user configuration</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>.gbp.conf</term>
- <listitem><para>per branch configuration, can be published with the
- repository</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>debian/gbp.conf</term>
- <listitem><para>per branch configuration, can be published with the
- repository</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>.git/gbp.conf</term>
- <listitem><para>per repository configuration</para></listitem>
- </varlistentry>
- </variablelist>
- <para>
- See <filename>/etc/git-buildpackage/gbp.conf</filename> for an example.
- </para>
+ <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>