diff options
| author | Michael Vogt <egon@bottom> | 2006-12-01 14:24:33 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-12-01 14:24:33 +0100 |
| commit | ec759a799176881468b85f14c37d3964e199effb (patch) | |
| tree | 1f4d511a670488ef615e5a63535f4a4b14e12c99 /doc | |
| parent | f70974f746ee8dfafc9a1ac6c9c6d9de22356f13 (diff) | |
| parent | 4ab24e53db1d39cd26072f03795efd0f6425a369 (diff) | |
| download | apt-ec759a799176881468b85f14c37d3964e199effb.tar.gz | |
* merged from main
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.8 | 3 | ||||
| -rw-r--r-- | doc/examples/configure-index | 4 | ||||
| -rw-r--r-- | doc/fr/apt_preferences.fr.5.xml | 4 | ||||
| -rw-r--r-- | doc/ja/sources.list.ja.5.xml | 2 |
5 files changed, 10 insertions, 5 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> @@ -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 ac2f2997d..e58ba7b87 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -239,6 +239,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 diff --git a/doc/fr/apt_preferences.fr.5.xml b/doc/fr/apt_preferences.fr.5.xml index 6e1d2043e..aba9f0d06 100644 --- a/doc/fr/apt_preferences.fr.5.xml +++ b/doc/fr/apt_preferences.fr.5.xml @@ -208,7 +208,7 @@ d'« Archive » est <literal>unstable</literal>. <programlisting> Package: * Pin: release a=unstable -Pin-Priority: 500 +Pin-Priority: 50 </programlisting> <simpara>L'entrée suivante affecte une priorité haute à toutes les versions @@ -578,4 +578,4 @@ apt-get install <replaceable>paquet</replaceable>/unstable &manbugs; &traducteur; -</refentry>
\ No newline at end of file +</refentry> diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml index e000d8767..8522a3be3 100644 --- a/doc/ja/sources.list.ja.5.xml +++ b/doc/ja/sources.list.ja.5.xml @@ -391,7 +391,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ <!-- <para>Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US directory, and uses only files found under - <filename>unstable/binary-i3866</filename> on i386 machines, + <filename>unstable/binary-i386</filename> on i386 machines, <filename>unstable/binary-m68k</filename> on m68k, and so forth for other supported architectures. [Note this example only illustrates how to use the substitution variable; non-us is no longer |