From 032ad7384e4529d95966a9c88fd5e11dd11c31f3 Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Sat, 3 Mar 2012 16:19:16 +0100
Subject: =?UTF-8?q?French:=20replace=20"=C3=A9tiquetage"=20by=20"=C3=A9pin?=
=?UTF-8?q?glage"=20for=20"pinning"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/po/fr.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'doc')
diff --git a/doc/po/fr.po b/doc/po/fr.po
index bed2c2985..4996a8d18 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -465,7 +465,7 @@ msgstr ""
"/etc/apt/preferences\n"
" Fichier des préférences.\n"
-" C'est dans ce fichier qu'on peut faire de l'étiquetage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
+" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
" Élément de configuration : Dir::Etc::Preferences.\n"
" \n"
@@ -4446,7 +4446,7 @@ msgid ""
"also the &apt-preferences; manual page."
msgstr ""
"Cette option contrôle l'entrée par défaut pour les questions de "
-"distribution ; une étiquette (pin) par défaut dont la priorité vaut 990 est "
+"distribution ; un épinglage (pin) par défaut dont la priorité vaut 990 est "
"créée en utilisant la chaîne spécifiée. Le fichier des préférences peut "
"annuler cette décision. En clair, cette option permet de contrôler "
"simplement dans quelle distribution seront récupérés les paquets. Par "
--
cgit v1.2.3
From a11afb9d0dd5d2326acb2de19ea20b49238667d0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies
Date: Wed, 21 Mar 2012 23:47:54 +0100
Subject: do not update po and pot files in the process of the build as this
causes timestamp changes for the mo files which therefore can't be refcounted
by dpkg for your M-A: same packages (Closes: #659333, LP: #924628)
The commit also enables a top-level 'make update-po' and does
all the needed changes to let this work now that update-po might
be called in a freshly checkout tree
---
doc/makefile | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'doc')
diff --git a/doc/makefile b/doc/makefile
index 4fcf3bd10..fca0bfa0d 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -67,26 +67,21 @@ veryclean-subdirs:
rm -rf $$dir; \
done
+.PHONY: update-po po4a stats
+
ifdef PO4A
doc: po4a
-clean: po4a-clean
-
-.PHONY: update-po po4a stats
update-po:
po4a --previous --no-backups --force --no-translations po4a.conf
-po4a-clean:
- po4a --previous --rm-backups --rm-translations po4a.conf
-
po4a:
po4a --previous --no-backups po4a.conf
+endif
stats:
for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
-endif
-
ifdef DOXYGEN
DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )
--
cgit v1.2.3
From 9179f697ed4796a86f820b516f034fd679e48be4 Mon Sep 17 00:00:00 2001
From: David Kalnischkies
Date: Thu, 22 Mar 2012 00:16:11 +0100
Subject: the previously used VERSION didn't work everywhere so we are
switching to the more standard PACKAGE_VERSION and make it work in every file
---
doc/Doxyfile.in | 2 +-
doc/makefile | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
(limited to 'doc')
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 43d961443..cf79aff85 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -31,7 +31,7 @@ PROJECT_NAME = @PACKAGE@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = @VERSION@
+PROJECT_NUMBER = @PACKAGE_VERSION@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/doc/makefile b/doc/makefile
index fca0bfa0d..0817821b6 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -91,9 +91,6 @@ doxygen-clean:
rm -fr $(BUILD)/doc/doxygen
rm -f $(BUILD)/doc/doxygen-stamp
-$(BUILD)/doc/Doxyfile: Doxyfile.in
- (cd $(BUILD) && ./config.status doc/Doxyfile)
-
$(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
rm -fr $(BUILD)/doc/doxygen
mkdir $(BUILD)/doc/doxygen # some versions seem to not create this directory #628799
--
cgit v1.2.3
From 2e30ddbe95ff8ecfcf7d15a8b3c69ede6cda027a Mon Sep 17 00:00:00 2001
From: Mike Erickson
Date: Thu, 22 Mar 2012 10:37:53 +0100
Subject: =?UTF-8?q?*=20doc/apt-get.8.xml:=20=20=20-=20typofix:=20respect?=
=?UTF-8?q?=20=E2=86=92=20respecting,=20thanks=20Mike=20Erickson!=20(Close?=
=?UTF-8?q?s:=20#664833)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/apt-get.8.xml | 2 +-
doc/po/apt-doc.pot | 2 +-
doc/po/de.po | 2 +-
doc/po/es.po | 2 +-
doc/po/fr.po | 2 +-
doc/po/it.po | 2 +-
doc/po/ja.po | 2 +-
doc/po/pl.po | 2 +-
doc/po/pt.po | 2 +-
doc/po/pt_BR.po | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'doc')
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index fd1cd2540..ecd753f2d 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -247,7 +247,7 @@
source causes apt-get to fetch source packages. APT
will examine the available packages to decide which source package to
fetch. It will then find and download into the current directory the
- newest available version of that source package while respect the
+ newest available version of that source package while respecting the
default release, set with the option APT::Default-Release,
the option or per package with the
pkg/release syntax, if possible.
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 364dce12f..5cc0b53fe 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -2845,7 +2845,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option "
"APT::Default-Release, the option or "
"per package with the pkg/release syntax, if possible."
diff --git a/doc/po/de.po b/doc/po/de.po
index 9a3415051..0db7a13fb 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -3768,7 +3768,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/es.po b/doc/po/es.po
index 35b8d0af7..645be1ab2 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -3820,7 +3820,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 2e0e766a7..780d1209e 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -3752,7 +3752,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/it.po b/doc/po/it.po
index 4571690e1..505553b55 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -2821,7 +2821,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 22488b227..368572943 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -3907,7 +3907,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 41eb56684..08c1b1660 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -3722,7 +3722,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index e298281f8..e3d699bd0 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -3755,7 +3755,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 488350186..4f4c04caf 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -2878,7 +2878,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
--
cgit v1.2.3
From 2629740920b3345df5e2e0cac178c447024877e8 Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Tue, 27 Mar 2012 20:32:10 +0200
Subject: Fix typo in apt-get(8). Closes: #664833
---
doc/apt-get.8.xml | 2 +-
doc/po/apt-doc.pot | 2 +-
doc/po/de.po | 2 +-
doc/po/es.po | 2 +-
doc/po/fr.po | 2 +-
doc/po/it.po | 2 +-
doc/po/ja.po | 2 +-
doc/po/pl.po | 2 +-
doc/po/pt.po | 2 +-
doc/po/pt_BR.po | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'doc')
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 0b52574e6..b1e4bf975 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -247,7 +247,7 @@
source causes apt-get to fetch source packages. APT
will examine the available packages to decide which source package to
fetch. It will then find and download into the current directory the
- newest available version of that source package while respect the
+ newest available version of that source package while respecting the
default release, set with the option APT::Default-Release,
the option or per package with the
pkg/release syntax, if possible.
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 630aec3b0..6fb883f72 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -2849,7 +2849,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option "
"APT::Default-Release, the option or "
"per package with the pkg/release syntax, if possible."
diff --git a/doc/po/de.po b/doc/po/de.po
index 96d7f054a..ad4f756f3 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -3719,7 +3719,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/es.po b/doc/po/es.po
index 0849736fa..f0f5b852a 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -3804,7 +3804,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 4996a8d18..9d012d4cd 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -3736,7 +3736,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/it.po b/doc/po/it.po
index 148244138..24fdc8099 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -2823,7 +2823,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index b79809055..cd170cca3 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -3892,7 +3892,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 309fe2637..af47d1e2d 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -3724,7 +3724,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index a96a2c97a..14f632a3b 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -3739,7 +3739,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 93f189c9c..b14e5dcb4 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -2880,7 +2880,7 @@ msgid ""
"source causes apt-get to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option APT::Default-Release"
"literal>, the option or per package with the "
"pkg/release syntax, if possible."
--
cgit v1.2.3
From 45b4187829a147c5b9c9594d20407edbdaae7e91 Mon Sep 17 00:00:00 2001
From: Bogdan Purcareata
Date: Wed, 4 Apr 2012 22:43:53 +0200
Subject: [ Bogdan Purcareata ] * doc/apt-get.8.xml: - add 'download' to the
usage line (Closes: #649340)
---
doc/apt-get.8.xml | 1 +
1 file changed, 1 insertion(+)
(limited to 'doc')
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index ecd753f2d..956259ef4 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -99,6 +99,7 @@
build-dep pkgcheck
+ download pkgcleanautocleanautoremove
--
cgit v1.2.3
From fd4bd9029ee0fe03c18187cd11ae4576c5e47379 Mon Sep 17 00:00:00 2001
From: David Kalnischkies
Date: Wed, 4 Apr 2012 23:04:57 +0200
Subject: apt-verbatim.ent is an INCLUDE file as well
---
doc/makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'doc')
diff --git a/doc/makefile b/doc/makefile
index 0817821b6..df2ddb25f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -15,7 +15,7 @@ include $(DEBIANDOC_H)
ifdef XSLTPROC
# generate a list of accepted man page translations
SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
-INCLUDES = apt.ent
+INCLUDES = apt.ent apt-verbatim.ent
STYLESHEET=manpage-style.xsl
LOCAL := manpage-$(firstword $(SOURCE))
--
cgit v1.2.3
From 6e8b4572fb7d3e575821fe8799ded1c865cd866f Mon Sep 17 00:00:00 2001
From: David Kalnischkies
Date: Thu, 5 Apr 2012 11:54:36 +0200
Subject: * doc/*: - move the command synopsis out of each manpage into
apt-verbatim.ent as they are a hell to translate and just single out the
parameters which can be translated to apt.ent
---
doc/apt-cache.8.xml | 30 +-------
doc/apt-cdrom.8.xml | 15 +---
doc/apt-config.8.xml | 16 +----
doc/apt-extracttemplates.1.xml | 12 +---
doc/apt-ftparchive.1.xml | 25 +------
doc/apt-get.8.xml | 88 +----------------------
doc/apt-key.8.xml | 24 +++----
doc/apt-mark.8.xml | 22 +-----
doc/apt-sortpkgs.1.xml | 13 +---
doc/apt-verbatim.ent | 155 +++++++++++++++++++++++++++++++++++++++++
doc/apt.ent | 43 ++++++++++++
11 files changed, 221 insertions(+), 222 deletions(-)
(limited to 'doc')
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 1393de015..42d700c82 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -33,34 +33,8 @@
query the APT cache
-
-
-
- apt-cache
-
-
-
-
- gencaches
- showpkg pkg
- showsrc pkg
- stats
- dump
- dumpavail
- unmet
- search regex
- show pkg
- depends pkg
- rdepends pkg
- pkgnames prefix
- dotty pkg
- xvcg pkg
- policy pkgs
- madison pkgs
-
-
-
-
+ &synopsis-command-apt-cache;
+
Descriptionapt-cache performs a variety of operations on APT's package
cache. apt-cache does not manipulate the state of the system
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 53ab392ab..94fc6fd8b 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -32,20 +32,7 @@
APT CDROM management utility
-
-
-
- apt-cdrom
-
-
-
-
-
- add
- ident
-
-
-
+ &synopsis-command-apt-cdrom;
Descriptionapt-cdrom is used to add a new CDROM to APTs list
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index 862a034a1..b6fcf4bf2 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -33,20 +33,8 @@
APT Configuration Query program
-
-
-
- apt-config
-
-
-
-
- shell
- dump
-
-
-
-
+ &synopsis-command-apt-config;
+
Descriptionapt-config is an internal program used by various
portions of the APT suite to provide consistent configurability. It accesses
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index af4cacfce..8f28f8c54 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -33,16 +33,8 @@
Utility to extract DebConf config and templates from Debian packages
-
-
-
- apt-extracttemplates
-
-
- file
-
-
-
+ &synopsis-command-apt-extracttemplates;
+
Descriptionapt-extracttemplates will take one or more Debian package files
as input and write out (to a temporary directory) all associated config
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index b08ebe80f..93b109af1 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -33,29 +33,8 @@
Utility to generate index files
-
-
-
- apt-ftparchive
-
-
-
-
-
-
-
-
-
- packagespathoverridepathprefix
- sourcespathoverridepathprefix
- contents path
- release path
- generate config-filesection
- clean config-file
-
-
-
-
+ &synopsis-command-apt-ftparchive;
+
Descriptionapt-ftparchive is the command line tool that generates the index
files that APT uses to access a distribution source. The index files should
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 956259ef4..65929e733 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -33,92 +33,8 @@
APT package handling utility -- command-line interface
-
-
-
- apt-get
-
-
-
-
-
-
-
-
-
-
- target_release
-
-
-
-
-
- default_architecture
-
-
-
-
-
- update
- upgrade
- dselect-upgrade
- dist-upgrade
- install
- pkg
-
-
-
- =pkg_version_number
-
-
- /target_release
-
-
-
-
-
- remove pkg
- purge pkg
- source
- pkg
-
-
-
- =pkg_version_number
-
-
- /target_release
-
-
-
-
-
- build-dep pkg
- check
- download pkg
- clean
- autoclean
- autoremove
-
-
- -v
- --version
-
-
-
-
- -h
- --help
-
-
-
-
-
-
+ &synopsis-command-apt-get;
+
Descriptionapt-get is the command-line tool for handling packages, and may be
considered the user's "back-end" to other tools using the APT
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index cae2b00a0..3748b5e17 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -25,15 +25,7 @@
APT key management utility
-
-
-
- apt-key
-
- command
-
-
-
+ &synopsis-command-apt-key;
Description
@@ -45,19 +37,19 @@
Commands
- add filename
+ add &synopsis-param-filename;
Add a new key to the list of trusted keys. The key is read
- from filename, or standard input if
- filename is -.
+ from &synopsis-param-filename;, or standard input if
+ &synopsis-param-filename; is -.
- del keyid
+ del &synopsis-param-keyid;
@@ -68,11 +60,11 @@
- export keyid
+ export &synopsis-param-keyid;
- Output the key keyid to standard output.
+ Output the key &synopsis-param-keyid; to standard output.
@@ -161,7 +153,7 @@
OptionsNote that options need to be defined before the commands described in the previous section.
- --keyring filename
+ --keyring &synopsis-param-filename;With this option it is possible to specify a specific keyring
file the command should operate on. The default is that a command is executed
on the trusted.gpg file as well as on all parts in the
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 01c8665dd..d62731124 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -33,26 +33,8 @@
mark/unmark a package as being automatically-installed
-
-
-
- apt-mark
-
-
-
-
-
- auto
- manual
- showauto
- showmanual
-
- package
-
-
-
-
-
+ &synopsis-command-apt-mark;
+
Descriptionapt-mark will change whether a package has
been marked as being automatically installed.
diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml
index f2bd3c3ea..c1d1aa1e1 100644
--- a/doc/apt-sortpkgs.1.xml
+++ b/doc/apt-sortpkgs.1.xml
@@ -33,17 +33,8 @@
Utility to sort package index files
-
-
-
- apt-sortpkgs
-
-
-
- file
-
-
-
+ &synopsis-command-apt-sortpkgs;
+
Descriptionapt-sortpkgs will take an index file (Source index or Package
index) and sort the records so that they are ordered by the package name.
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 14cd70e89..ad4554e2f 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -192,3 +192,158 @@
+
+
+
+">
+">
+">
+">
+&synopsis-pkg;
+ =&synopsis-pkg-ver-number;
+ /&synopsis-target-release;
+">
+&synopsis-pkg;">
+&synopsis-filename;">
+-v--version
+ -h--help">
+
+ apt-get
+
+ &synopsis-arg-option;
+ &synopsis-arg-config;
+ &synopsis-arg-target-release;
+ &synopsis-arg-architecture;
+
+ update
+ upgrade
+ dselect-upgrade
+ dist-upgrade
+ install &synopsis-arg-pkgver;
+ remove &synopsis-arg-pkg;
+ purge &synopsis-arg-pkg;
+ source &synopsis-arg-pkgver;
+ build-dep &synopsis-arg-pkgver;
+ download &synopsis-arg-pkgver;
+ check
+ clean
+ autoclean
+ autoremove
+ &synopsis-help;
+
+">
+
+ apt-cache
+
+ &synopsis-arg-option;
+ &synopsis-arg-config;
+
+ gencaches
+ showpkg &synopsis-arg-pkg;
+ showsrc &synopsis-arg-pkg;
+ stats
+ dump
+ dumpavail
+ unmet
+ search &synopsis-regex;
+ show &synopsis-arg-pkgver;
+ depends &synopsis-arg-pkgver;
+ rdepends &synopsis-arg-pkgver;
+ pkgnames &synopsis-prefix;
+ dotty &synopsis-arg-pkgver;
+ xvcg &synopsis-arg-pkgver;
+ policy &synopsis-arg-pkg;
+ madison &synopsis-arg-pkg;
+ &synopsis-help;
+
+">
+
+ apt-cdrom
+
+
+ &synopsis-arg-option;
+ &synopsis-arg-config;
+
+ add
+ ident
+ &synopsis-help;
+
+">
+
+ apt-config
+ &synopsis-arg-option;
+ &synopsis-arg-config;
+
+ shell
+ dump
+ &synopsis-help;
+
+">
+
+ apt-extracttemplates
+
+ &synopsis-param-filename;
+ &synopsis-help;
+">
+&synopsis-path;&synopsis-override;&synopsis-pathprefix;">
+
+ apt-ftparchive
+
+
+
+
+
+
+ &synopsis-arg-option;
+ &synopsis-arg-config;
+
+ packages &synopsis-arg-ftparchive;
+ sources &synopsis-arg-ftparchive;
+ contents &synopsis-path;
+ release &synopsis-path;
+ generate &synopsis-config-file;&synopsis-section;
+ clean &synopsis-config-file;
+ &synopsis-help;
+
+">
+&synopsis-keyid;">
+
+ apt-key
+
+
+ add &synopsis-param-filename;
+ del &synopsis-param-keyid;
+ export &synopsis-param-keyid;
+ exportall
+ list
+ finger
+ adv
+ update
+ net-update
+ &synopsis-help;
+
+">
+
+ apt-mark
+
+
+
+
+ auto
+ manual
+ showauto
+ showmanual
+
+ &synopsis-arg-pkg;
+
+ &synopsis-help;
+
+">
+
+ apt-sortpkgs
+
+ &synopsis-arg-option;
+ &synopsis-arg-config;
+ &synopsis-param-filename;
+ &synopsis-help;
+">
diff --git a/doc/apt.ent b/doc/apt.ent
index fc745989f..e48087fa7 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -208,3 +208,46 @@
This is done on purpose, to avoid losing content when the
translation is lagging behind the original content.
">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.2.3
From 96273866174c54bdb25813633891f29668d43848 Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Fri, 6 Apr 2012 20:09:13 +0200
Subject: Drop hardcoded "en.html" suffix in apt-secure manpage. Thanks to
David Prevot.
---
doc/apt-secure.8.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'doc')
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index f8ff678b9..53ee168f5 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -190,7 +190,7 @@
For more background information you might want to review the
Debian
+url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7">Debian
Security Infrastructure chapter of the Securing Debian Manual
(available also in the harden-doc package) and the
Date: Wed, 11 Apr 2012 18:12:50 +0200
Subject: prepare new experimtnal upload
---
doc/po/apt-doc.pot | 1787 +++++++++++++++++++-------------------
doc/po/de.po | 2405 ++++++++++++++++++++++++++++------------------------
doc/po/es.po | 2365 ++++++++++++++++++++++++++++-----------------------
doc/po/fr.po | 2318 +++++++++++++++++++++++++++-----------------------
doc/po/it.po | 1818 ++++++++++++++++++++-------------------
doc/po/ja.po | 2335 +++++++++++++++++++++++++++-----------------------
doc/po/pl.po | 2372 ++++++++++++++++++++++++++++-----------------------
doc/po/pt.po | 2363 ++++++++++++++++++++++++++++-----------------------
doc/po/pt_BR.po | 1827 ++++++++++++++++++++-------------------
9 files changed, 10567 insertions(+), 9023 deletions(-)
(limited to 'doc')
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 5cc0b53fe..dfb88dece 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -491,7 +491,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
#, no-wrap
msgid ""
" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+" "
+""
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+" "
+" "
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+" "
+msgstr ""
+
#. The last update date
#. type: Content of:
#: apt-cache.8.xml:16
@@ -538,40 +634,13 @@ msgstr ""
msgid "query the APT cache"
msgstr ""
-#. type: Content of:
-#: apt-cache.8.xml:39
-msgid ""
-"apt-cache "
-" "
-"gencachesshowpkg pkgshowsrc pkg "
-"statsdumpdumpavailunmet "
-"search regexshow pkg "
-"depends pkgrdepends pkg "
-"pkgnames prefixdotty "
-"pkgxvcg pkg "
-"policy pkgsmadison pkgs "
-""
-msgstr ""
-
#. type: Content of:
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38 apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38 apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43 apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
msgid "Description"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
msgid ""
"apt-cache performs a variety of operations on APT's "
"package cache. apt-cache does not manipulate the state of "
@@ -580,19 +649,19 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:44 apt-get.8.xml:44
msgid ""
"Unless the , or option is given, "
"one of the commands below must be present."
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
msgid "gencaches"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
msgid ""
"gencaches performs the same operation as apt-get "
"check. It builds the source and package caches from the sources in "
@@ -600,12 +669,12 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
msgid "showpkg pkg(s)"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
msgid ""
"showpkg displays information about the packages listed on "
"the command line. Remaining arguments are package names. The available "
@@ -619,7 +688,7 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
#, no-wrap
msgid ""
"Package: libreadline2\n"
@@ -635,7 +704,7 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
msgid ""
"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
"ncurses3.0 which must be installed for libreadline2 to work. In turn, "
@@ -647,26 +716,26 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
msgid "stats"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
msgid ""
"stats displays some statistics about the cache. No "
"further arguments are expected. Statistics reported are:"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
msgid ""
"Total package names is the number of package names found "
"in the cache."
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
msgid ""
"Normal packages is the number of regular, ordinary "
"package names; these are packages that bear a one-to-one correspondence "
@@ -675,7 +744,7 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
msgid ""
"Pure virtual packages is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -686,7 +755,7 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
msgid ""
"Single virtual packages is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
@@ -695,7 +764,7 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
msgid ""
"Mixed virtual packages is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
@@ -705,7 +774,7 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
msgid ""
"Missing is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -715,7 +784,7 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
msgid ""
"Total distinct versions is the number of package versions "
"found in the cache; this value is therefore at least equal to the number of "
@@ -725,19 +794,19 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
msgid ""
"Total dependencies is the number of dependency "
"relationships claimed by all of the packages in the cache."
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
msgid "showsrc pkg(s)"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
msgid ""
"showsrc displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
@@ -745,48 +814,48 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
msgid "dump"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
msgid ""
"dump shows a short listing of every package in the "
"cache. It is primarily for debugging."
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
msgid "dumpavail"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
msgid ""
"dumpavail prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
msgid "unmet"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
msgid ""
"unmet displays a summary of all unmet dependencies in the "
"package cache."
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
msgid "show pkg(s)"
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
msgid ""
"show performs a function similar to dpkg "
"--print-avail; it displays the package records for the named "
@@ -794,12 +863,12 @@ msgid ""
msgstr ""
#. type: Content of:
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
msgid "search regex [ regex ... ]"
msgstr ""
#. type: Content of: