summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-11-18 09:51:50 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-11-18 09:51:50 +0100
commitee7077b0133711c879312f74303e8486a2bb865d (patch)
tree1c9c74017fe14c9f92abade0a3b679e01e6c53c1 /doc
parent19a9616d1c19c4a053826585f969459d166e44f2 (diff)
parent5c246b99204e8ef32243ae42c5ca3a2dee54e59b (diff)
merged from debian-sid
Diffstat (limited to 'doc')
-rw-r--r--doc/apt.84
-rw-r--r--doc/po/fr.po8
2 files changed, 4 insertions, 8 deletions
diff --git a/doc/apt.8 b/doc/apt.8
index 78e4f0a70..e7ca8c44b 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -28,10 +28,6 @@ for the command line or
for the X Window System. Some options are only implemented in
.BR apt-get (8)
though.
-.SH OPTIONS
-None.
-.SH FILES
-None.
.SH SEE ALSO
.BR apt-cache (8),
.BR apt-get (8),
diff --git a/doc/po/fr.po b/doc/po/fr.po
index f8aca9595..b51bbf28d 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-10-29 10:10-0300\n"
-"PO-Revision-Date: 2010-10-06 22:33+0200\n"
+"POT-Creation-Date: 2010-08-23 18:46-0300\n"
+"PO-Revision-Date: 2010-10-30 09:41+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: \n"
@@ -427,7 +427,7 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>/etc/apt/apt.conf.D/</filename></term>\n"
+" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
" <listitem><para>Fragments du fichier de configuration d'APT.\n"
" Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
@@ -7651,7 +7651,7 @@ msgid ""
msgstr ""
"Le fichier d'APT, <filename>/etc/apt/preferences</filename> et les fichiers "
"fragments situés dans le dossier <filename>/etc/apt/preferences.d/</"
-"filename>, peuvent être utilisé pour choisir la version des paquets que l'on "
+"filename>, peuvent être utilisés pour choisir la version des paquets que l'on "
"veut installer."
#. type: Content of: <refentry><refsect1><para>