diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-11 17:45:36 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-11 17:45:36 +0200 |
| commit | c3753d1de25737aed66d6ca14d0473042b7c55a7 (patch) | |
| tree | 750745b523fee36d66b4cdd041fc8117be22c5fe /doc/apt-key.8.xml | |
| parent | 621aeca0bc8fe39c57d6221c7581c758e5822fd0 (diff) | |
| parent | d68d65ad637526e46ea77ab83e07470d26df15fc (diff) | |
merged from donkults experimental branch
Diffstat (limited to 'doc/apt-key.8.xml')
| -rw-r--r-- | doc/apt-key.8.xml | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index cae2b00a0..3748b5e17 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -25,15 +25,7 @@ <refpurpose>APT key management utility</refpurpose> </refnamediv> - <!-- Arguments --> - <refsynopsisdiv> - <cmdsynopsis> - <command>apt-key</command> - <arg><option>--keyring <replaceable>filename</replaceable></option></arg> - <arg><replaceable>command</replaceable></arg> - <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg> - </cmdsynopsis> - </refsynopsisdiv> + &synopsis-command-apt-key; <refsect1><title>Description</title> <para> @@ -45,19 +37,19 @@ <refsect1><title>Commands</title> <variablelist> - <varlistentry><term>add <replaceable>filename</replaceable></term> + <varlistentry><term>add &synopsis-param-filename;</term> <listitem> <para> Add a new key to the list of trusted keys. The key is read - from <replaceable>filename</replaceable>, or standard input if - <replaceable>filename</replaceable> is <literal>-</literal>. + from &synopsis-param-filename;, or standard input if + &synopsis-param-filename; is <literal>-</literal>. </para> </listitem> </varlistentry> - <varlistentry><term>del <replaceable>keyid</replaceable></term> + <varlistentry><term>del &synopsis-param-keyid;</term> <listitem> <para> @@ -68,11 +60,11 @@ </listitem> </varlistentry> - <varlistentry><term>export <replaceable>keyid</replaceable></term> + <varlistentry><term>export &synopsis-param-keyid;</term> <listitem> <para> - Output the key <replaceable>keyid</replaceable> to standard output. + Output the key &synopsis-param-keyid; to standard output. </para> @@ -161,7 +153,7 @@ <refsect1><title>Options</title> <para>Note that options need to be defined before the commands described in the previous section.</para> <variablelist> - <varlistentry><term>--keyring <replaceable>filename</replaceable></term> + <varlistentry><term>--keyring &synopsis-param-filename;</term> <listitem><para>With this option it is possible to specify a specific keyring file the command should operate on. The default is that a command is executed on the <filename>trusted.gpg</filename> file as well as on all parts in the |