summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPeter Karlsson <peterk@debian.org>2007-10-08 11:44:54 +0100
committerPeter Karlsson <peterk@debian.org>2007-10-08 11:44:54 +0100
commit21231056c2f4fb82730c0ac7e7f90456668cae38 (patch)
tree1f9ca6a27065dce5014adea7095596ec6a8cb744 /doc
parent28b68bf4207be80d4549579f34262f1248a2e528 (diff)
parent24401c09f0a826ec0074f46dfe70efe3aaf79f25 (diff)
Merge upstream.
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-key.8.xml22
-rw-r--r--doc/cache.sgml2
-rw-r--r--doc/examples/configure-index7
3 files changed, 30 insertions, 1 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index eac61307d..981fa208c 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -63,6 +63,28 @@
</listitem>
</varlistentry>
+ <varlistentry><term>export <replaceable>keyid</replaceable></term>
+ <listitem>
+ <para>
+
+ Output the key <replaceable>keyid</replaceable> to standard output.
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>exportall</term>
+ <listitem>
+ <para>
+
+ Output all trusted keys to standard output.
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
<varlistentry><term>list</term>
<listitem>
<para>
diff --git a/doc/cache.sgml b/doc/cache.sgml
index e257dcd81..aea5a45c3 100644
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -721,6 +721,8 @@ or'd with the current package.
#define pkgSTATE_HalfInstalled 4
#define pkgSTATE_ConfigFiles 5
#define pkgSTATE_Installed 6
+#define pkgSTATE_TriggersAwaited 7
+#define pkgSTATE_TriggersPending 8
</example>
</sect1>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index bf086e9c1..ba3ed3892 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -101,7 +101,7 @@ APT
Install-Suggests "false";
// consider dependencies of packages in this section manual
- Never-MarkAuto-Section "metapackages";
+ Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; };
// Write progress messages on this fd (for stuff like base-config)
Status-Fd "-1";
@@ -227,6 +227,11 @@ Dir "/"
apt-get "/usr/bin/apt-get";
apt-cache "/usr/bin/apt-cache";
};
+
+ // Location of the logfile
+ Log "var/log/apt" {
+ Terminal "term.log";
+ };
};
// Things that effect the APT dselect method