From a88136062dbe189417aa0b4751449637816c8445 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 22 Apr 2012 12:29:24 +0200
Subject: * cmdline/apt-config.cc:   - make it possible to limit dump to a
 subtree   - implement --empty and --format option for dump

---
 doc/apt-verbatim.ent | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index ad4554e2f..3846c17e3 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -269,8 +269,11 @@
 		&synopsis-help;
 	</group>
 </cmdsynopsis></refsynopsisdiv>">
+<!--<arg><option>- -format '<replaceable>&#37;f \"&#37;v\";&#37;n</replaceable>'</option></arg>-->
 <!ENTITY synopsis-command-apt-config "<refsynopsisdiv><cmdsynopsis>
 	<command>apt-config</command>
+	<arg><option>--empty</option></arg>
+	<arg><option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n</replaceable>'</option></arg>
 	&synopsis-arg-option;
 	&synopsis-arg-config;
 	<group choice='req'>
-- 
cgit v1.2.3


From c086ac18511ce648a0ed88ab470965470bd422c5 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 20 May 2012 18:24:23 +0200
Subject: * doc/*.xml:   - add a few translator notes and reword some
 paragraphs to ensure that     translators and users alike can better
 understand them (Closes: #669409)

---
 doc/apt-verbatim.ent | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 3846c17e3..2f4bf063d 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -249,10 +249,10 @@
 		<arg choice='plain'>show &synopsis-arg-pkgver;</arg>
 		<arg choice='plain'>depends &synopsis-arg-pkgver;</arg>
 		<arg choice='plain'>rdepends &synopsis-arg-pkgver;</arg>
-		<arg choice='plain'>pkgnames <arg choice='plain'><replaceable>&synopsis-prefix;</replaceable></arg></arg>
+		<arg choice='plain'>pkgnames <arg><replaceable>&synopsis-prefix;</replaceable></arg></arg>
 		<arg choice='plain'>dotty &synopsis-arg-pkgver;</arg>
 		<arg choice='plain'>xvcg &synopsis-arg-pkgver;</arg>
-		<arg choice='plain'>policy &synopsis-arg-pkg;</arg>
+		<arg choice='plain'>policy <arg rep='repeat'><replaceable>&synopsis-pkg;</replaceable></arg></arg>
 		<arg choice='plain'>madison &synopsis-arg-pkg;</arg>
 		&synopsis-help;
 	</group>
-- 
cgit v1.2.3


From d5aa88bf54527a79735543fd55619206c7e9b840 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 08:00:16 +0200
Subject: add also <refentryinfo> to the list of unstranslated tags for po4a

---
 doc/apt-verbatim.ent | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 2f4bf063d..926a0712e 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -177,6 +177,12 @@
    </author>
 ">
 
+<!ENTITY apt-name.dburrows "
+     <firstname>Daniel</firstname>
+     <surname>Burrows</surname>
+     <email>dburrows@debian.org</email>
+">
+
 <!ENTITY apt-copyright "
     <copyright>
      <holder>Jason Gunthorpe</holder>
-- 
cgit v1.2.3


From 4920c8c7d42f6341758738b1f056dd1f0db47775 Mon Sep 17 00:00:00 2001
From: Michael Vogt <egon@debian-devbox>
Date: Mon, 21 May 2012 13:33:25 +0200
Subject: merge fix from david for warning during xml build

---
 doc/apt-verbatim.ent | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 926a0712e..a44f37ab8 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -180,7 +180,6 @@
 <!ENTITY apt-name.dburrows "
      <firstname>Daniel</firstname>
      <surname>Burrows</surname>
-     <email>dburrows@debian.org</email>
 ">
 
 <!ENTITY apt-copyright "
-- 
cgit v1.2.3


From aec2216091b3d70b3baa5a5b8c87ce208e35c19c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 23 May 2012 18:00:32 +0200
Subject: * doc/*.xml:   - mark even more stuff as untranslateable and improve
 the     markup here and there (no real text change)

---
 doc/apt-verbatim.ent | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a44f37ab8..ff37f4ae7 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -154,6 +154,18 @@
   </citerefentry>"
 >
 
+<!ENTITY apt-transport-debtorrent "<citerefentry>
+    <refentrytitle><package>apt-transport-debtorrent</package></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY regex "<citerefentry>
+     <refentrytitle><abbrev>regex</abbrev></refentrytitle>
+     <manvolnum>7</manvolnum>
+  </citerefentry>"
+>
+
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>
-- 
cgit v1.2.3


From aa9de3cd97897b269d61031082d1039a242d8b4a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 25 May 2012 14:11:34 +0200
Subject: * doc/apt-verbatim.ent:   - APT doesn't belong to the product
 'Linux', so use 'APT' instead     as after all APT is a big suite of
 applications

---
 doc/apt-verbatim.ent | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index ff37f4ae7..617403116 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -202,15 +202,18 @@
 ">
 
 <!ENTITY apt-product "
-   <productname>Linux</productname>
+   <productname>APT</productname>
+   <releaseinfo role='version'>&apt-product-version;</releaseinfo>
 ">
 
+<!-- this will be updated by 'prepare-release' -->
+<!ENTITY apt-product-version "0.9.5.1">
+
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "lenny">
 <!ENTITY stable-codename "squeeze">
 <!ENTITY testing-codename "wheezy">
 
-
 <!-- 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>">
-- 
cgit v1.2.3


From 44477002adb73db2324f4218e5d85aae016ff5fa Mon Sep 17 00:00:00 2001
From: Justin B Rye <jbr@edlug.org.uk>
Date: Wed, 6 Jun 2012 18:15:49 +0200
Subject: * doc/apt-key.8.xml, doc/apt-mark.8.xml,   doc/apt_preferences.5.xml:
   - review and fix spelling issues

---
 doc/apt-verbatim.ent | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 617403116..036986a15 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -166,6 +166,12 @@
   </citerefentry>"
 >
 
+<!ENTITY glob "<citerefentry>
+     <refentrytitle><abbrev>glob</abbrev></refentrytitle>
+     <manvolnum>7</manvolnum>
+  </citerefentry>"
+>
+
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>
@@ -213,6 +219,8 @@
 <!ENTITY oldstable-codename "lenny">
 <!ENTITY stable-codename "squeeze">
 <!ENTITY testing-codename "wheezy">
+<!ENTITY stable-version "6.0">
+<!ENTITY ubuntu-codename "precise">
 
 <!-- Arguments -->
 <!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
-- 
cgit v1.2.3


From 75d9bdba9b62422a42787727e60f850dfd86171b Mon Sep 17 00:00:00 2001
From: Justin B Rye <jbr@edlug.org.uk>
Date: Wed, 6 Jun 2012 23:56:08 +0200
Subject: * doc/apt-secure.8.xml:   - review and fix typo, grammar and style
 issues

---
 doc/apt-verbatim.ent | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 036986a15..32ed2f678 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -222,6 +222,12 @@
 <!ENTITY stable-version "6.0">
 <!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>">
-- 
cgit v1.2.3


From e08c5854bb9b5f352b0856533f95c12e858728ca Mon Sep 17 00:00:00 2001
From: Michael Vogt <egon@debian-devbox>
Date: Mon, 11 Jun 2012 16:51:43 +0200
Subject: releasing version 0.9.6

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 9aec81e04..60be6f2dc 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.5.2~20120611">
+<!ENTITY apt-product-version "0.9.6">
 
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "lenny">
-- 
cgit v1.2.3


From 24466436c346b81b9b5aa5331752ea58b4779b1e Mon Sep 17 00:00:00 2001
From: Michael Vogt <egon@debian-devbox>
Date: Tue, 19 Jun 2012 17:06:49 +0200
Subject: releasing version 0.9.7

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 60be6f2dc..ab068fa93 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.6">
+<!ENTITY apt-product-version "0.9.7">
 
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "lenny">
-- 
cgit v1.2.3