Browse Source

* doc/apt.ent

- add entities for the current oldstable/stable/testing codenames
* doc/sources.list.5.xml:
  - use stable-codename instead of stable in the examples (Closes: #531492)
* doc/apt_preferences.5.xml:
  - adapt some examples here to use current codenames as well
debian/1.8.y
David Kalnischkies 12 years ago
parent
commit
e1dd65c9f1
  1. 6
      debian/changelog
  2. 2
      doc/apt-ftparchive.1.xml
  3. 5
      doc/apt.conf.5.xml
  4. 4
      doc/apt.ent
  5. 20
      doc/apt_preferences.5.xml
  6. 8
      doc/sources.list.5.xml

6
debian/changelog

@ -17,6 +17,12 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
- remove the keyrings count limit by using vector magic
* contrib/mmap.cc:
- clarify "MMap reached size limit" error message, thanks Ivan Masár!
* doc/apt.ent
- add entities for the current oldstable/stable/testing codenames
* doc/sources.list.5.xml:
- use stable-codename instead of stable in the examples (Closes: #531492)
* doc/apt_preferences.5.xml:
- adapt some examples here to use current codenames as well
[ Jari Aalto ]
* debian/rules:

2
doc/apt-ftparchive.1.xml

@ -363,7 +363,7 @@
The <literal>Tree</literal> section takes a scope tag which sets the
<literal>$(DIST)</literal> variable and defines the root of the tree
(the path is prefixed by <literal>ArchiveDir</literal>).
Typically this is a setting such as <filename>dists/woody</filename>.</para>
Typically this is a setting such as <filename>dists/&stable-codename;</filename>.</para>
<para>
All of the settings defined in the <literal>TreeDefault</literal> section can be
use in a <literal>Tree</literal> section as well as three new variables.</para>

5
doc/apt.conf.5.xml

@ -150,8 +150,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</varlistentry>
<varlistentry><term>Default-Release</term>
<listitem><para>Default release to install packages from if more than one
version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem>
<listitem><para>Default release to install packages from if more than one
version available. Contains release name, codename or release version. Examples: 'stable', 'testing',
'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem>
</varlistentry>
<varlistentry><term>Ignore-Hold</term>

4
doc/apt.ent

@ -392,3 +392,7 @@
This is done on purpose, to avoid losing content when the
translation is lagging behind the original content.
">
<!ENTITY oldstable-codename "etch">
<!ENTITY stable-codename "lenny">
<!ENTITY testing-codename "squeeze">

20
doc/apt_preferences.5.xml

@ -218,11 +218,11 @@ Pin-Priority: 50
</programlisting>
<simpara>The following record assigns a high priority to all package versions
belonging to any distribution whose Codename is "<literal>squeeze</literal>".</simpara>
belonging to any distribution whose Codename is "<literal>&testing-codename;</literal>".</simpara>
<programlisting>
Package: *
Pin: release n=squeeze
Pin: release n=&testing-codename;
Pin-Priority: 900
</programlisting>
@ -355,7 +355,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/woody/Release</filename>.
or <filename>.../dists/&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>
@ -383,14 +383,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: squeeze"
"Codename: &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>squeeze</literal>. Specifying this value in the APT preferences file
<literal>&testing-codename;</literal>. Specifying this value in the APT preferences file
would require the line:
</simpara>
<programlisting>
Pin: release n=squeeze
Pin: release n=&testing-codename;
</programlisting>
</listitem>
</varlistentry>
@ -590,9 +590,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 squeeze or sid
Explanation: other than those in the distribution codenamed with &testing-codename; or sid
Package: *
Pin: release n=squeeze
Pin: release n=&testing-codename;
Pin-Priority: 900
Explanation: Debian unstable is always codenamed with sid
@ -608,7 +608,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>squeeze</literal>.
latest version(s) in the release codenamed with <literal>&testing-codename;</literal>.
<programlisting>
apt-get install <replaceable>package-name</replaceable>
@ -620,7 +620,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>squeeze</literal> version if that is
the package to the most recent <literal>&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.

8
doc/sources.list.5.xml

@ -111,8 +111,8 @@
<para>Some examples:</para>
<literallayout>
deb http://http.us.debian.org/debian stable main contrib non-free
deb http://http.us.debian.org/debian dists/stable-updates/
deb http://ftp.debian.org/debian &stable-codename; main contrib non-free
deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
</literallayout>
</refsect1>
@ -206,8 +206,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
<para>Uses FTP to access the archive at ftp.debian.org, under the debian
directory, and uses only the stable/contrib area.</para>
<literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout>
directory, and uses only the &stable-codename;/contrib area.</para>
<literallayout>deb ftp://ftp.debian.org/debian &stable-codename; contrib</literallayout>
<para>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

Loading…
Cancel
Save