diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-transport-https.1.xml | 2 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 6 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 4 | ||||
| -rw-r--r-- | doc/po/de.po | 6 | ||||
| -rw-r--r-- | doc/po/es.po | 8 | ||||
| -rw-r--r-- | doc/po/fr.po | 4 | ||||
| -rw-r--r-- | doc/po/it.po | 4 | ||||
| -rw-r--r-- | doc/po/ja.po | 4 | ||||
| -rw-r--r-- | doc/po/nl.po | 6 | ||||
| -rw-r--r-- | doc/po/pl.po | 6 | ||||
| -rw-r--r-- | doc/po/pt.po | 6 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 4 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 11 |
14 files changed, 45 insertions, 28 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 520cfc126..3c1e90744 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -593,7 +593,7 @@ <literal>label</literal>, <literal>codename</literal>, <literal>suite</literal>, <literal>version</literal> and <literal>defaultpin</literal>. See also &apt-preferences;. - Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>.</para></listitem> + Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>.</para></listitem> </varlistentry> <varlistentry><term><option>--show-progress</option></term> diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml index 1bad8578b..1327b0a16 100644 --- a/doc/apt-transport-https.1.xml +++ b/doc/apt-transport-https.1.xml @@ -38,7 +38,7 @@ a user but used by APT tools based on user configuration.</para> which, as indicated by the appended S, is wrapped in an encrypted layer known as Transport Layer Security (TLS) to provide end-to-end encryption. A sufficiently capable attacker can still observe the communication partners -and deeper analyse of the encrypted communcation might still reveal important details. +and deeper analyse of the encrypted communication might still reveal important details. An overview over available alternative transport methods is given in &sources-list;.</para> </refsect1> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index d7817cb79..a8aa0bf5e 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -93,6 +93,12 @@ </citerefentry>" > +<!ENTITY apt-transport-mirror "<citerefentry> + <refentrytitle><command>apt-transport-mirror</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + <!ENTITY sources-list "<citerefentry> <refentrytitle><filename>sources.list</filename></refentrytitle> <manvolnum>5</manvolnum> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 036766a8c..2a9af09f4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -1438,7 +1438,7 @@ msgid "" "<literal>codename</literal>, <literal>suite</literal>, " "<literal>version</literal> and <literal>defaultpin</literal>. See also " "&apt-preferences;. Configuration Item: " -"<literal>Acquire::AllowReleaseInfoChanges</literal>." +"<literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -7235,7 +7235,7 @@ msgid "" "&apt-transport-http;), which, as indicated by the appended S, is wrapped in " "an encrypted layer known as Transport Layer Security (TLS) to provide " "end-to-end encryption. A sufficiently capable attacker can still observe " -"the communication partners and deeper analyse of the encrypted communcation " +"the communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 35e1a6de1..ce9664693 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -2010,7 +2010,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" "Es existieren Spezialoptionen (<literal>--allow-releaseinfo-change-</" "literal><replaceable>Feld</replaceable>), um Änderungen nur für bestimmte " @@ -2018,7 +2018,7 @@ msgstr "" "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> und <literal>defaultpin</literal> zu erlauben. Siehe auch &apt-" "preferences;. Konfigurationselement: <literal>Acquire::" -"AllowReleaseInfoChanges</literal>." +"AllowReleaseInfoChange</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -10349,7 +10349,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/es.po b/doc/po/es.po index 663ffa86e..73028c8cf 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -1415,7 +1415,7 @@ msgstr "" #| "directory is defined in the <literal>APT::Changelogs::Server</literal> " #| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs" #| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=" -#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/" +#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/" #| "changelogs</ulink> for Ubuntu). By default it displays the changelog for " #| "the version that is installed. However, you can specify the same options " #| "as for the <option>install</option> command." @@ -1430,7 +1430,7 @@ msgstr "" "pager</command>. El nombre de servidor y el directorio base se define con la " "variable <literal>APT::Changelogs::Server</literal> (por ejemplo, <ulink url=" "\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</" -"ulink> para Debian o <ulink url=\"http://changelogs.ubuntu.com/changelogs" +"ulink> para Debian o <ulink url=\"https://changelogs.ubuntu.com/changelogs" "\">changelogs.ubuntu.com/changelogs</ulink> para Ubuntu). Por omisión, " "muestra el fichero de registro de cambios de la versión instalada. Por otra " "parte, puede definir las mismas opciones que con la orden <option>install</" @@ -2075,7 +2075,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -10082,7 +10082,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index b7703c807..867391b53 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -2006,7 +2006,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -10254,7 +10254,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/it.po b/doc/po/it.po index 42c9ab3f4..3ba6c6756 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -2044,7 +2044,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -10239,7 +10239,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 3666e8677..70ab3f40d 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -1979,7 +1979,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -9852,7 +9852,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/nl.po b/doc/po/nl.po index 4e869a3d5..cd27f3446 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -2077,14 +2077,14 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" "Er bestaan specialistische opties (<literal>--allow-releaseinfo-change-</" "literal><replaceable>veld</replaceable>) om enkel veranderingen toe te staan " "voor bepaalde velden, zoals <literal>origin</literal>, <literal>label</" "literal>, <literal>codename</literal>, <literal>suite</literal>, " "<literal>version</literal> en <literal>defaultpin</literal>. Zie ook &apt-" -"preferences;. Configuratie-item: <literal>Acquire::AllowReleaseInfoChanges</" +"preferences;. Configuratie-item: <literal>Acquire::AllowReleaseInfoChange</" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -10475,7 +10475,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/pl.po b/doc/po/pl.po index fd89d98ea..2f111b3e2 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1398,7 +1398,7 @@ msgstr "" #| "directory is defined in the <literal>APT::Changelogs::Server</literal> " #| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs" #| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=" -#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/" +#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/" #| "changelogs</ulink> for Ubuntu). By default it displays the changelog for " #| "the version that is installed. However, you can specify the same options " #| "as for the <option>install</option> command." @@ -2084,7 +2084,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -9239,7 +9239,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 058350339..af4c0b6f9 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -1393,7 +1393,7 @@ msgstr "" #| "directory is defined in the <literal>APT::Changelogs::Server</literal> " #| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs" #| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=" -#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/" +#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/" #| "changelogs</ulink> for Ubuntu). By default it displays the changelog for " #| "the version that is installed. However, you can specify the same options " #| "as for the <option>install</option> command." @@ -2018,7 +2018,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -10018,7 +10018,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 56bab5079..3401ed857 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -1410,7 +1410,7 @@ msgid "" "certain fields like <literal>origin</literal>, <literal>label</literal>, " "<literal>codename</literal>, <literal>suite</literal>, <literal>version</" "literal> and <literal>defaultpin</literal>. See also &apt-preferences;. " -"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>." +"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -7560,7 +7560,7 @@ msgid "" "http;), which, as indicated by the appended S, is wrapped in an encrypted " "layer known as Transport Layer Security (TLS) to provide end-to-end " "encryption. A sufficiently capable attacker can still observe the " -"communication partners and deeper analyse of the encrypted communcation " +"communication partners and deeper analyse of the encrypted communication " "might still reveal important details. An overview over available " "alternative transport methods is given in &sources-list;." msgstr "" diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 75b5d94b9..e55c5b31e 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -409,6 +409,17 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [. alternative.</para></listitem> </varlistentry> + <varlistentry><term><command>mirror</command>, <command>mirror+<replaceable>scheme</replaceable></command> (&apt-transport-mirror;)</term> + <listitem><para> + The mirror scheme specifies the location of a mirrorlist. By default the + scheme used for the location is <literal>http</literal>, but any other + scheme can be used via <command>mirror+<replaceable>scheme</replaceable></command>. + The mirrorlist itself can contain many different URIs for mirrors the APT client + can transparently pick, choose and fallback between intended to help both + with distributing the load over the available mirrors and ensuring that + clients can acquire data even if some configured mirrors are not available. + </para></listitem> + </varlistentry> <varlistentry><term><command>file</command></term> <listitem><para> |