gnu/help2man

diff --git a/NEWS b/NEWS
index 2f6bf1a..0127565 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 1.34		November 20, 2004
+
+  * Escape all unescaped hyphens in output.
+  * Convert parenthesised options, eg (-F).
+  * Fix info section in SEE ALSO to use $program rather than
+    $info_page when referring to the program.
+
 Version 1.33		July 18, 2003
 
   * Add Polish translations.
diff --git a/README b/README
index b87317b..3a5980a 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ help2man is a script to create simple man pages from the --help and
 --version output of programs.
 
   http://www.gnu.org/software/help2man/
-  ftp://ftp.gnu.org/gnu/help2man/help2man-1.34.1.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.34.2.tar.gz
 
 Since most GNU documentation is now in info format, this provides a
 way to generate a placeholder man page pointing to that resource while
diff --git a/THANKS b/THANKS
index b1817a0..466c414 100644
--- a/THANKS
+++ b/THANKS
@@ -4,7 +4,7 @@ actual code follows.
 
 Denis Barbier			<barbier@debian.org>
 Karl Berry			<karl@freefriends.org>
-Jakub Bogusz			<qboosh@pld.org.pl>
+Jakub Bogusz			<qboosh@pld-linux.org>
 Paolo Bonzini			<bonzini@gnu.org>
 Mo DeJong			<mdejong@cygnus.com>
 Akim Demaille			<demaille@inf.enst.fr>
diff --git a/debian/changelog b/debian/changelog
index 21cfda7..0c334d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+help2man (1.34.2) unstable; urgency=low
+
+  * Update Polish translation (thanks to Jakub Bogusz).
+
+ -- Brendan O'Dea <bod@debian.org>  Wed, 24 Nov 2004 00:28:29 +1100
+
 help2man (1.34.1) unstable; urgency=low
 
   * Escape all unescaped hyphens in output (closes: #263803).
diff --git a/help2man.info b/help2man.info
index 9e3da8f..2597c59 100644
--- a/help2man.info
+++ b/help2man.info
@@ -9,8 +9,8 @@ END-INFO-DIR-ENTRY
    This file documents the GNU `help2man' command which produces simple
 manual pages from the `--help' and `--version' output of other commands.
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
-Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+Foundation, Inc.
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -347,8 +347,8 @@ intercept `open(2)' calls for message catalogs for the domain given by
 
    ---------- Footnotes ----------
 
-   (1) `help2man' currently supports `fr_FR' (*note Reports:: for how
-to submit other translations).
+   (1) `help2man' currently supports `fr_FR' and `pl_PL' (*note
+Reports:: for how to submit other translations).
 
 
 File: help2man.info,  Node: Reports,  Next: Availability,  Prev: Localised man pages,  Up: Top
@@ -376,15 +376,15 @@ The latest version of this distribution is available on-line from:
 
 
 Tag Table:
-Node: Top1106
-Node: Overview1813
-Node: Invoking help2man2520
-Node: --help recommendations4691
-Node: Including text8107
-Node: Makefile usage9644
-Node: Localised man pages10583
-Ref: Localised man pages-Footnote-112383
-Node: Reports12485
-Node: Availability12943
+Node: Top1112
+Node: Overview1819
+Node: Invoking help2man2526
+Node: --help recommendations4697
+Node: Including text8113
+Node: Makefile usage9650
+Node: Localised man pages10589
+Ref: Localised man pages-Footnote-112389
+Node: Reports12503
+Node: Availability12961
 
 End Tag Table
diff --git a/help2man.pl.1 b/help2man.pl.1
index 72817a7..a5a3c97 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -116,15 +116,17 @@ w miejscu
 Najnowsza wersja tego oprogramowania jest dostêpna pod:
 
     ftp://ftp.gnu.org/gnu/help2man/
+.SH AUTOR
+Program napisa³ Brendan O'Dea <bod@debian.org>
 .SH "ZG£ASZANIE B£ÊDÓW"
 B³êdy proszê zg³aszaæ na adres <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
 Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
 Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.PP
-Written by Brendan O'Dea <bod@debian.org>
+.br
+Ten program jest darmowy; warunki kopiowania s± opisane w ¼ród³ach.
+Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji PRZYDATNO¦CI
+DO SPRZEDA¯Y LUB DO KONKRETNYCH CELÓW.
 .SH "ZOBACZ TAK¯E"
 Pe³na dokumentacja dla programu
 .B help2man
diff --git a/help2man.texi b/help2man.texi
index f8a1bf1..e99b419 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -3,7 +3,7 @@
 @settitle @command{help2man} Reference Manual
 @setchapternewpage on
 @finalout
-@c $Id: help2man.texi,v 1.9 2003/07/08 14:19:18 bod Exp $
+@c $Id: help2man.texi,v 1.10 2004/11/23 13:30:17 bod Exp $
 
 @dircategory GNU programming support
 @direntry
@@ -15,7 +15,8 @@ This file documents the GNU @command{help2man} command which produces
 simple manual pages from the @samp{--help} and @samp{--version} output
 of other commands.
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -46,7 +47,7 @@ by the Foundation.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003 Free Software
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 Free Software
 Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -366,8 +367,9 @@ for @command{autoconf} alone.
 
 Manual pages may be produced for any locale supported by both the
 program and @command{help2man}@footnote{@command{help2man} currently
-supports @samp{fr_FR} (@pxref{Reports} for how to submit other
-translations).} with the @samp{--locale} (@samp{-L}) option.
+supports @samp{fr_FR} and @samp{pl_PL} (@pxref{Reports} for how to
+submit other translations).} with the @samp{--locale} (@samp{-L})
+option.
 
 @example
 help2man -L fr_FR@@euro -o cp.fr.1 cp
