summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-06-30 09:27:24 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-06-30 09:27:24 +0100
commit3b9d1d95b115b3377965abb06ccde835d9796534 (patch)
tree0a1f074636101cc90e410d01b694ac22f02a9875 /doc
parenta0106c589dff533a7d982baa8fc62b843ea56253 (diff)
parent8d0303273495fc478ae62570ecf1675942cfbc41 (diff)
merged from debian-sid
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-key.8.xml21
-rw-r--r--doc/apt-verbatim.ent6
-rw-r--r--doc/makefile1
3 files changed, 19 insertions, 9 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 9bfab84b6..f17f0c45e 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -128,9 +128,10 @@
<listitem>
<para>
- Update the local keyring with the keyring of Debian archive
- keys and removes from the keyring the archive keys which are no
- longer valid.
+ Update the local keyring with the archive keyring and remove from
+ the local keyring the archive keys which are no longer valid.
+ The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
+ distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
</para>
@@ -141,12 +142,14 @@
<listitem>
<para>
- Update the local keyring with the keys of a key server
- and removes from the keyring the archive keys which are no
- longer valid. This requires an installed wget and an APT
- build configured to have a server to fetch from. APT in
- Debian does not support this command, but Ubuntu's APT
- does.
+ Work similar to the <command>update</command> command above, but get the
+ archive keyring from an URI instead and validate it against a master key.
+
+ This requires an installed &wget; and an APT build configured to have
+ a server to fetch from and a master keyring to validate.
+
+ APT in Debian does not support this command and relies on
+ <command>update</command> instead, but Ubuntu's APT does.
</para>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a194a9d0d..14cd70e89 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -148,6 +148,12 @@
</citerefentry>"
>
+<!ENTITY wget "<citerefentry>
+ <refentrytitle><command>wget</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
<!-- Boiler plate docinfo section -->
<!ENTITY apt-email "
<address>
diff --git a/doc/makefile b/doc/makefile
index 8a889c94c..4fcf3bd10 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -101,6 +101,7 @@ $(BUILD)/doc/Doxyfile: Doxyfile.in
$(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
rm -fr $(BUILD)/doc/doxygen
+ mkdir $(BUILD)/doc/doxygen # some versions seem to not create this directory #628799
$(DOXYGEN) $(BUILD)/doc/Doxyfile
touch $(BUILD)/doc/doxygen-stamp