aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-07-04 12:14:33 +0200
committerGuido Günther <agx@sigxcpu.org>2016-07-04 17:23:02 +0200
commitb540c982b5c7b0aca4cca8cc9315d36c21b373e8 (patch)
treec2864a1e7bc7903d39920adf6e07264912a27320 /docs
parentbcb24a70bf28aa5b59be95e586a6bd391af68c0d (diff)
additional tarballs: allow to configure components via gbp.conf
Diffstat (limited to 'docs')
-rw-r--r--docs/manpages/gbp-buildpackage.sgml12
-rw-r--r--docs/manpages/gbp-import-orig.sgml5
2 files changed, 9 insertions, 8 deletions
diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.sgml
index 20b36309..5f591e98 100644
--- a/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@ -52,7 +52,7 @@
<arg><option>--git-tarball-dir=</option><replaceable>DIRECTORY</replaceable></arg>
<arg><option>--git-compression=</option><replaceable>TYPE</replaceable></arg>
<arg><option>--git-compression-level=</option><replaceable>LEVEL</replaceable></arg>
- <arg><option>--git-component=</option><replaceable>component</replaceable></arg>
+ <arg rep='repeat'><option>--git-component=</option><replaceable>component</replaceable></arg>
<arg><option>--git-export-dir=</option><replaceable>DIRECTORY</replaceable></arg>
<arg><option>--git-export=</option><replaceable>TREEISH</replaceable></arg>
<arg><option>--git-[no-]pristine-tar</option></arg>
@@ -585,10 +585,12 @@
a feature of the 3.0 (quilt) source format. See
the <command>dpkg-source</command> manpage for details. Note that the
<replaceable>--git-pristine-tar-commit</replaceable>
- option is currently incompatible with this option. It also can't be
- set via &gbp.conf; since it's considered an experimental feature and
- might change incompatibly.
- </para>
+ option is currently incompatible with this option.
+ </para>
+ <para>
+ This is considered an experimental feature and might
+ change incompatibly.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index c0a858a9..2220d128 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -209,9 +209,8 @@
Using additional original tarballs is a feature of the 3.0
(quilt) source format. See
the <command>dpkg-source</command> manpage for
- details. Note that this option can't be set via &gbp.conf;
- since it's considered an experimental feature and might
- change incompatibly.
+ details. This is currently considered an experimental
+ feature and might change incompatibly.
</para>
</listitem>
</varlistentry>