change debian related entities to a more explicit name

Git-Dch: Ignore

1 files changed, 16 insertions, 16 deletions

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 513a0c135..cac9a96e1 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -235,21 +235,21 @@ Pin-Priority: 50
 </programlisting>
 
 <simpara>The following record assigns a high priority to all package versions
-belonging to any distribution whose Codename is "<literal>&testing-codename;</literal>".</simpara>
+belonging to any distribution whose Codename is "<literal>&debian-testing-codename;</literal>".</simpara>
 
 <programlisting>
 Package: *
-Pin: release n=&testing-codename;
+Pin: release n=&debian-testing-codename;
 Pin-Priority: 900
 </programlisting>
 
 <simpara>The following record assigns a high priority to all package versions
 belonging to any release whose Archive name is "<literal>stable</literal>"
-and whose release Version number is "<literal>&stable-version;</literal>".</simpara>
+and whose release Version number is "<literal>&debian-stable-version;</literal>".</simpara>
 
 <programlisting>
 Package: *
-Pin: release a=stable, v=&stable-version;
+Pin: release a=stable, v=&debian-stable-version;
 Pin-Priority: 500
 </programlisting>
 </listitem>
@@ -428,7 +428,7 @@ APT priorities:
 <para>The <filename>Release</filename> file is normally found in the directory
 <filename>.../dists/<replaceable>dist-name</replaceable></filename>:
 for example, <filename>.../dists/stable/Release</filename>,
-or <filename>.../dists/&stable-codename;/Release</filename>.
+or <filename>.../dists/&debian-stable-codename;/Release</filename>.
 It consists of a single multi-line record which applies to <emphasis>all</emphasis> of
 the packages in the directory tree below its parent.  Unlike the
 <filename>Packages</filename> file, nearly all of the lines in a <filename>Release</filename>
@@ -456,14 +456,14 @@ Pin: release a=stable
 <term>the <literal>Codename:</literal> line</term>
 <listitem><simpara>names the codename to which all the packages
 in the directory tree belong.  For example, the line
-"Codename: &testing-codename;"
+"Codename: &debian-testing-codename;"
 specifies that all of the packages in the directory
 tree below the parent of the <filename>Release</filename> file belong to a version named
-<literal>&testing-codename;</literal>.  Specifying this value in the APT preferences file
+<literal>&debian-testing-codename;</literal>.  Specifying this value in the APT preferences file
 would require the line:
 </simpara>
 <programlisting>
-Pin: release n=&testing-codename;
+Pin: release n=&debian-testing-codename;
 </programlisting>
 </listitem>
 </varlistentry>
@@ -472,16 +472,16 @@ Pin: release n=&testing-codename;
 <term>the <literal>Version:</literal> line</term>
 <listitem><simpara>names the release version.  For example, the
 packages in the tree might belong to Debian release
-version &stable-version;.  Note that there is normally no version number for the
+version &debian-stable-version;.  Note that there is normally no version number for the
 <literal>testing</literal> and <literal>unstable</literal> distributions because they
 have not been released yet.  Specifying this in the APT preferences
 file would require one of the following lines.
 </simpara>
 
 <programlisting>
-Pin: release v=&stable-version;
-Pin: release a=stable, v=&stable-version;
-Pin: release &stable-version;
+Pin: release v=&debian-stable-version;
+Pin: release a=stable, v=&debian-stable-version;
+Pin: release &debian-stable-version;
 </programlisting>
 
 </listitem>
@@ -663,9 +663,9 @@ the example configurations above.
 
 <programlisting>
 Explanation: Uninstall or do not install any Debian-originated package versions
-Explanation: other than those in the distribution codenamed with &testing-codename; or sid
+Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid
 Package: *
-Pin: release n=&testing-codename;
+Pin: release n=&debian-testing-codename;
 Pin-Priority: 900
 
 Explanation: Debian unstable is always codenamed with sid
@@ -681,7 +681,7 @@ Pin-Priority: -10
 
 <para>With a suitable &sources-list; file and the above preferences file,
 any of the following commands will cause APT to upgrade to the
-latest version(s) in the release codenamed with <literal>&testing-codename;</literal>.
+latest version(s) in the release codenamed with <literal>&debian-testing-codename;</literal>.
 
 <programlisting>
 apt-get install <replaceable>package-name</replaceable>
@@ -693,7 +693,7 @@ apt-get dist-upgrade
 <para>The following command will cause APT to upgrade the specified
 package to the latest version from the <literal>sid</literal> distribution.
 Thereafter, <command>apt-get upgrade</command> will upgrade
-the package to the most recent <literal>&testing-codename;</literal> version if that is
+the package to the most recent <literal>&debian-testing-codename;</literal> version if that is
 more recent than the installed version, otherwise, to the most recent
 <literal>sid</literal> version if that is more recent than the installed
 version.