diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-14 12:07:24 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-14 12:07:24 +0100 |
commit | dc4002d8c3c687e6614d01b34e4b6aa929411ea9 (patch) | |
tree | 8a842af457cfb159741b6c84ee7ab6fc094b88e7 /doc | |
parent | 7570b65d5eae54c51689121a317351a1cd42e64d (diff) | |
parent | 19ec5723caa6ea6ab196a9e960c769ded4ee0d28 (diff) |
* merged with apt--mvo
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 | 6 | ||||
-rw-r--r-- | doc/examples/sources.list | 12 | ||||
-rw-r--r-- | doc/fr/apt-get.fr.8.xml | 4 | ||||
-rw-r--r-- | doc/fr/apt_preferences.fr.5.xml | 4 | ||||
-rw-r--r-- | doc/fr/makefile | 2 | ||||
-rw-r--r-- | doc/fr/style.fr.xsl | 9 | ||||
-rw-r--r-- | doc/ja/sources.list.ja.5.xml | 2 | ||||
-rw-r--r-- | doc/ja/style.ja.xsl | 4 |
10 files changed, 30 insertions, 18 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 5b3c1a55c..55edd77e5 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -245,6 +245,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 @@ -260,7 +264,7 @@ Debug pkgDPkgProgressReporting "false"; pkgOrderList "false"; pkgAutoRemove "false"; // show information about automatic removes - + BuildDeps "false"; pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic diff --git a/doc/examples/sources.list b/doc/examples/sources.list index a958899ae..9af1c3c4c 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -1,11 +1,9 @@ # See sources.list(5) for more information, especialy # Remember that you can only use http, ftp or file URIs # CDROMs are managed through the apt-cdrom tool. -deb http://us.archive.ubuntu.com/ubuntu dapper main restricted -deb-src http://us.archive.ubuntu.com/ubuntu dapper main restricted +deb http://http.us.debian.org/debian stable main contrib non-free +deb http://security.debian.org stable/updates main contrib non-free -deb http://security.ubuntu.com/ubuntu dapper-security main restricted -deb-src http://security.ubuntu.com/ubuntu dapper-security main restricted - -deb http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted -deb-src http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted +# Uncomment if you want the apt-get source function to work +#deb-src http://http.us.debian.org/debian stable main contrib non-free +#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml index cfaa76c7d..dccf415b1 100644 --- a/doc/fr/apt-get.fr.8.xml +++ b/doc/fr/apt-get.fr.8.xml @@ -175,8 +175,8 @@ d'�tre supprim�. Avec la commande <literal>source</literal>, <command>apt-get</command> r�cup�re des paquets sources. APT examine les paquets disponibles pour choisir le paquet source � r�cup�rer. Il trouve ensuite et t�l�charge dans le r�pertoire courant -la version la plus r�cente. Les paquets source sont suivis diff�remment que -les paquets binaires, via les lignes de type <literal>deb-src</literal> dans le fichier +la version la plus r�cente. Les paquets source sont g�r�s ind�pendamment +des paquets binaires, via les lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. On n'obtiendra probablement pas les m�mes sources que celles du paquet install� ou celles du paquet qu'on pourrait installer. Si l'option <option>--compile</option> est sp�cifi�e, le paquet est compil� en un binaire .deb 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/fr/makefile b/doc/fr/makefile index 596de7b09..c650dc03a 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -7,7 +7,7 @@ include ../../buildlib/defaults.mak # Do not use XMLTO, build the manpages directly with XSLTPROC XSLTPROC=/usr/bin/xsltproc -STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl +STYLESHEET=./style.fr.xsl # Man pages diff --git a/doc/fr/style.fr.xsl b/doc/fr/style.fr.xsl new file mode 100644 index 000000000..11593bb42 --- /dev/null +++ b/doc/fr/style.fr.xsl @@ -0,0 +1,9 @@ +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0"> + +<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" /> + +<xsl:param name="man.output.encoding" select="'ISO-8859-15'" /> + +</xsl:stylesheet> 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 diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl index 4af2d74cf..c102f1366 100644 --- a/doc/ja/style.ja.xsl +++ b/doc/ja/style.ja.xsl @@ -4,6 +4,6 @@ <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" /> -<xsl:param name="chunker.output.encoding" select="'EUC-JP'" /> +<xsl:param name="man.output.encoding" select="'EUC-JP'" /> -</xsl:stylesheet>
\ No newline at end of file +</xsl:stylesheet> |