diff --git a/po/pl.gmo b/po/pl.gmo
index 0714307..2b0ab01 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 7a7ec25..06d4ef3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,14 +1,14 @@
 # Polish translation for help2man.
-# Copyright (C) 2003 Free Software Foundation
+# Copyright (C) 2003, 2004 Free Software Foundation
 # This file is distributed under the same license as the help2man package.
-# Jakub Bogusz <qboosh@pld.org.pl>, 2003.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man 1.33\n"
-"POT-Creation-Date: 2003-07-18 00:21:58+1000\n"
-"PO-Revision-Date: 2003-07-18 00:29:13+1000\n"
-"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
+"Project-Id-Version: help2man 1.34.1\n"
+"POT-Creation-Date: 2004-11-20 10:10:31+1100\n"
+"PO-Revision-Date: 2004-11-21 21:51+1000\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software\n"
 "Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software\n"
 "Foundation, Inc.\n"
 "Ten program jest darmowy; warunki kopiowania s± opisane w ¼ród³ach.\n"
 "Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji PRZYDATNO¦CI\n"
@@ -135,35 +135,35 @@ msgstr "lub|albo"
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: help2man:359
+#: help2man:362
 msgid "Report +bugs|Email +bug +reports +to"
 msgstr "B³êdy +(proszê|prosimy) +zg³aszaæ +na +adres|Raporty +o +b³êdach +wysy³aj +do"
 
-#: help2man:360
+#: help2man:363
 msgid "Written +by"
 msgstr "Napisany +przez|Program +napisa(³a?|li)"
 
-#: help2man:361
+#: help2man:364
 msgid "Options"
 msgstr "Opcje"
 
-#: help2man:362
+#: help2man:365
 msgid "Examples"
 msgstr "Przyk³ady"
 
-#: help2man:363
+#: help2man:366
 msgid "This +is +free +software"
 msgstr "Ten +program +jest +darmowy"
 
-#: help2man:375
+#: help2man:378
 msgid "OPTIONS"
 msgstr "OPCJE"
 
-#: help2man:380
+#: help2man:383
 msgid "EXAMPLES"
 msgstr "PRZYK£ADY"
 
-#: help2man:387
+#: help2man:390
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
@@ -175,11 +175,11 @@ msgstr "ZG
 msgid "AUTHOR"
 msgstr "AUTOR"
 
-#: help2man:546
+#: help2man:549
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAK¯E"
 
-#: help2man:549
+#: help2man:552
 msgid ""
 "The full documentation for\n"
 ".B %s\n"
@@ -205,14 +205,14 @@ msgstr ""
 ".PP\n"
 "powinno udostêpniæ kompletny podrêcznik.\n"
 
-#: help2man:571
+#: help2man:574
 msgid "NAME"
 msgstr "NAZWA"
 
-#: help2man:571
+#: help2man:574
 msgid "SYNOPSIS"
 msgstr "SK£ADNIA"
 
-#: help2man:601
+#: help2man:606
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: b³±d zapisu do %s (%s)"