diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
| commit | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (patch) | |
| tree | be7d18baa836e9df166ec63f6c9fe6f94bb84b40 /doc/apt-verbatim.ent | |
| parent | a5e790985752c6820e08e7a7e650e1607fa826e4 (diff) | |
| parent | fc104da6a583736223b2f941e43a05ea26b63a7d (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog
Diffstat (limited to 'doc/apt-verbatim.ent')
| -rw-r--r-- | doc/apt-verbatim.ent | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index c9bb06123..b9e6a881a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -124,6 +124,12 @@ </citerefentry>" > +<!ENTITY squid-deb-proxy-client "<citerefentry> + <refentrytitle><command>squid-deb-proxy-client</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + <!ENTITY debsign "<citerefentry> <refentrytitle><command>debsign</command></refentrytitle> <manvolnum>1</manvolnum> @@ -213,14 +219,15 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.7.6ubuntu2"> +<!ENTITY apt-product-version "0.9.15.4"> -<!-- Codenames for debian releases --> +<!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> <!ENTITY stable-codename "wheezy"> <!ENTITY testing-codename "jessie"> -<!ENTITY stable-version "7.0"> -<!ENTITY ubuntu-codename "precise"> +<!ENTITY stable-version "7"> +<!ENTITY tanglu-codename "bartholomea"> +<!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… It is not a remark about the specific perl version. |