diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-ftparchive.1.xml | 11 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 8 | ||||
| -rw-r--r-- | doc/apt-secure.8.xml | 5 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 11 | ||||
| -rw-r--r-- | doc/examples/configure-index | 3 | ||||
| -rw-r--r-- | doc/files.sgml | 80 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 30 |
7 files changed, 34 insertions, 114 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 852da8ad1..0090d21d9 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -113,10 +113,13 @@ <varlistentry><term>release</term> <listitem><para> The <literal>release</literal> command generates a Release file from a - directory tree. It recursively searches the given directory for - Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, - Sources.bz2, Release and md5sum.txt files. It then writes to - stdout a Release file containing an MD5 digest and SHA1 digest + directory tree. It recursively searches the given directory for uncompressed + <filename>Packages</filename> and <filename>Sources</filename> files and the ones + compressed with <command>gzip</command>, <command>bzip2</command> or <command>lzma</command> + as well as <filename>Release</filename> and <filename>md5sum.txt</filename> files by default + (<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Additional filename patterns + can be added by listing them in <literal>APT::FTPArchive::Release::Patterns</literal>. + It then writes to stdout a Release file containing a MD5, SHA1 and SHA256 digest for each file.</para> <para> Values for the additional metadata fields in the Release file are diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 7eb87b452..1688c9136 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -434,14 +434,6 @@ Configuration Item: <literal>APT::Get::Compile</literal>.</para></listitem> </varlistentry> - <varlistentry><term><option>--install-recommends</option></term> - <listitem><para>Also install recommended packages.</para></listitem> - </varlistentry> - - <varlistentry><term><option>--no-install-recommends</option></term> - <listitem><para>Do not install recommended packages.</para></listitem> - </varlistentry> - <varlistentry><term><option>--ignore-hold</option></term> <listitem><para>Ignore package Holds; This causes <command>apt-get</command> to ignore a hold placed on a package. This may be useful in conjunction with diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index f345c3f89..f8ff678b9 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -148,8 +148,8 @@ (you should make sure you are using a trusted communication channel when retrieving it), add it with <command>apt-key</command> and then run <command>apt-get update</command> so that apt can download - and verify the <filename>Release.gpg</filename> files from the archives you - have configured. + and verify the <filename>InRelease</filename> or <filename>Release.gpg</filename> + files from the archives you have configured. </para> </refsect1> @@ -166,6 +166,7 @@ (provided in apt-utils).</para></listitem> <listitem><para><emphasis>Sign it</emphasis>. You can do this by running + <command>gpg --clearsign -o InRelease Release</command> and <command>gpg -abs -o Release.gpg Release</command>.</para></listitem> <listitem><para><emphasis>Publish the key fingerprint</emphasis>, diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index f00baacea..a423dac24 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -442,12 +442,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> Note also that list entries specified on the command line will be added at the end of the list specified in the configuration files, but before the default entries. To prefer a type in this case - over the ones specified in in the configuration files you can set the option direct - not in list style. + over the ones specified in the configuration files you can set the option direct - not in list style. This will not override the defined list, it will only prefix the list with this type.</para> - <para>While it is possible to add an empty compression type to the order list, but APT in its current - version doesn't understand it correctly and will display many warnings about not downloaded files - - these warnings are most of the time false negatives. Future versions will maybe include a way to - really prefer uncompressed files to support the usage of local mirrors.</para></listitem> + <para>The special type <literal>uncompressed</literal> can be used to give uncompressed files a + preference, but note that most archives doesn't provide uncompressed files so this is mostly only + useable for local mirrors.</para></listitem> </varlistentry> <varlistentry><term>GzipIndexes</term> @@ -618,7 +617,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <refsect2><title>dpkg trigger usage (and related options)</title> <para>APT can call dpkg in a way so it can make aggressive use of triggers over - multiply calls of dpkg. Without further options dpkg will use triggers only in between his + multiple calls of dpkg. Without further options dpkg will use triggers only in between his own run. Activating these options can therefore decrease the time needed to perform the install / upgrade. Note that it is intended to activate these options per default in the future, but as it changes the way APT calling dpkg drastically it needs a lot more testing. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index b87251103..6119d67d0 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -17,6 +17,7 @@ */ quiet "0"; +quiet::NoUpdate "true"; // never update progress information - included in -q=1 // Options for APT in general APT @@ -288,7 +289,7 @@ Acquire lzma "lzma"; gz "gzip"; - Order { "gz"; "lzma"; "bz2"; }; + Order { "uncompressed"; "gz"; "lzma"; "bz2"; }; }; Languages diff --git a/doc/files.sgml b/doc/files.sgml index 108e73670..2d0ae4a44 100644 --- a/doc/files.sgml +++ b/doc/files.sgml @@ -118,82 +118,10 @@ fastest source listed first. The format of each line is: <p> The first item, <var>type</var>, indicates the format for the remainder of the line. It is designed to indicate the structure of the distribution -the line is talking about. Currently the only defined value is <em>deb</em> -which indicates a standard debian archive with a dists dir. - -<sect1>The deb Type - <p> - The <em>deb</em> type is to be a typical two level debian distributions, - dist/<var>distribution</var>/<var>component</var>. Typically distribution - is one of stable, unstable or testing while component is one of main, - contrib, non-free or non-us. The format for the deb line is as follows: - - <p> - deb <var>uri</var> <var>distribution</var> <var>component</var> - [<var>component</var> ...] - - <p> - <var>uri</var> for the <em>deb</em> type must specify the base of the - debian distribution. APT will automatically generate the proper longer - URIs to get the information it needs. <var>distribution</var> can specify - an exact path, in this case the components must be omitted and - <var>distribution</var> must end in a slash. - - <p> - Since only one distribution can be specified per deb line it may be - necessary to list a number of deb lines for the same URI. APT will - sort the URI list after it has generated a complete set to allow - connection reuse. It is important to order things in the sourcelist - from most preferred to least preferred (fastest to slowest). -</sect1> - -<sect1>URI specification -<p> -URIs in the source list support a large number of access schemes which -are listed in the sources.list manpage and can be further extended by -transport binaries placed in /usr/lib/apt/methods. The most important -builtin schemes are: - -<taglist> -<tag>cdrom<item> - The cdrom scheme is special in that If Modified Since queries are never - performed and that APT knows how to match a cdrom to the name it - was given when first inserted. APT also knows all of the possible - mount points the cdrom drives and that the user should be prompted - to insert a CD if it cannot be found. The path is relative to an - arbitrary mount point (of APT's choosing) and must not start with a - slash. The first pathname component is the given name and is purely - descriptive and of the users choice. However, if a file in the root of - the cdrom is called '.disk/info' its contents will be used instead of - prompting. The name serves as a tag for the cdrom and should be unique. - <example> - cdrom:Debian 1.3/debian - </example> - -<tag>http<item> - This scheme specifies a HTTP server for the debian archive. HTTP is preferred - over FTP because If Modified Since queries against the Package file are - possible as well as deep pipelining and resume capabilities. - <example> - http://www.debian.org/archive - </example> - -<tag>ftp<item> - This scheme specifies a FTP connection to the server. FTP is limited because - there is no support for IMS and is hard to proxy over firewalls. - <example> - ftp://ftp.debian.org/debian - </example> - -<tag>file<item> - The file scheme allows an arbitrary directory in the file system to be - considered as a debian archive. This is useful for NFS mounts and - local mirrors/archives. - <example> - file:/var/debian - </example> -</taglist> -</sect1> +the line is talking about. Currently the only defined values are <em>deb</em> +and <em>deb-src</em> which indicate a standard debian (source) archive with a +dists directory. More about these types and the URI specification can be found +in the sources.list manpage. <sect1>Hashing the URI <p> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 6029a7457..212ed6d98 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -63,11 +63,11 @@ <refsect1><title>The deb and deb-src types</title> <para>The <literal>deb</literal> type describes a typical two-level Debian archive, <filename>distribution/component</filename>. Typically, - <literal>distribution</literal> is generally one of - <literal>stable</literal> <literal>unstable</literal> or - <literal>testing</literal> while component is one of <literal>main</literal> - <literal>contrib</literal> <literal>non-free</literal> or - <literal>non-us</literal>. The + <literal>distribution</literal> is generally an archivename like + <literal>stable</literal> or <literal>testing</literal> or a codename like + <literal>&stable-codename;</literal> or <literal>&testing-codename;</literal> + while component is one of <literal>main</literal> <literal>contrib</literal> or + <literal>non-free</literal>. The <literal>deb-src</literal> type describes a debian distribution's source code in the same form as the <literal>deb</literal> type. A <literal>deb-src</literal> line is required to fetch source indexes.</para> @@ -218,18 +218,14 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free a single FTP session will be used for both resource lines.</para> <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout> - <para>Uses HTTP to access the archive at nonus.debian.org, under the - debian-non-US directory.</para> - <literallayout>deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free</literallayout> - - <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-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 - structured like this] - <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout> + <para>Uses HTTP to access the archive at ftp.tlh.debian.org, under the + universe directory, and uses only files found under + <filename>unstable/binary-i386</filename> on i386 machines, + <filename>unstable/binary-amd64</filename> on amd64, and so + forth for other supported architectures. [Note this example only + illustrates how to use the substitution variable; official debian + archives are not structured like this] + <literallayout>deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/</literallayout> </para> </refsect1> |