diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 2 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 51 |
3 files changed, 36 insertions, 19 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 9a061e61d..8d6131d58 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.14.2"> +<!ENTITY apt-product-version "0.9.14.3~exp1"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 554206e01..9c612e994 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 87fb4d71e..e770023d5 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -76,22 +76,37 @@ code in the same form as the <literal>deb</literal> type. A <literal>deb-src</literal> line is required to fetch source indexes.</para> - <para>The format for a <filename>sources.list</filename> entry using the <literal>deb</literal> and <literal>deb-src</literal> types is:</para> - <literallayout>deb [ options ] uri distribution [component1] [component2] [...]</literallayout> + <literallayout>deb [ options ] uri suite [component1] [component2] [...]</literallayout> + + <para>Alternatively a rfc822 style format is also supported: + <literallayout> + Type: deb + Uri: http://example.com + Suite: stable + Section: component1 component2 + [option1]: [option1-value] + + Type: deb-src + Uri: http://example.com + Suite: stable + Section: component1 component2 + [option1]: [option1-value] + </literallayout> + </para> <para>The URI for the <literal>deb</literal> type must specify the base of the Debian distribution, from which APT will find the information it needs. - <literal>distribution</literal> can specify an exact path, in which case the - components must be omitted and <literal>distribution</literal> must end with + <literal>suite</literal> can specify an exact path, in which case the + components must be omitted and <literal>suite</literal> must end with a slash (<literal>/</literal>). This is useful for the case when only a particular sub-section of the archive denoted by the URI is of interest. - If <literal>distribution</literal> does not specify an exact path, at least + If <literal>suite</literal> does not specify an exact path, at least one <literal>component</literal> must be present.</para> - <para><literal>distribution</literal> may also contain a variable, + <para><literal>suite</literal> may also contain a variable, <literal>$(ARCH)</literal> which expands to the Debian architecture (such as <literal>amd64</literal> or <literal>armel</literal>) used on the system. This permits architecture-independent @@ -99,17 +114,19 @@ of interest when specifying an exact path, <literal>APT</literal> will automatically generate a URI with the current architecture otherwise.</para> - <para>Since only one distribution can be specified per line it may be necessary - to have multiple lines for the same URI, if a subset of all available - distributions or components at that location is desired. - APT will sort the URI list after it has generated a complete set - internally, and will collapse multiple references to the same Internet - host, for instance, into a single connection, so that it does not - inefficiently establish an FTP connection, close it, do something else, - and then re-establish a connection to that same host. This feature is - useful for accessing busy FTP sites with limits on the number of - simultaneous anonymous users. APT also parallelizes connections to - different hosts to more effectively deal with sites with low bandwidth.</para> + <para>In the traditional style sources.list format since only one + distribution can be specified per line it may be necessary to have + multiple lines for the same URI, if a subset of all available + distributions or components at that location is desired. APT will + sort the URI list after it has generated a complete set internally, + and will collapse multiple references to the same Internet host, + for instance, into a single connection, so that it does not + inefficiently establish an FTP connection, close it, do something + else, and then re-establish a connection to that same host. This + feature is useful for accessing busy FTP sites with limits on the + number of simultaneous anonymous users. APT also parallelizes + connections to different hosts to more effectively deal with sites + with low bandwidth.</para> <para><literal>options</literal> is always optional and needs to be surrounded by square brackets. It can consist of multiple settings in the form |