summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-cache.8.xml2
-rw-r--r--doc/apt-get.8.xml15
-rw-r--r--doc/apt.83
-rw-r--r--doc/apt_preferences.5.xml9
-rw-r--r--doc/cache.sgml3
-rw-r--r--doc/dpkg-tech.sgml2
-rw-r--r--doc/examples/configure-index53
-rw-r--r--doc/examples/sources.list12
-rw-r--r--doc/fr/apt-get.fr.8.xml4
-rw-r--r--doc/fr/apt_preferences.fr.5.xml4
-rw-r--r--doc/fr/makefile2
-rw-r--r--doc/fr/style.fr.xsl9
-rw-r--r--doc/ja/sources.list.ja.5.xml2
-rw-r--r--doc/ja/style.ja.xsl4
14 files changed, 100 insertions, 24 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 2779f2501..c1e65332d 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -151,7 +151,7 @@ Reverse Provides:
a dependency but were not provided by any package. Missing packages may
be in evidence if a full distribution is not accessed, or if a package
(real or virtual) has been dropped from the distribution. Usually they
- are referenced from Conflicts statements.</para>
+ are referenced from Conflicts or Breaks statements.</para>
</listitem>
<listitem><para><literal>Total distinct</literal> versions is the number of package versions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b98d58737..3c245b83b 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -47,6 +47,7 @@
<arg>check</arg>
<arg>clean</arg>
<arg>autoclean</arg>
+ <arg>autoremove</arg>
</group>
</cmdsynopsis>
</refsynopsisdiv>
@@ -203,6 +204,11 @@
<literal>APT::Clean-Installed</literal> will prevent installed packages from being
erased if it is set to off.</para></listitem>
</varlistentry>
+
+ <varlistentry><term>autoremove</term>
+ <listitem><para><literal>autoremove</literal> is used to remove packages that were automatically
+ installed to satisfy dependencies for some package and that are no more needed.</para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>
@@ -382,6 +388,13 @@
Configuration Item: <literal>APT::Get::Remove</literal>.</para></listitem>
</varlistentry>
+ <varlistentry><term><option>--auto-remove</option></term>
+ <listitem><para>If the command is either <literal>install</literal> or <literal>remove</literal>,
+ then this option acts like running <literal>autoremove</literal> command, removing the unused
+ dependency packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>.
+ </para></listitem>
+ </varlistentry>
+
<varlistentry><term><option>--only-source</option></term>
<listitem><para>Only has meaning for the
<literal>source</literal> and <literal>build-dep</literal>
@@ -467,7 +480,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/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 3e50bef8c..ab0107d36 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -143,10 +143,11 @@ separated by blank lines. Records can have one of two forms, a specific form
and a general form.
<itemizedlist>
<listitem>
-<simpara>The specific form assigns a priority (a "Pin-Priority") to a
-specified package and specified version or version range. For example,
+<simpara>The specific form assigns a priority (a "Pin-Priority") to one or more
+specified packages and specified version or version range. For example,
the following record assigns a high priority to all versions of
-the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".</simpara>
+the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".
+Multiple packages can be separated by spaces.</simpara>
<programlisting>
Package: perl
@@ -183,7 +184,7 @@ belonging to any distribution whose Archive name is "<literal>unstable</literal>
<programlisting>
Package: *
Pin: release a=unstable
-Pin-Priority: 50
+Pin-Priority: 500
</programlisting>
<simpara>The following record assigns a high priority to all package versions
diff --git a/doc/cache.sgml b/doc/cache.sgml
index aa87db986..e257dcd81 100644
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -492,7 +492,7 @@ This is the parsed priority value of the package.
Dependency contains the information for a single dependency record. The records
are split up like this to ease processing by the client. The base of list
linked list is Version.DependsList. All forms of dependencies are recorded
-here including Conflicts, Suggests and Recommends.
+here including Conflicts, Breaks, Suggests and Recommends.
<p>
Multiple depends on the same package must be grouped together in
@@ -671,6 +671,7 @@ of them.
#define pkgDEP_Recommends 4
#define pkgDEP_Conflicts 5
#define pkgDEP_Replaces 6
+#define pkgDEP_Breaks 8
</example>
</sect1>
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 23372d71f..7c6e023dd 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -46,6 +46,8 @@ The basic dpkg package control file supports the following major features:-
productivity of the package
<item>Conflicts, to specify a package which must NOT be installed
in order for the package to be configured
+ <item>Breaks, to specify a package which is broken by the
+ package and which should therefore not be configured while broken
</list>
Each of these dependencies can specify a version and a depedency on that
version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 0f0abc30c..baa8b9a5c 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -24,11 +24,16 @@ APT
{
Architecture "i386";
Build-Essential "build-essential";
-
+
+ NeverAutoRemove { "linux-kernel.*"; }; // packages that should never
+ // considered for autoRemove
+
// Options for apt-get
Get
{
Arch-Only "false";
+ AutomaticRemove "false";
+ HideAutoRemove "false";
Download-Only "false";
Simulate "false";
Assume-Yes "false";
@@ -90,6 +95,16 @@ APT
Cache-Limit "4194304";
Default-Release "";
+ // consider Recommends, Suggests as important dependencies that should
+ // be installed by default
+ Install-Recommends "false";
+ Install-Suggests "false";
+
+ // install recommends automatically for packages in this section
+ Install-Recommends-Section "metapackages";
+
+ // consider dependencies of packages in this section manual
+ Never-MarkAuto-Section "metapackages";
// Write progress messages on this fd (for stuff like base-config)
Status-Fd "-1";
@@ -120,6 +135,18 @@ Acquire
Dl-Limit "7"; // 7Kb/sec maximum download rate
};
+ // HTTPS method configuration:
+ // - uses the http proxy config
+ // - uses the http cache-control values
+ // - uses the http Dl-Limit values
+ https
+ {
+ Verify-Peer "false";
+ SslCert "/etc/apt/some.pem";
+ CaPath "/etc/ssl/certs";
+ Verify-Host" "2";
+ };
+
ftp
{
Proxy "ftp://127.0.0.1/";
@@ -160,6 +187,20 @@ Acquire
{
Options {"--ignore-time-conflict";} // not very usefull on a normal system
};
+
+ mirror
+ {
+ RefreshInterval "360"; // refresh interval in minutes
+ MaxAge "90"; // max age for a mirror file in days before
+ // it gets deleted
+ // mirror failure reporting script
+ ProblemReporting "/usr/lib/apt/apt-report-mirror-failure";
+ // mirror failure reporting url
+ ReportFailures "http://example.com/mirror-failure";
+ };
+
+ // translations can be set here to "none", "environment" or "$locale"
+ Translation "none";
};
// Directory layout
@@ -173,6 +214,7 @@ Dir "/"
userstatus "status.user";
status "/var/lib/dpkg/status";
cdroms "cdroms.list";
+ mirrors "mirrors/";
};
// Location of the cache dir
@@ -237,6 +279,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
@@ -251,16 +297,17 @@ Debug
pkgDPkgPM "false";
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
Acquire::Http "false"; // Show http command traffic
+ Acquire::Https "false"; // Show https debug
Acquire::gpgv "false"; // Show the gpgv traffic
+ Acquire::Mirror "false"; // Show debugging of the mirror method
aptcdrom "false"; // Show found package files
IdentCdrom "false";
-
}
/* Whatever you do, do not use this configuration file!! Take out ONLY
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9af1c3c4c..a958899ae 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,9 +1,11 @@
# 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://http.us.debian.org/debian stable main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu dapper main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper 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
+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
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'«&nbsp;Archive&nbsp;» 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 01:58:35 +0000