X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/ab5b1d0d31b2fbdc4896f8a107611ff056d6a668..e169fa4a85e03b2b03bb1bdba716b96654ae6050:/doc/sources.list.5.xml?ds=sidebyside

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 3b674c35f..dcf33a9ba 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2015-09-14T00:00:00Z</date>
+   <date>2015-11-26T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -126,7 +126,7 @@
    archive, <filename>distribution/component</filename>. The
    <literal>distribution</literal> is generally a suite name like
    <literal>stable</literal> or <literal>testing</literal> or a codename like
-   <literal>&stable-codename;</literal> or <literal>&testing-codename;</literal>
+   <literal>&debian-stable-codename;</literal> or <literal>&debian-testing-codename;</literal>
    while component is one of <literal>main</literal>, <literal>contrib</literal> or
    <literal>non-free</literal>. The
    <literal>deb-src</literal> type references a Debian distribution's source
@@ -271,15 +271,14 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
 		is a tri-state value which defaults to APT deciding if a source
 		is considered trusted or if warnings should be raised before e.g.
 		packages are installed from this source. This option can be used
-		to override this decision either with the value <literal>yes</literal>,
-		which lets APT consider this source always as a trusted source,
-		even if it lacks or fails authentication checks, by disabling parts
-		of &apt-secure;. It should therefore only be used in a local and trusted
-		context (if at all) as otherwise security is breached. The opposite
-		can be achieved with the value <literal>no</literal>, which
-		causes the source to be handled as untrusted even if the
-		authentication checks passed successfully.
-		The default value can't be set explicitly.
+		to override that decision. The value <literal>yes</literal> tells APT
+		always to consider this source as trusted, even if it doesn't pass
+		authentication checks. It disables parts of &apt-secure;, and should
+		therefore only be used in a local and trusted context (if at all) as
+		otherwise security is breached. The value <literal>no</literal> does
+		the opposite, causing the source to be handled as untrusted even if
+		the authentication checks passed successfully. The default value can't
+		be set explicitly.
 	  </para></listitem>
 
 	  <listitem><para><option>Signed-By</option> (<option>signed-by</option>)
@@ -430,16 +429,16 @@ Components: main contrib non-free</literallayout>
 
    <para>The first line gets package information for the architectures in <literal>APT::Architectures</literal>
    while the second always retrieves <literal>amd64</literal> and <literal>armel</literal>.</para>
-   <literallayout>deb http://httpredir.debian.org/debian &stable-codename; main
-deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main</literallayout>
+   <literallayout>deb http://httpredir.debian.org/debian &debian-stable-codename; main
+deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main</literallayout>
    <literallayout>Types: deb
 URIs: http://httpredir.debian.org/debian
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
 Components: main
 
 Types: deb
 URIs: http://httpredir.debian.org/debian
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
 Components: main
 Architectures: amd64 armel
 </literallayout>
@@ -453,11 +452,11 @@ Suites: hamm
 Components: main</literallayout>
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian
-   directory, and uses only the &stable-codename;/contrib area.</para>
-   <literallayout>deb ftp://ftp.debian.org/debian &stable-codename; contrib</literallayout>
+   directory, and uses only the &debian-stable-codename;/contrib area.</para>
+   <literallayout>deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib</literallayout>
    <literallayout>Types: deb
 URIs: ftp://ftp.debian.org/debian
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
 Components: contrib</literallayout>
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian