summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-25 21:54:52 +0100
committerMichael Vogt <mvo@debian.org>2014-01-25 21:54:52 +0100
commit62dcafb391a940534d5fb3b804dc461b1187d706 (patch)
tree83d28ffd4b0af97a0bba4f59c9a44e18091186b6 /doc
parente093518c03b49a2def83d8b680be4490fed6e69c (diff)
parent8c39c4b6e65036390b8ca4d74174192739a4139d (diff)
Merge branch 'debian/experimental-no-abi-break' into debian/sid
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot149
-rw-r--r--doc/po/de.po198
-rw-r--r--doc/po/es.po198
-rw-r--r--doc/po/fr.po198
-rw-r--r--doc/po/it.po198
-rw-r--r--doc/po/ja.po198
-rw-r--r--doc/po/pl.po198
-rw-r--r--doc/po/pt.po198
-rw-r--r--doc/po/pt_BR.po159
-rw-r--r--doc/sources.list.5.xml58
11 files changed, 1143 insertions, 611 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 9a061e61d..f3a24e209 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~exp5">
<!-- (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..f50068f8f 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.14.2\n"
+"Project-Id-Version: apt-doc 0.9.14.3~exp4\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-24 23:31+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"
@@ -1132,7 +1132,7 @@ msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
+#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
msgid "See Also"
msgstr ""
@@ -3624,7 +3624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
msgid "Examples"
msgstr ""
@@ -4695,35 +4695,65 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
+#: sources.list.5.xml:82
#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
+#: sources.list.5.xml:114
msgid ""
-"<literal>distribution</literal> may also contain a variable, "
+"<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 "
@@ -4733,22 +4763,23 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
+#: sources.list.5.xml:122
msgid ""
-"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."
+"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."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -4759,7 +4790,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
"can be used to specify for which architectures information should be "
@@ -4768,7 +4799,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
msgid ""
"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
"and "
@@ -4778,7 +4809,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the "
@@ -4790,7 +4821,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -4799,12 +4830,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -4814,17 +4845,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -4832,7 +4863,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -4840,7 +4871,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -4851,7 +4882,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -4864,7 +4895,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -4873,7 +4904,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -4882,12 +4913,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme "
@@ -4899,42 +4930,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -4942,7 +4973,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -4950,33 +4981,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -4985,19 +5016,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under "
@@ -5009,7 +5040,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 8983abb64..3e3d19cc3 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\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-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1572,7 +1572,7 @@ msgstr "Dateien"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5210,7 +5210,7 @@ msgstr ""
"filename> gelesenen Anbieter aus."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Beispiele"
@@ -6697,7 +6697,7 @@ msgstr ""
"benötigt, um Quellindizes herunterzuladen."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6706,21 +6706,62 @@ msgstr ""
"<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "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 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 one <literal>component</literal> must be present."
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-"
@@ -6734,15 +6775,24 @@ msgstr ""
"angegeben sein."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</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 <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> könnte außerdem eine Variable, <literal>"
"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie "
@@ -6754,18 +6804,32 @@ msgstr ""
"Architektur generieren."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"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."
+#: sources.list.5.xml:122
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"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."
msgstr ""
"Da pro Zeile nur eine Distribution angegeben werden kann, könnte es nötig "
"sein, mehrere Zeilen für die gleiche URI zu haben, falls eine Untermenge "
@@ -6781,7 +6845,7 @@ msgstr ""
"niedriger Bandbreite hauszuhalten."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6799,7 +6863,7 @@ msgstr ""
"stillschweigend ignoriert werden."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6815,7 +6879,7 @@ msgstr ""
"heruntergeladen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6837,7 +6901,7 @@ msgstr ""
"heruntergeladen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6855,7 +6919,7 @@ msgstr ""
"korrekt authentifizierte Quellen als nicht authentifiziert."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6869,12 +6933,12 @@ msgstr ""
"Rechnern, zum Beispiel)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Einige Beispiele:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6886,17 +6950,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "URI-Beschreibung"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Die derzeit zulässigen URI-Typen sind:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6907,7 +6971,7 @@ msgstr ""
"lokale Spiegel oder Archive."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6917,7 +6981,7 @@ msgstr ""
"der Quellenliste zu erstellen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6934,7 +6998,7 @@ msgstr ""
"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6956,7 +7020,7 @@ msgstr ""
"benutzen, werden ignoriert."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6969,7 +7033,7 @@ msgstr ""
"Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6983,12 +7047,12 @@ msgstr ""
"<command>find</command> und <command>dd</command> verwandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "weitere zulässige URI-Typen hinzufügen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7007,7 +7071,7 @@ msgstr ""
"Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7016,37 +7080,37 @@ msgstr ""
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
"benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7057,7 +7121,7 @@ msgstr ""
"<literal>amd64</literal> und <literal>armel</literal> holt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7067,7 +7131,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7076,13 +7140,13 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7092,13 +7156,13 @@ msgstr ""
"benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7112,19 +7176,19 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -7144,7 +7208,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/es.po b/doc/po/es.po
index c26c9476b..6ec6eccef 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\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-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1648,7 +1648,7 @@ msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5240,7 +5240,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Ejemplos"
@@ -6721,7 +6721,7 @@ msgstr ""
"literal> para obtener los índices de fuentes."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6730,21 +6730,62 @@ msgstr ""
"usando los tipos <literal>deb</literal> y <literal>deb-src</literal> es:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "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 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 one <literal>component</literal> must be present."
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"El URI para el tipo <literal>deb</literal> debe especificar la base de la "
@@ -6757,15 +6798,24 @@ msgstr ""
"<literal>distribución</literal> no define una ruta exacta."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</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 <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribución</literal> puede contener una variable, <literal>"
"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el "
@@ -6777,18 +6827,32 @@ msgstr ""
"sistema."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"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."
+#: sources.list.5.xml:122
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"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."
msgstr ""
"Debido a que sólo se puede especificar una distribución por línea, es "
"posible que se precisen varias líneas para la misma URI si desea tener "
@@ -6803,7 +6867,7 @@ msgstr ""
"aprovechar mejor el ancho de banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6820,7 +6884,7 @@ msgstr ""
"ignoran silenciosamente):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6835,7 +6899,7 @@ msgstr ""
"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6856,7 +6920,7 @@ msgstr ""
"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6874,7 +6938,7 @@ msgstr ""
"autenticadas no lo están."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6887,12 +6951,12 @@ msgstr ""
"seguidos por servidores de Internet distantes, por ejemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Algunos ejemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6904,17 +6968,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Especificación del URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Los tipos de URI permitidos actualmente son:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6925,7 +6989,7 @@ msgstr ""
"particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6935,7 +6999,7 @@ msgstr ""
"list»."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6953,7 +7017,7 @@ msgstr ""
"autenticación no es seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6974,7 +7038,7 @@ msgstr ""
"fichero de configuración."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6987,7 +7051,7 @@ msgstr ""
"permite realizar la copia de ficheros con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7001,12 +7065,12 @@ msgstr ""
"transferencia de ficheros desde la máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "Añadir más tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7025,7 +7089,7 @@ msgstr ""
"debtorrent, consulte &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7034,36 +7098,36 @@ msgstr ""
"para «stable/main», «stable/contrib», y «stable/non-free»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Línea para obtener el código fuente desde la ubicación anterior."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7074,7 +7138,7 @@ msgstr ""
"obtiene <literal>amd64</literal> y <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7084,7 +7148,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7093,13 +7157,13 @@ msgstr ""
"usa sólo la sección «hamm/main»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7108,13 +7172,13 @@ msgstr ""
"del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7127,19 +7191,19 @@ msgstr ""
"filename>, se usará sólo una sesión FTP para ambas."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -7158,7 +7222,7 @@ msgstr ""
"tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 67a26a280..333bfad23 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \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-24 23:31+0100\n"
"PO-Revision-Date: 2013-04-09 07:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1567,7 +1567,7 @@ msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5196,7 +5196,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Exemples"
@@ -6666,7 +6666,7 @@ msgstr ""
"pour récupérer les index des sources."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6675,21 +6675,62 @@ msgstr ""
"types <literal>deb</literal> et <literal>deb-src</literal> est :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "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 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 one <literal>component</literal> must be present."
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"L'URI de type <literal>deb</literal> doit indiquer la base de la "
@@ -6703,15 +6744,24 @@ msgstr ""
"être présent."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</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 <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> peut aussi contenir une variable <literal>"
"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme "
@@ -6722,18 +6772,32 @@ msgstr ""
"literal> crée automatiquement un URI en fonction de l'architecture effective."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"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."
+#: sources.list.5.xml:122
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"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."
msgstr ""
"Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut être "
"nécessaire de disposer le même URI sur plusieurs lignes quand on veut "
@@ -6748,7 +6812,7 @@ msgstr ""
"tirer plus efficacement parti des sites à faible bande passante."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6765,7 +6829,7 @@ msgstr ""
"ignorés silencieusement) :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6780,7 +6844,7 @@ msgstr ""
"Architectures</literal> sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6801,7 +6865,7 @@ msgstr ""
"Architectures</literal> sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6819,7 +6883,7 @@ msgstr ""
"authentifiées comme non authentifiées."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6832,12 +6896,12 @@ msgstr ""
"les hôtes distants."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Exemples :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6849,17 +6913,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Spécification des URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Les types d'URI actuellement reconnues sont :"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6870,7 +6934,7 @@ msgstr ""
"avec les montages NFS, les miroirs et les archives locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6880,7 +6944,7 @@ msgstr ""
"pour créer des entrées dans la liste des sources."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6897,7 +6961,7 @@ msgstr ""
"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6919,7 +6983,7 @@ msgstr ""
"configuration seront ignorés."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6933,7 +6997,7 @@ msgstr ""
"des fichiers avec APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6947,12 +7011,12 @@ msgstr ""
"sont utilisées pour l'accès aux fichiers de la machine distante."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "ajout de types d'URI supplémentaires reconnues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6971,7 +7035,7 @@ msgstr ""
"disponibles (voir &apt-transport-debtorrent;)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6980,37 +7044,37 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Comme ci-dessus, excepté que cette ligne utilise la distribution "
"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "La précédente ligne, mais pour les sources."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7021,7 +7085,7 @@ msgstr ""
"<literal>amd64</literal> et <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7031,7 +7095,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7040,13 +7104,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7055,13 +7119,13 @@ msgstr ""
"répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7074,19 +7138,19 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -7106,7 +7170,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/it.po b/doc/po/it.po
index 13818f98d..f86cd53f9 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \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-24 23:31+0100\n"
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1611,7 +1611,7 @@ msgstr "File"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5215,7 +5215,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Esempi"
@@ -6703,7 +6703,7 @@ msgstr ""
"riga <literal>deb-src</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6712,21 +6712,62 @@ msgstr ""
"<literal>deb</literal> o <literal>deb-src</literal> è:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opzioni ] uri distribuzione [componente1] [componente2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "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 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 one <literal>component</literal> must be present."
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"L'URI per il tipo <literal>deb</literal> deve specificare la base della "
@@ -6740,15 +6781,24 @@ msgstr ""
"<literal>componente</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</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 <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribuzione</literal> può anche contenere una variabile <literal>"
"$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
@@ -6759,18 +6809,32 @@ msgstr ""
"automaticamente un URI con l'architettura corrente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"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."
+#: sources.list.5.xml:122
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"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."
msgstr ""
"Dato che può essere specificata solo una distribuzione per riga, può essere "
"necessario avere più righe per lo stesso URI, se si desidera un sottoinsieme "
@@ -6786,7 +6850,7 @@ msgstr ""
"larghezza di banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6803,7 +6867,7 @@ msgstr ""
"supportate verranno ignorate in modo silenzioso):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6818,7 +6882,7 @@ msgstr ""
"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6839,7 +6903,7 @@ msgstr ""
"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6856,7 +6920,7 @@ msgstr ""
"tratta anche le fonti correttamente autenticate come non autenticate."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6869,12 +6933,12 @@ msgstr ""
"in una rete locale, seguiti da host Internet distanti)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Alcuni esempi:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6886,17 +6950,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Specificare URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "I tipi di URI attualmente riconosciuti sono:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6907,7 +6971,7 @@ msgstr ""
"archivi locali."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6917,7 +6981,7 @@ msgstr ""
"delle fonti."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6934,7 +6998,7 @@ msgstr ""
"è un metodo di autenticazione non sicuro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6954,7 +7018,7 @@ msgstr ""
"HTTP specificati nel file di configurazione verranno ignorati."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6967,7 +7031,7 @@ msgstr ""
"rimovibili, per copiare i file nelle varie posizioni con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6981,12 +7045,12 @@ msgstr ""
"command> e <command>dd</command>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "aggiungere ulteriori tipi di URI riconoscibili"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7005,7 +7069,7 @@ msgstr ""
"debtorrrent; vedere &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7014,37 +7078,37 @@ msgstr ""
"debian per stable/main, stable/contrib e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/gianni/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Come sopra, tranne per il fatto che usa la distribuzione unstable (di "
"sviluppo)"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Riga per i sorgenti corrispondente alla precedente"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7055,7 +7119,7 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7065,7 +7129,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7074,13 +7138,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7089,13 +7153,13 @@ msgstr ""
"e usa solo l'area &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7108,19 +7172,19 @@ msgstr ""
"usata una sola sessione FTP per entrambe le righe."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -7139,7 +7203,7 @@ msgstr ""
"modo.] <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index d73f29523..e14dbf785 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\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-24 23:31+0100\n"
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1559,7 +1559,7 @@ msgstr "ファイル"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -4978,7 +4978,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "サンプル"
@@ -6412,7 +6412,7 @@ msgstr ""
"です。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6422,21 +6422,62 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コンポーネント2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "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 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 one <literal>component</literal> must be present."
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
@@ -6449,15 +6490,24 @@ msgstr ""
"とつは <literal>component</literal> を指定しなければなりません。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</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 <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
"があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian "
@@ -6468,18 +6518,32 @@ msgstr ""
"チャで URI を自動的に生成します。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"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."
+#: sources.list.5.xml:122
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"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."
msgstr ""
"有効な全 distribution, component の場所から、一部が必要な場合、1 行につき 1 "
"distribution しか指定できないため、同じ URI の行を複数記述することになるで"
@@ -6491,7 +6555,7 @@ msgstr ""
"るホストへは、接続を並行して行うようにもしています。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6507,7 +6571,7 @@ msgstr ""
"す)。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6521,7 +6585,7 @@ msgstr ""
"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6541,7 +6605,7 @@ msgstr ""
"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6558,7 +6622,7 @@ msgstr ""
"認証として扱います。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6571,12 +6635,12 @@ msgstr ""
"しょう。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "例:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6588,17 +6652,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "URI の仕様"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "現在認識できる URI タイプは以下のとおりです。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6608,7 +6672,7 @@ msgstr ""
"にします。これは NFS マウントやローカルミラーで便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6618,7 +6682,7 @@ msgstr ""
"グラムを使用してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6634,7 +6698,7 @@ msgstr ""
"指定してください。この認証方法は安全ではないことに注意してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6653,7 +6717,7 @@ msgstr ""
"す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6665,7 +6729,7 @@ msgstr ""
"用していて、APT でコピーを行う場合に便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6679,12 +6743,12 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "さらに認識できる URI タイプの追加"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6702,7 +6766,7 @@ msgstr ""
"transport-debtorrent; を参照してください。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6711,35 +6775,35 @@ msgstr ""
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記と同様ですが、不安定版 (開発版) を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "上記のソース行は以下のようになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6750,7 +6814,7 @@ msgstr ""
"<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6760,7 +6824,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -6769,13 +6833,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -6784,13 +6848,13 @@ msgstr ""
"&stable-codename;/contrib のみを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -6803,19 +6867,19 @@ msgstr ""
"つだけになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -6834,7 +6898,7 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 4b0f8d89c..e130991b7 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\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-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1642,7 +1642,7 @@ msgstr "Pliki"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -4644,7 +4644,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Przykłady"
@@ -6118,7 +6118,7 @@ msgstr ""
"źródłowych."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6127,21 +6127,62 @@ msgstr ""
"<literal>deb</literal> i <literal>deb-src</literal> jest następujący:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "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 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 one <literal>component</literal> must be present."
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"URI typu <literal>deb</literal> musi podawać bazową lokalizację dystrybucji "
@@ -6154,15 +6195,24 @@ msgstr ""
"<literal>komponent</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</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 <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</"
"literal>, która zostanie rozwinięta do architektury Debiana (takiej jak "
@@ -6174,18 +6224,32 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"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."
+#: sources.list.5.xml:122
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"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."
msgstr ""
"Ponieważ w pojedynczej linii można podać tylko jedną dystrybucję, może być "
"potrzebne wymienienie tego samego URI w wielu liniach, jeżeli pożądany jest "
@@ -6201,7 +6265,7 @@ msgstr ""
"sieciach o niskiej przepustowości łączy."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6218,7 +6282,7 @@ msgstr ""
"wypisywania żadnego ostrzeżenia):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6233,7 +6297,7 @@ msgstr ""
"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6254,7 +6318,7 @@ msgstr ""
"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6272,7 +6336,7 @@ msgstr ""
"niezautentykowane."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6286,12 +6350,12 @@ msgstr ""
"komputerami w Internecie)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Kilka przykładów:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6303,17 +6367,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Określanie URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Obecnie rozpoznawane są następujące typy URI:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6324,7 +6388,7 @@ msgstr ""
"archiwów."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6334,7 +6398,7 @@ msgstr ""
"list."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6351,7 +6415,7 @@ msgstr ""
"bezpieczny."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6371,7 +6435,7 @@ msgstr ""
"konfiguracyjnym serwery proxy używające HTTP zostaną zignorowane."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6384,7 +6448,7 @@ msgstr ""
"do skopiowania plików przy użyciu APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6398,12 +6462,12 @@ msgstr ""
"przetransferowania plików ze zdalnego komputera."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "dodawanie innych rozpoznawanych typów URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6422,7 +6486,7 @@ msgstr ""
"zobaczyć &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6431,36 +6495,36 @@ msgstr ""
"debian dla zasobów stable/main, stable/contrib i stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Linie źródeł dla powyższego przykładu"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6471,7 +6535,7 @@ msgstr ""
"literal> i <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6481,7 +6545,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -6490,13 +6554,13 @@ msgstr ""
"org i dystrybucji hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -6505,13 +6569,13 @@ msgstr ""
"katalogu debian i używa tylko dystrybucji &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -6524,19 +6588,19 @@ msgstr ""
"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -6555,7 +6619,7 @@ msgstr ""
"nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache;, &apt-conf;"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 7060351ce..6e04e961a 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\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-24 23:31+0100\n"
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -1595,7 +1595,7 @@ msgstr "Ficheiros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5163,7 +5163,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Exemplos"
@@ -6639,7 +6639,7 @@ msgstr ""
"linha <literal>deb-src</literal> para obter índices das fontes."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6648,21 +6648,62 @@ msgstr ""
"tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "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 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 one <literal>component</literal> must be present."
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"O URI para o tipo <literal>deb</literal> tem de especificar a base da "
@@ -6676,15 +6717,24 @@ msgstr ""
"presente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</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 <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> também pode conter uma variável. <literal>"
"$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
@@ -6695,18 +6745,32 @@ msgstr ""
"gerar automaticamente um URI com a arquitectura actual."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"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."
+#: sources.list.5.xml:122
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"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."
msgstr ""
"Como apenas pode ser especificada por linha uma distribuição, pode ser "
"necessário ter várias linhas para o mesmo URI, se só for desejado um sub-"
@@ -6721,7 +6785,7 @@ msgstr ""
"sites com baixa largura de banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6738,7 +6802,7 @@ msgstr ""
"definições não suportadas serão ignoradas em silêncio):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6753,7 +6817,7 @@ msgstr ""
"<literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6774,7 +6838,7 @@ msgstr ""
"<literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6791,7 +6855,7 @@ msgstr ""
"lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6805,12 +6869,12 @@ msgstr ""
"Internet, por exemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Alguns exemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6822,17 +6886,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Especificação da URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Os tipos de URI actualmente reconhecidos são:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6843,7 +6907,7 @@ msgstr ""
"arquivos locais."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6853,7 +6917,7 @@ msgstr ""
"fontes."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6870,7 +6934,7 @@ msgstr ""
"método de autenticação seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6891,7 +6955,7 @@ msgstr ""
"configuração serão ignorados."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6904,7 +6968,7 @@ msgstr ""
"ficheiros com o APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6918,12 +6982,12 @@ msgstr ""
"ficheiros a partir da máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "adicionando mais tipos de URI reconhecíveis"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6942,7 +7006,7 @@ msgstr ""
"exemplo o debtorrent - veja &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6951,36 +7015,36 @@ msgstr ""
"para stable/main, stable/contrib, e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Linha de fonte para o referido acima"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6991,7 +7055,7 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7001,7 +7065,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7010,13 +7074,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7025,13 +7089,13 @@ msgstr ""
"usa apenas a área &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7044,19 +7108,19 @@ msgstr ""
"uma única sessão FTP para ambas linhas de recurso."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -7075,7 +7139,7 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index a77b8319a..80a8f90d4 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\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-24 23:31+0100\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1120,7 +1120,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
#, fuzzy
@@ -3615,7 +3615,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
#, fuzzy
msgid "Examples"
@@ -5096,60 +5096,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
+#: sources.list.5.xml:82
#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:105
msgid ""
"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 "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<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 one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
+#: sources.list.5.xml:114
msgid ""
-"<literal>distribution</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 <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<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 <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
+#: sources.list.5.xml:122
msgid ""
-"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."
+"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."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -5160,7 +5191,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -5170,7 +5201,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:146
msgid ""
"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -5179,7 +5210,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -5190,7 +5221,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -5199,13 +5230,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:161
#, fuzzy
msgid "Some examples:"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -5214,17 +5245,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5232,14 +5263,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -5250,7 +5281,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -5263,7 +5294,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -5272,7 +5303,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5281,12 +5312,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -5298,42 +5329,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5341,7 +5372,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5349,33 +5380,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5384,19 +5415,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:269
msgid ""
"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</"
@@ -5408,7 +5439,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:281
#, fuzzy
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 87fb4d71e..4d0c4d502 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -20,7 +20,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2012-06-09T00:00:00Z</date>
+ <date>2014-01-18T00:00:00Z</date>
</refentryinfo>
<refmeta>
@@ -76,22 +76,42 @@
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>
+ Types: deb deb-src
+ URIs: http://example.com
+ Suites: stable testing
+ Sections: component1 component2
+ Description: short
+ long long long
+ [option1]: [option1-value]
+
+ Types: deb
+ URIs: http://another.example.com
+ Suites: experimental
+ Sections: component1 component2
+ Enabled: no
+ Description: short
+ long long long
+ [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 +119,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