update to 2.7.2

- resolves #1256177
This commit is contained in:
Nikola Forró 2015-08-24 11:17:59 +02:00
parent 51c49a3297
commit 785e2710e1
5 changed files with 8 additions and 800 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/man-db-2.7.1.tar.xz
/man-db-2.7.2.tar.xz

View File

@ -1,25 +0,0 @@
From 2b6858ce7a82ed01ac02cb1ddb3afc98055ab123 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Thu, 13 Nov 2014 10:59:59 +0100
Subject: [PATCH] src/man.c (do_extern): Pass the -l option through
---
src/man.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/man.c b/src/man.c
index 5a72e1f..e65935a 100644
--- a/src/man.c
+++ b/src/man.c
@@ -740,6 +740,8 @@ static void do_extern (int argc, char *argv[])
/* Please keep these in the same order as they are in whatis.c. */
if (debug_level)
pipecmd_arg (cmd, "-d");
+ if (local_man_file) /* actually apropos/whatis --long */
+ pipecmd_arg (cmd, "-l");
if (colon_sep_section_list)
pipecmd_args (cmd, "-s", colon_sep_section_list, NULL);
if (alt_system_name)
--
1.9.3

View File

@ -1,769 +0,0 @@
From 4fee655dc6a8b31f0b5979e83bc1e8a0f3dcf303 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sun, 02 Aug 2015 15:31:31 +0000
Subject: Fix inaccurate description of "man -f"
It's equivalent to "whatis", not "whatis -r". Fixes Fedora
bug #1249377.
* man/man1/man.man1 (EXAMPLES): "man -k" and "man -f" are equivalent to
"apropos" and "whatis" respectively, not "apropos -r" and "whatis -r".
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update; unfuzzy all
translations.
---
diff --git a/man/man1/man.man1 b/man/man1/man.man1
index 682ac2c..3d981c5 100644
--- a/man/man1/man.man1
+++ b/man/man1/man.man1
@@ -330,14 +330,14 @@ Search the short descriptions and manual page names for the keyword
as regular expression.
Print out any matches.
Equivalent to
-.BI %apropos%\ \-r \ printf .
+.BI %apropos% \ printf .
.TP
.BI %man%\ \-f \ smail
Lookup the manual pages referenced by
.I smail
and print out the short descriptions of any found.
Equivalent to
-.BI %whatis%\ \-r \ smail .
+.BI %whatis% \ smail .
.SH OVERVIEW
Many options are available to
.B %man%
diff --git a/man/po4a/po/da.po b/man/po4a/po/da.po
index ef91431..e904249 100644
--- a/man/po4a/po/da.po
+++ b/man/po4a/po/da.po
@@ -1156,11 +1156,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"Søg i de korte beskrivelser og navnene på manualsiderne for nøgleordet "
-"I<printf> som regulært udtryk. Udskriv resultaterne. Svarer til B<%apropos%"
-"\\ -r>I<\\ printf>B<.>"
+"I<printf> som regulært udtryk. Udskriv resultaterne. Svarer til B<%apropos"
+"%>I<\\ printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1172,10 +1172,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"Slå manualsiderne refereret af I<smail> op og vis den korte beskrivelse for "
-"det fundne resultat. Svarer til B<%whatis%\\ -r>I<\\ smail>B<.>"
+"det fundne resultat. Svarer til B<%whatis%>I<\\ smail>B<.>"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -2975,8 +2975,8 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "Filnavn\n"
+msgid "Filename"
+msgstr "Filnavn"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -2999,7 +2999,7 @@ msgstr "Ja"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
+msgid "I<index.bt>"
msgstr ""
#. type: tbl table
@@ -3018,7 +3018,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
+msgid "I<index.db>"
msgstr ""
#. type: tbl table
@@ -3042,8 +3042,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 45b6aff..03dc50b 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -1340,11 +1340,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"Sucht in den Kurzbeschreibungen und Namen der Handbuchseiten nach dem als "
"regulären Ausdruck angesehenen Schlüsselwort I<printf> und gibt alle "
-"Fundstellen aus. Diese Option entspricht B<%apropos%\\ -r> I<\\ printf>B<.>"
+"Fundstellen aus. Diese Option entspricht B<%apropos%> I<\\ printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1356,11 +1356,11 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"Sucht die durch I<smail> angegebenen Handbuchseiten und gibt alle "
"Kurzbeschreibungen der gefundenen Seiten aus. Diese Option entspricht B<"
-"%apropos%\\ -r> I<\\ printf>B<.>"
+"%apropos%> I<\\ printf>B<.>"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -3702,8 +3702,8 @@ msgstr "asynch"
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "Dateiname\n"
+msgid "Filename"
+msgstr "Dateiname"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -3726,8 +3726,8 @@ msgstr "Ja"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
-msgstr "I<index.bt>\n"
+msgid "I<index.bt>"
+msgstr "I<index.bt>"
# Oder doch Hash-Tabelle?
#. type: tbl table
@@ -3746,8 +3746,8 @@ msgstr "Hash-Tabelle"
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
-msgstr "I<index.db>\n"
+msgid "I<index.db>"
+msgstr "I<index.db>"
#. type: tbl table
#: ../../man/man8/mandb.man8:67
@@ -3770,8 +3770,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 92fed67..40e1d51 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -1245,12 +1245,12 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"Recherche la description courte et le nom des pages de manuel comportant le "
"mot-clé I<printf>, utilisé comme une expression rationnelle, puis affiche "
-"tout ce qui a été trouvé. Cette commande est équivalente à B<%apropos%\\ -"
-"r>I<\\ printf>B<.>"
+"tout ce qui a été trouvé. Cette commande est équivalente à B<%apropos%>I<\\ "
+"printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1262,10 +1262,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"Recherche les pages de manuel nommées I<smail> et en affiche les "
-"descriptions courtes. Équivalent à B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions courtes. Équivalent à B<%whatis%>I<\\ smail>B<.>"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -3623,8 +3623,8 @@ msgstr "Async"
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "Nom de fichier\n"
+msgid "Filename"
+msgstr "Nom de fichier"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -3647,8 +3647,8 @@ msgstr "Oui"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
-msgstr "I<index.bt>\n"
+msgid "I<index.bt>"
+msgstr "I<index.bt>"
#. type: tbl table
#: ../../man/man8/mandb.man8:64
@@ -3666,8 +3666,8 @@ msgstr "Hachage"
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
-msgstr "I<index.db>\n"
+msgid "I<index.db>"
+msgstr "I<index.db>"
#. type: tbl table
#: ../../man/man8/mandb.man8:67
@@ -3690,8 +3690,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
diff --git a/man/po4a/po/id.po b/man/po4a/po/id.po
index 19fb29c..f8fd4f5 100644
--- a/man/po4a/po/id.po
+++ b/man/po4a/po/id.po
@@ -1280,11 +1280,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"Cari deskripsi singkat dan nama halaman buku panduan untuk kata kunci "
"I<printf> seperti ekspresi umum. Cetak semua kecocokan. Sama dengan B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1296,11 +1296,11 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"Cari halaman buku panduan direferensikan oleh I<smail> dan tampilkan "
-"deskripsi singkat dari apapun yang ditemukan. Sama dengan B<%whatis%\\ -r>I<"
-"\\ smail>B<.>"
+"deskripsi singkat dari apapun yang ditemukan. Sama dengan B<%whatis%>I<\\ "
+"smail>B<.>"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -3632,8 +3632,8 @@ msgstr "Async"
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "Filename\n"
+msgid "Filename"
+msgstr "Filename"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -3656,8 +3656,8 @@ msgstr "Yes"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
-msgstr "I<index.bt>\n"
+msgid "I<index.bt>"
+msgstr "I<index.bt>"
#. type: tbl table
#: ../../man/man8/mandb.man8:64
@@ -3675,8 +3675,8 @@ msgstr "Hashed"
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
-msgstr "I<index.db>\n"
+msgid "I<index.db>"
+msgstr "I<index.db>"
#. type: tbl table
#: ../../man/man8/mandb.man8:67
@@ -3699,8 +3699,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
diff --git a/man/po4a/po/ja.po b/man/po4a/po/ja.po
index 8c058be..385c808 100644
--- a/man/po4a/po/ja.po
+++ b/man/po4a/po/ja.po
@@ -1208,10 +1208,10 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"キーワード I<printf> をマニュアルページ名と要約文の中から正規表現として検索し"
-"ます。一致するすべてのマニュアルページが表示されます。 B<%apropos%\\ -r>I<\\ "
+"ます。一致するすべてのマニュアルページが表示されます。 B<%apropos%>I<\\ "
"printf> と同様です。"
#. type: TP
@@ -1224,10 +1224,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"I<smail> によって参照されるマニュアルページを検索し、見つかったページの要約を"
-"表示します。 B<%whatis%\\ -r>I<\\ smail> と同様です。"
+"表示します。 B<%whatis%>I<\\ smail> と同様です。"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -3380,8 +3380,8 @@ msgstr "非同期"
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "ファイル名\n"
+msgid "Filename"
+msgstr "ファイル名"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -3404,8 +3404,8 @@ msgstr "○"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
-msgstr "I<index.bt>\n"
+msgid "I<index.bt>"
+msgstr "I<index.bt>"
#. type: tbl table
#: ../../man/man8/mandb.man8:64
@@ -3423,8 +3423,8 @@ msgstr "ハッシュ"
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
-msgstr "I<index.db>\n"
+msgid "I<index.db>"
+msgstr "I<index.db>"
#. type: tbl table
#: ../../man/man8/mandb.man8:67
@@ -3447,8 +3447,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
diff --git a/man/po4a/po/man-db-manpages.pot b/man/po4a/po/man-db-manpages.pot
index 58a32b6..d8a4282 100644
--- a/man/po4a/po/man-db-manpages.pot
+++ b/man/po4a/po/man-db-manpages.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-16 14:04+0100\n"
+"POT-Creation-Date: 2015-08-02 12:29+0100\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"
@@ -931,7 +931,7 @@ msgstr ""
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to "
-"B<%apropos%\\ -r>I<\\ printf>B<.>"
+"B<%apropos%>I<\\ printf>B<.>"
msgstr ""
#. type: TP
@@ -944,7 +944,7 @@ msgstr ""
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
#. type: SH
@@ -2643,7 +2643,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
+msgid "Filename"
msgstr ""
#. type: tbl table
@@ -2667,7 +2667,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
+msgid "I<index.bt>"
msgstr ""
#. type: tbl table
@@ -2685,7 +2685,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
+msgid "I<index.db>"
msgstr ""
#. type: tbl table
@@ -2709,7 +2709,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
msgstr ""
#. type: Plain text
diff --git a/man/po4a/po/nl.po b/man/po4a/po/nl.po
index 48f775e..64118d3 100644
--- a/man/po4a/po/nl.po
+++ b/man/po4a/po/nl.po
@@ -1309,11 +1309,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"Zoek in de korte beschrijvingen en namen van man-pagina's naar het trefwoord "
"I<printf> als reguliere expressie. Toon iedere treffer. Komt overeen met B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1325,10 +1325,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"Alle korte beschijvingen tonen van de man-pagina's waarnaar verwezen wordt "
-"door I<smail>. Is gelijk aan B<%whatis%\\ -r>I<\\ smail>B<.>"
+"door I<smail>. Is gelijk aan B<%whatis%>I<\\ smail>B<.>"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -3508,7 +3508,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
+msgid "Filename"
msgstr ""
#. type: tbl table
@@ -3532,7 +3532,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
+msgid "I<index.bt>"
msgstr ""
#. type: tbl table
@@ -3551,7 +3551,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
+msgid "I<index.db>"
msgstr ""
#. type: tbl table
@@ -3575,7 +3575,7 @@ msgstr ""
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
msgstr ""
#. type: Plain text
diff --git a/man/po4a/po/pl.po b/man/po4a/po/pl.po
index b48e891..f52154b 100644
--- a/man/po4a/po/pl.po
+++ b/man/po4a/po/pl.po
@@ -1244,11 +1244,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"Szuka słowa kluczowego I<printf> jako wyrażenia regularnego w krótkich "
"opisach i nazwach stron podręcznika. Wyświetla wszystkie dopasowania. "
-"Odpowiednik B<%apropos%\\ -r>I<\\ printf>B<.>"
+"Odpowiednik B<%apropos%>I<\\ printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1260,10 +1260,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"Wyszukuje strony podręcznika opisane przez I<smail> i wyświetla krótki opis "
-"każdej ze znalezionych stron. Odpowiednik B<%whatis%\\ -r>I<\\ smail>B<.>"
+"każdej ze znalezionych stron. Odpowiednik B<%whatis%>I<\\ smail>B<.>"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -3574,8 +3574,8 @@ msgstr "Asynchroniczna"
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "Nazwa pliku\n"
+msgid "Filename"
+msgstr "Nazwa pliku"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -3598,8 +3598,8 @@ msgstr "Tak"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
-msgstr "I<index.bt>\n"
+msgid "I<index.bt>"
+msgstr "I<index.bt>"
#. type: tbl table
#: ../../man/man8/mandb.man8:64
@@ -3617,8 +3617,8 @@ msgstr "Funkcja mieszająca"
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
-msgstr "I<index.db>\n"
+msgid "I<index.db>"
+msgstr "I<index.db>"
#. type: tbl table
#: ../../man/man8/mandb.man8:67
@@ -3641,8 +3641,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
diff --git a/man/po4a/po/ru.po b/man/po4a/po/ru.po
index c08bce0..8131320 100644
--- a/man/po4a/po/ru.po
+++ b/man/po4a/po/ru.po
@@ -1238,11 +1238,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"Искать в кратких описаниях и именах справочных страниц ключевое слово "
"I<printf>, рассматриваемое как регулярное выражение. Показать любые "
-"найденные совпадения. Эквивалентно вызову B<%apropos%\\ -r>I<\\ printf>B<.>"
+"найденные совпадения. Эквивалентно вызову B<%apropos%>I<\\ printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1254,10 +1254,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
"Искать справочные страницы, ссылающиеся на I<smail> и показать краткое "
-"описание любой найденной. Эквивалентно вызову B<%whatis%\\ -r>I<\\ smail>B<.>"
+"описание любой найденной. Эквивалентно вызову B<%whatis%>I<\\ smail>B<.>"
#. type: SH
#: ../../man/man1/man.man1:341
@@ -3538,8 +3538,8 @@ msgstr "Асинхронность"
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "Имя файла\n"
+msgid "Filename"
+msgstr "Имя файла"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -3562,8 +3562,8 @@ msgstr "Да"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
-msgstr "I<index.bt>\n"
+msgid "I<index.bt>"
+msgstr "I<index.bt>"
#. type: tbl table
#: ../../man/man8/mandb.man8:64
@@ -3581,8 +3581,8 @@ msgstr "Хэш"
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
-msgstr "I<index.db>\n"
+msgid "I<index.db>"
+msgstr "I<index.db>"
#. type: tbl table
#: ../../man/man8/mandb.man8:67
@@ -3605,8 +3605,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
diff --git a/man/po4a/po/zh_CN.po b/man/po4a/po/zh_CN.po
index d56cada..0d45a91 100644
--- a/man/po4a/po/zh_CN.po
+++ b/man/po4a/po/zh_CN.po
@@ -1214,10 +1214,10 @@ msgstr "B<%man%\\ -k>I<\\ printf>"
msgid ""
"Search the short descriptions and manual page names for the keyword "
"I<printf> as regular expression. Print out any matches. Equivalent to B<"
-"%apropos%\\ -r>I<\\ printf>B<.>"
+"%apropos%>I<\\ printf>B<.>"
msgstr ""
"将关键词 I<printf> 作为正则表达式来搜索对应的手册页概述和手册页名称。打印任何"
-"匹配结果。等效于 B<%apropos%\\ -r>I<\\ printf>B<.>"
+"匹配结果。等效于 B<%apropos%>I<\\ printf>B<.>"
#. type: TP
#: ../../man/man1/man.man1:334
@@ -1229,9 +1229,9 @@ msgstr "B<%man%\\ -f>I<\\ smail>"
#: ../../man/man1/man.man1:341
msgid ""
"Lookup the manual pages referenced by I<smail> and print out the short "
-"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>"
+"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>"
msgstr ""
-"查找 I<smail> 引用的手册页并输出找到的任何概述。等效于 B<%whatis%\\ -r>I<\\ "
+"查找 I<smail> 引用的手册页并输出找到的任何概述。等效于 B<%whatis%>I<\\ "
"smail>B<.>"
#. type: SH
@@ -3336,8 +3336,8 @@ msgstr "异步"
#. type: tbl table
#: ../../man/man8/mandb.man8:59
#, no-wrap
-msgid "Filename\n"
-msgstr "文件名\n"
+msgid "Filename"
+msgstr "文件名"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
@@ -3360,8 +3360,8 @@ msgstr "是"
#. type: tbl table
#: ../../man/man8/mandb.man8:61
#, no-wrap
-msgid "I<index.bt>\n"
-msgstr "I<index.bt>\n"
+msgid "I<index.bt>"
+msgstr "I<index.bt>"
#. type: tbl table
#: ../../man/man8/mandb.man8:64
@@ -3379,8 +3379,8 @@ msgstr "已散列"
#. type: tbl table
#: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67
#, no-wrap
-msgid "I<index.db>\n"
-msgstr "I<index.db>\n"
+msgid "I<index.db>"
+msgstr "I<index.db>"
#. type: tbl table
#: ../../man/man8/mandb.man8:67
@@ -3403,8 +3403,8 @@ msgstr "UNIX ndbm"
#. type: tbl table
#: ../../man/man8/mandb.man8:70
#, no-wrap
-msgid "I<index.(dir|pag)>\n"
-msgstr "I<index.(dir|pag)>\n"
+msgid "I<index.(dir|pag)>"
+msgstr "I<index.(dir|pag)>"
#. type: Plain text
#: ../../man/man8/mandb.man8:83
--
cgit v0.9.0.2

