* doc/apt-get.8.xml:

  - use apt-utils as package example instead of libc6

diff --git a/debian/changelog b/debian/changelog
index 011e1b37c611c60469f8e296e4395e09210f3dbd..ccf83f7d665587bf3ba186020be88481a3e86df8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * doc/examples/sources.list:
     - use the codename instead of 'stable' in the examples sources.list
       as we do in the manpage and as the debian-installer does
+  * doc/apt-get.8.xml:
+    - use apt-utils as package example instead of libc6
 
   [ Justin B Rye ]
   * doc/apt-cdrom.8.xml:

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 48e8d41229368cb3420069a7c74b0912ce612702..a05a441a406df65ca72c58167bc0dda1b4481036 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -99,8 +99,8 @@
         packages desired for installation or upgrading. 
         Each package is a package name, not a fully qualified 
         filename (for instance, in a Debian system, 
-        libc6 would be the argument provided, not 
-        <literal>libc6_1.9.6-2.deb</literal>). All packages required 
+        <package>apt-utils</package> would be the argument provided, not 
+        <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All packages required 
         by the package(s) specified for installation will also 
         be retrieved and installed. 
         The <filename>/etc/apt/sources.list</filename> file is 

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index fc44b215d0cddc4c4c21134fb3bcd4a28b1873bd..582a2c8b41ed0dc4b7674baa0bbe0f6f2081e70e 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-29 15:53+0300\n"
+"POT-Creation-Date: 2012-05-29 16:11+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2113,15 +2113,16 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
-"required by the package(s) specified for installation will also be retrieved "
-"and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
-"to locate the desired packages. If a hyphen is appended to the package name "
-"(with no intervening space), the identified package will be removed if it is "
-"installed.  Similarly a plus sign can be used to designate a package to "
-"install. These latter features may be used to override decisions made by "
-"apt-get's conflict resolution system."
+"qualified filename (for instance, in a Debian system, "
+"<package>apt-utils</package> would be the argument provided, not "
+"<filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All "
+"packages required by the package(s) specified for installation will also be "
+"retrieved and installed.  The <filename>/etc/apt/sources.list</filename> "
+"file is used to locate the desired packages. If a hyphen is appended to the "
+"package name (with no intervening space), the identified package will be "
+"removed if it is installed.  Similarly a plus sign can be used to designate "
+"a package to install. These latter features may be used to override "
+"decisions made by apt-get's conflict resolution system."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

diff --git a/doc/po/de.po b/doc/po/de.po
index 95e0a1ffe9370122d60836412b9be72f4a8f06a2..bea49a1ddfe9b41e92984ed6a23fc18106f3d3f3 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -2870,8 +2870,8 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</package> would be the "
+"argument provided, not <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All packages "
 "required by the package(s) specified for installation will also be retrieved "
 "and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
 "to locate the desired packages. If a hyphen is appended to the package name "
@@ -2883,8 +2883,8 @@ msgstr ""
 "<literal>install</literal> wird gefolgt von einem oder mehreren gewünschten "
 "Paketen zur Installation oder zum Upgrade. Jedes Paket ist ein Paketname, "
 "kein vollständig zusammengesetzter Dateiname (zum Beispiel wäre in einem "
-"»Debian«-System libc6 das bereitgestellte Argument, nicht "
-"<literal>libc6_1.9.6-2.deb</literal>). Alle von den zur Installation "
+"»Debian«-System <package>apt-utils</package> das bereitgestellte Argument, nicht "
+"<filename>apt-utils_&apt-product-version;_amd64.deb</filename>). Alle von den zur Installation "
 "angegebenen Paketen benötigten Pakete werden zusätzlich heruntergeladen und "
 "installiert. Die <filename>/etc/apt/sources.list</filename>-Datei wird "
 "benutzt, um die gewünschten Pakete zu finden. Wenn ein Bindestrich an den "

diff --git a/doc/po/es.po b/doc/po/es.po
index a9e219c282ce1e975d3a936e2b1fa9b0f8264660..795fdd6fc5f3ef120563ad362bedd440ab154bfe 100644 (file)
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -2915,8 +2915,8 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</package> would be the "
+"argument provided, not <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All packages "
 "required by the package(s) specified for installation will also be retrieved "
 "and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
 "to locate the desired packages. If a hyphen is appended to the package name "
@@ -2928,7 +2928,7 @@ msgstr ""
 "<literal>install</literal> instala o actualiza los paquetes que siguen a la "
 "palabra «install». Cada paquete es un nombre de paquete, y no el nombre "
 "completo del fichero del paquete (por ejemplo, en un sistema Debian GNU/"
-"Linux, el argumento sería libc6, no <literal>libc6_1.9.6-2.deb</literal>). "
+"Linux, el argumento sería <package>apt-utils</package>, no <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). "
 "Se obtendrán e instalarán todos los paquetes necesarios por los paquetes "
 "especificados para la instalación. El fichero <filename>/etc/apt/sources."
 "list</filename> se usa para ubicar los paquetes. Si antepone un guión al "

diff --git a/doc/po/fr.po b/doc/po/fr.po
index 5adb3459bf94cbce175582d89a842ec33ff724e3..1c28965b53aa559f35e4bb23ab210945c69f1267 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -2877,8 +2877,8 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</package> would be the "
+"argument provided, not <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All packages "
 "required by the package(s) specified for installation will also be retrieved "
 "and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
 "to locate the desired packages. If a hyphen is appended to the package name "
@@ -2890,7 +2890,7 @@ msgstr ""
 "La commande <literal>install</literal> est suivie par un ou plusieurs "
 "paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas un "
 "nom complet de fichier (par exemple, dans un système Debian, on indiquera "
