summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-04-25 17:02:24 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-04-25 17:02:24 +0200
commit99b4fefe0f303cf5ae5e8b9116404fc0fcc96e47 (patch)
tree1a3b69e8d10cbf78a7ad278dab0e5b40bf24c69f /doc
parent4d74894b85227f42b65a84f459f011d74946e4f4 (diff)
parentcc04f4ce9eaaf0945775d5233806de7da5d21ff6 (diff)
merged from donkult
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-config.8.xml16
-rw-r--r--doc/apt-verbatim.ent3
2 files changed, 18 insertions, 1 deletions
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index b6fcf4bf2..94aeec059 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -85,7 +85,21 @@ eval $RES
&apt-cmdblurb;
<variablelist>
-
+ <varlistentry>
+ <term><option>--empty</option></term>
+ <listitem><para>Include options which have an empty value. This is the default, so
+ use --no-empty to remove them from the output.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n</replaceable>'</option></term>
+ <listitem><para>Defines the output of each config option. &percnt;t will be replaced with the tagname,
+ &percnt;f with the complete tagname and &percnt;v with the value of the option.
+ Use uppercase letters and the respective values will be quoted. Additionally
+ &percnt;n will be replaced by a newline, &percnt;N by a tab. A &percnt; can be
+ printed by using &percnt;&percnt;.</para></listitem>
+ </varlistentry>
+
&apt-commonoptions;
</variablelist>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index ad4554e2f..3846c17e3 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -269,8 +269,11 @@
&synopsis-help;
</group>
</cmdsynopsis></refsynopsisdiv>">
+<!--<arg><option>- -format '<replaceable>&#37;f \"&#37;v\";&#37;n</replaceable>'</option></arg>-->
<!ENTITY synopsis-command-apt-config "<refsynopsisdiv><cmdsynopsis>
<command>apt-config</command>
+ <arg><option>--empty</option></arg>
+ <arg><option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n</replaceable>'</option></arg>
&synopsis-arg-option;
&synopsis-arg-config;
<group choice='req'>