summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorbubulle@debian.org <>2006-12-07 19:12:55 +0100
committerbubulle@debian.org <>2006-12-07 19:12:55 +0100
commit5745571310a4f39bf2e0f6c4f0c6a56bed3c0eff (patch)
tree72219ef430e9afcd5a018dcfcea261b9867148db /doc
parent756f23c42c241feecacba7780da08e7ee6c43869 (diff)
parentf88137b8972f57c52bbadf54a80932f225562a95 (diff)
Merged with Michael
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt.83
-rw-r--r--doc/examples/configure-index4
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b98d58737..17f663a35 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -467,7 +467,7 @@
<refsect1><title>See Also</title>
<para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
- &apt-conf;, &apt-config;,
+ &apt-conf;, &apt-config;, &apt-secure;,
The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>
</refsect1>
diff --git a/doc/apt.8 b/doc/apt.8
index 3fb214a3b..6f39c5387 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -32,7 +32,8 @@ None.
.BR apt-cache (8),
.BR apt-get (8),
.BR apt.conf (5),
-.BR sources.list (5)
+.BR sources.list (5),
+.BR apt-secure (8)
.SH DIAGNOSTICS
apt returns zero on normal operation, decimal 100 on error.
.SH BUGS
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 0f0abc30c..73e20aa43 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -237,6 +237,10 @@ DPkg
// Control the size of the command line passed to dpkg.
MaxBytes 1024;
MaxArgs 350;
+
+ // controls if apt will apport on the first dpkg error or if it
+ // tries to install as many packages as possible
+ StopOnError "true";
}
/* Options you can set to see some debugging text They correspond to names