-"libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les paquets "
+"<package>apt-utils</package> et non pas <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). Tous les paquets "
 "requis par le(s) paquet(s) que l'on veut installer sont aussi récupérés et "
 "installés. Le fichier <filename>/etc/apt/sources.list</filename> est utilisé "
 "pour retrouver les paquets désirés. Quand un trait d'union est accolé (sans "

diff --git a/doc/po/it.po b/doc/po/it.po
index 41e1314dff078dd4d47ea1b6269cfa1cbef3cbfc..6f8765df587f2143ee6afd79e28f3a191cc6e398 100644 (file)
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-29 15:35+0300\n"
+"POT-Creation-Date: 2012-05-29 16:11+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -2084,12 +2084,13 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
-"required by the package(s) specified for installation will also be retrieved "
-"and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
-"to locate the desired packages. If a hyphen is appended to the package name "
-"(with no intervening space), the identified package will be removed if it is "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed.  The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"desired packages. If a hyphen is appended to the package name (with no "
+"intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
 "install. These latter features may be used to override decisions made by apt-"
 "get's conflict resolution system."

diff --git a/doc/po/ja.po b/doc/po/ja.po
index 60edbbad62cc3259c1b33f935d5b763b570bf62b..0b08bb22fa559d9c95ef0fe869c8a890d5d7d885 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -2983,8 +2983,8 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</package> would be the "
+"argument provided, not <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All packages "
 "required by the package(s) specified for installation will also be retrieved "
 "and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
 "to locate the desired packages. If a hyphen is appended to the package name "
@@ -2995,8 +2995,8 @@ msgid ""
 msgstr ""
 "<literal>install</literal> の後には、インストールするパッケージを 1 つ以上指"
 "定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例"
-"えば Debian システムでは、<literal>libc6_1.9.6-2.deb</literal> ではなく "
-"libc6 を引数として与えます)。インストールするよう指定したすべてのパッケージに"
+"えば Debian システムでは、<literal>apt-utils_&apt-product-version;_amd64.deb</literal> ではなく "
+"<package>apt-utils</package> を引数として与えます)。インストールするよう指定したすべてのパッケージに"
 "対し、取得・インストールを行います。<filename>/etc/apt/sources.list</"
 "filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
 "ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ"

diff --git a/doc/po/pl.po b/doc/po/pl.po
index 922a85a97e4cfe6e4eb44ea962783bbc9d08f975..4462cd165692f04c195c89390387d537356bbf05 100644 (file)
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -2783,8 +2783,8 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</package> would be the "
+"argument provided, not <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All packages "
 "required by the package(s) specified for installation will also be retrieved "
 "and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
 "to locate the desired packages. If a hyphen is appended to the package name "
@@ -2796,8 +2796,8 @@ msgstr ""
 "Po <literal>install</literal> musi występować nazwa jednego lub więcej "
 "pakietów przeznaczonych do zainstalowania. Każdy argument jest nazwą "
 "pakietu, a nie pełną nazwą pliku, w którym się znajduje (na przykład w "
-"systemie Debian, tym argumentem byłoby libc6, a nie <literal>libc6_1.9.6-2."
-"deb</literal>).  Wszystkie pakiety, które są potrzebne do zainstalowania "
+"systemie Debian, tym argumentem byłoby <package>apt-utils</package>, a nie <filename>apt-utils_&apt-product-version;_amd64."
+"deb</filename>).  Wszystkie pakiety, które są potrzebne do zainstalowania "
 "żądanego(-ych)  pakietu(-ów), będą także ściągnięte i zainstalowane.  Plik "
 "<filename>/etc/apt/sources.list</filename> zawiera listę adresów, z których "
 "będą pobierane żądane pakiety. Jeżeli po nazwie pakietu pojawi się minus "

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 3867ad661f9f852a6f834cabb52995de4014937a..4d87e1556e09b0babecdfc9db86803ffc4d2281c 100644 (file)
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2872,8 +2872,8 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</package> would be the "
+"argument provided, not <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All packages "
 "required by the package(s) specified for installation will also be retrieved "
 "and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
 "to locate the desired packages. If a hyphen is appended to the package name "
@@ -2885,8 +2885,8 @@ msgstr ""
 "<literal>install</literal> é seguido por um ou mais pacotes desejados para "
 "instalação ou actualização. Cada pacote é um nome de pacote, não um nome de "
 "ficheiro completamente qualificado (por exemplo, num sistema Debian GNU/"
-"Linux, libc6 seria o argumento fornecido e não <literal>libc6_1.9.6-2.deb</"
-"literal>). Todos os pacotes necessários pelos pacotes especificados para "
+"Linux, <package>apt-utils</package> seria o argumento fornecido e não <filename>apt-utils_&apt-product-version;_amd64.deb</"
+"filename>). Todos os pacotes necessários pelos pacotes especificados para "
 "instalação irão também ser obtidos e instalados. O ficheiro <filename>/etc/"
 "apt/sources.list</filename> é usado para localizar os pacotes desejados. Se "
 "for acrescentado um sinal menos (-) ao nome do pacote (sem nenhum espaço a "

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 10fd6b57865ce80801a902cb3447bdf9667a21e5..67ef15d8ad6bd528c351e7fe028c8628c7e214a2 100644 (file)
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-29 15:35+0300\n"
+"POT-Creation-Date: 2012-05-29 16:11+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -2143,12 +2143,13 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, libc6 would be the "
-"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
-"required by the package(s) specified for installation will also be retrieved "
-"and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
-"to locate the desired packages. If a hyphen is appended to the package name "
-"(with no intervening space), the identified package will be removed if it is "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed.  The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"desired packages. If a hyphen is appended to the package name (with no "
+"intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
 "install. These latter features may be used to override decisions made by apt-"
 "get's conflict resolution system."