Merge branch 'debian/sid' into debian/experimental

[apt.git] / doc / apt-verbatim.ent

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 036986a15b1c155ab89c7086b1b20c6bc401a10a..c9bb061236715b1fcef04b0512d620fb45552bce 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,15 +213,21 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
 ">
 
 <!-- this will be updated by 'prepare-release' -->

-<!ENTITY apt-product-version "0.9.5.1">
+<!ENTITY apt-product-version "0.9.7.6ubuntu2">

 
 <!-- Codenames for debian releases -->
 
 <!-- Codenames for debian releases -->

-<!ENTITY oldstable-codename "lenny">
-<!ENTITY stable-codename "squeeze">
-<!ENTITY testing-codename "wheezy">
-<!ENTITY stable-version "6.0">
+<!ENTITY oldstable-codename "squeeze">
+<!ENTITY stable-codename "wheezy">
+<!ENTITY testing-codename "jessie">
+<!ENTITY stable-version "7.0">

 <!ENTITY ubuntu-codename "precise">
 
 <!ENTITY ubuntu-codename "precise">
 

+<!-- good and bad just refers to matching and not matching a pattern…
+     It is not a remark about the specific perl version.
+     There is no way perl could be clasified "good" (or "bad") in any version… -->
+<!ENTITY good-perl "5.10">
+<!ENTITY bad-perl "5.14">
+

 <!-- Arguments -->
 <!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
 <!ENTITY synopsis-arg-config "<arg><option>-c=<filename><replaceable>&synopsis-config-file;</replaceable></filename></option></arg>">
 <!-- Arguments -->
 <!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
 <!ENTITY synopsis-arg-config "<arg><option>-c=<filename><replaceable>&synopsis-config-file;</replaceable></filename></option></arg>">