View File

@ -3,8 +3,8 @@
Summary: Tools for searching and reading man pages
Name: man-db
Version: 2.7.1
Release: 8%{?dist}
Version: 2.7.2
Release: 1%{?dist}
# GPLv2+ .. man-db
# GPLv3+ .. gnulib
License: GPLv2+ and GPLv3+
@ -15,8 +15,6 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.ta
Source1: man-db.crondaily
Source2: man-db.sysconfig
Patch0: 1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch
Patch1: 1161747-src-man.c-do_extern-Pass-the-l-option-through.patch
Patch2: 1249377-fix-inaccurate-description-of-man-f.patch
Obsoletes: man < 2.0
Provides: man = %{version}
@ -136,6 +134,10 @@ fi
%lang(zh_CN) %{_datadir}/man/zh_CN/man*/*
%changelog
* Mon Aug 24 2015 Nikola Forró <nforro@redhat.com> - 2.7.2-1
- update to 2.7.2
resolves #1256177
* Tue Aug 04 2015 Nikola Forró <nforro@redhat.com> - 2.7.1-8
- fix inaccurate description of "man -f"
resolves #1249377

View File

@ -1 +1 @@
88d32360e2ed18e05de9b528ad336fd8 man-db-2.7.1.tar.xz
4b9480e4f1da04abb22ae7a9345ace6b man-db-2.7.2.tar.xz