Commit 602474a3f67837a708650379603a21ed0aff0376

Thomas de Grivel 2023-01-21T15:08:50

help2man-1.40.10

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
diff --git a/README b/README
index 82b6bd4..b3a3bf9 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-		README for GNU help2man version 1.40.9
+		README for GNU help2man version 1.40.10
 
 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.40.9.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.40.10.tar.gz
 
   git://anonscm.debian.org/users/bod/help2man.git
   http://anonscm.debian.org/git/users/bod/help2man.git
diff --git a/THANKS b/THANKS
index 143c51d..ba7c80c 100644
--- a/THANKS
+++ b/THANKS
@@ -33,6 +33,7 @@ NIIBE Yutaka			<gniibe@fsij.org>
 Miroslav Nikolic		<miroslavnikolic@rocketmail.com>
 Daniel Nylander			<yeager@lidkoping.net>
 OKUJI Yoshinori			<okuji@kuicr.kyoto-u.ac.jp>
+Arun Persaud			<arun@nubati.net>
 François Pinard			<pinard@iro.umontreal.ca>
 Richard Pixley			<rpixley@zhone.com>
 David Prévot			<david@tilapin.org>
diff --git a/configure b/configure
index a2d71d5..db6b0db 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -211,21 +235,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -327,6 +355,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -448,6 +484,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -482,16 +522,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -503,28 +543,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1087,8 +1107,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1319,9 +1337,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1397,7 +1415,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1420,7 +1438,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -1773,7 +1791,7 @@ $as_echo_n "checking for perl... " >&6; }
 if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  echo "configure:1776: ...version 5.008 required" >&5
+  echo "configure:1794: ...version 5.008 required" >&5
   # allow user to override
   if test -n "$PERL"; then
     ac_try="$PERL"
@@ -1782,7 +1800,7 @@ else
   fi
 
   for ac_prog in $ac_try; do
-    echo "configure:1785: trying $ac_prog" >&5
+    echo "configure:1803: trying $ac_prog" >&5
     if ($ac_prog -e 'printf "found version %g\n",$] ;exit($]<5.008)') 1>&5 2>&1; then
       ac_cv_prog_PERL=$ac_prog
       break
@@ -1834,7 +1852,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1879,7 +1897,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1919,7 +1937,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1972,7 +1990,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2013,7 +2031,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2071,7 +2089,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2115,7 +2133,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2561,8 +2579,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2866,7 +2883,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2940,7 +2957,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2981,7 +2998,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3449,16 +3466,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -3518,28 +3535,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3561,7 +3566,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3614,10 +3619,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3695,7 +3700,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff --git a/debian/changelog b/debian/changelog
index 085f45c..856f2fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+help2man (1.40.10) unstable; urgency=low
+
+  * Update Greek translation (thanks to Savvas Radevic).
+  * Update Serbian translation (thanks to Мирослав Николић).
+  * Update German translation (thanks to Arun Persaud).
+
+ -- Brendan O'Dea <bod@debian.org>  Sat, 12 May 2012 13:54:58 +1000
+
 help2man (1.40.9) unstable; urgency=low
 
   * Update Japanese translation (thanks to Yasumichi Akahoshi).
diff --git a/help2man.1 b/help2man.1
index 9ca6dfe..a5402f5 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "April 2012" "help2man 1.40.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "June 2012" "help2man 1.40.10" "User Commands"
 .SH NAME
 help2man \- generate a simple manual page
 .SH SYNOPSIS
diff --git a/help2man.PL b/help2man.PL
index 7f11729..b66148e 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use 5.008;
 use Config;
 use Getopt::Long;
 
-my ($program, $version) = ('help2man', '1.40.9');
+my ($program, $version) = ('help2man', '1.40.10');
 
 my %opts;
 die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"
diff --git a/help2man.de.1 b/help2man.de.1
index 626f627..7449318 100644
--- a/help2man.de.1
+++ b/help2man.de.1
@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "April 2012" "help2man 1.40.9" "Benutzerkommandos"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "Juni 2012" "help2man 1.40.10" "Benutzerkommandos"
 .SH NAME
 help2man \- generiert eine einfache Handbuchseite
 .SH ÜBERSICHT
 .B help2man
 [\fIOPTION\fR]... \fIPROGRAMM\fR
 .SH BESCHREIBUNG
-»help2man« generiert aus der Ausgabe von »\-\-help« und »\-\-version« eine
+`help2man' generiert aus der Ausgabe von »\-\-help« und »\-\-version« eine
 Handbuchseite.
 .TP
 \fB\-n\fR, \fB\-\-name\fR=\fIZEICHENKETTE\fR
@@ -16,35 +16,32 @@ Beschreibung für den NAME\-Abschnitt
 Abschnittsnummer der Handbuchseite (1, 6, 8)
 .TP
 \fB\-m\fR, \fB\-\-manual\fR=\fITEXT\fR
-Name des Handbuchs (Anwenderbefehle, ...)
+Name des Handbuchs (Anwenderbefehle,…)
 .TP
 \fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
-Quelle des Programms (FSF, Debian, ...)
+Quelle des Programms (FSF, Debian,…)
 .TP
 \fB\-L\fR, \fB\-\-locale\fR=\fIZEICHENKETTE\fR
 Locale auswählen (Vorgabe »C«)
 .TP
 \fB\-i\fR, \fB\-\-include\fR=\fIDATEI\fR
-Material aus »DATEI« einbinden
+Material aus »DATEI« einschließen
 .TP
 \fB\-I\fR, \fB\-\-opt\-include\fR=\fIDATEI\fR
-Material aus »DATEI« einbinden, wenn es
+Material aus »DATEI« einschließen, wenn es
 existiert
 .TP
 \fB\-o\fR, \fB\-\-output\fR=\fIDATEI\fR
-in »DATEI« ausgeben
+Ausgabe an »DATEI« senden
 .TP
 \fB\-p\fR, \fB\-\-info\-page\fR=\fIDATEI\fR
 Name des Texinfo\-Handbuchs
 .TP
 \fB\-N\fR, \fB\-\-no\-info\fR
-Verweis auf Texinfo\-Handbuch unterdrücken
-.TP
-\fB\-l\fR, \fB\-\-libtool\fR
-das »lt\-« aus dem Programmnamen ausschließen
+Zeiger auf Texinfo\-Handbuch unterdrücken
 .TP
 \fB\-\-help\fR
-diese Hilfe anzeigen, dann beenden
+Diese Hilfe anzeigen, dann beenden
 .TP
 \fB\-\-version\fR
 Versionsnummer anzeigen, dann beenden
@@ -99,7 +96,7 @@ werden als Optionen behandelt. Alles andere wird stillschweigend
 ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was
 Sie wollen benutzt werden.
 
-Die Reihenfolge, in der die Abschnitte ausgegeben werden, ist:
+Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:
 
     NAME
     ÜBERSICHT
@@ -122,7 +119,7 @@ oder
 ersetzen, was automatisch generiert würde (obwohl Sie das
 weitere immer noch, wenn nötigt, mit
 .B --name
-überschreiben können).
+überschreiben können.
 
 Andere Abschnitte werden der automatisch erzeugten Ausgabe für die
 oben angegebenen Standardabschnitte vorangestellt oder unter
@@ -138,7 +135,7 @@ Geschrieben von Brendan O'Dea <bod@debian.org>
 .SH FEHLERBERICHTE
 Berichten Sie Fehler an <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
 2011, 2012 Free Software Foundation, Inc.
 .br
 Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen
diff --git a/help2man.el.1 b/help2man.el.1
index c30f0ed..ee47135 100644
--- a/help2man.el.1
+++ b/help2man.el.1
@@ -1,67 +1,65 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "Απρίλιος 2012" "help2man 1.40.9" "Εντολές χρήστη"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "Ιούνιος 2012" "help2man 1.40.10" "Εντολές χρήστη"
 .SH NAME
 help2man \- δημιουργία απλής σελίδας εγχειριδίου
+.SH SYNOPSIS
+.B help2man
+[\fIOPTION\fR]... \fIEXECUTABLE\fR
 .SH DESCRIPTION
-`help2man' generates a man page out of `\-\-help' and `\-\-version' output.
-.PP
-Usage: help2man [OPTION]... EXECUTABLE
+`help2man' δημιουργεί μια σελίδα man από την έξοδο των `\-\-help' και `\-\-version' output.
 .TP
 \fB\-n\fR, \fB\-\-name\fR=\fISTRING\fR
-description for the NAME paragraph
+περιγραφή για την παράγραφο NAME
 .TP
 \fB\-s\fR, \fB\-\-section\fR=\fISECTION\fR
-section number for manual page (1, 6, 8)
+αριθμός ενότητας για σελίδα εγχειριδίου (1, 6, 8)
 .TP
 \fB\-m\fR, \fB\-\-manual\fR=\fITEXT\fR
-name of manual (User Commands, ...)
+όνομα εγχειριδίου (Εντολές Χρήστη, ...)
 .TP
 \fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
-source of program (FSF, Debian, ...)
+προέλευση προγράμματος (FSF, Debian, ...)
 .TP
 \fB\-L\fR, \fB\-\-locale\fR=\fISTRING\fR
-select locale (default "C")
+επιλογή τοποθεσίας (προεπιλογή "C")
 .TP
 \fB\-i\fR, \fB\-\-include\fR=\fIFILE\fR
-include material from `FILE'
+να συμπεριληφθεί υλικό από το `FILE'
 .TP
 \fB\-I\fR, \fB\-\-opt\-include\fR=\fIFILE\fR
-include material from `FILE' if it exists
+να συμπεριληφθεί υλικό από το `FILE' εάν υπάρχει
 .TP
 \fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-send output to `FILE'
+αποστολή αποτελέσματος σε `FILE'
 .TP
 \fB\-p\fR, \fB\-\-info\-page\fR=\fITEXT\fR
-name of Texinfo manual
+όνομα του εγχειριδίου Texinfo
 .TP
 \fB\-N\fR, \fB\-\-no\-info\fR
-suppress pointer to Texinfo manual
-.TP
-\fB\-l\fR, \fB\-\-libtool\fR
-exclude the `lt\-' from the program name
+καταστολή δείκτη σε εγχειρίδιο Texinfo
 .TP
 \fB\-\-help\fR
-print this help, then exit
+εμφάνιση αυτής της βοήθειας, μετά έξοδος
 .TP
 \fB\-\-version\fR
-print version number, then exit
+εμφάνιση αριθμού έκδοσης, μετά έξοδος
 .PP
-EXECUTABLE should accept `\-\-help' and `\-\-version' options and produce output on
-stdout although alternatives may be specified using:
+Το EXECUTABLE θα πρέπει να δέχεται επιλογές `\-\-help' και `\-\-version' και να παράγει αποτέλεσμα στην
+stdout παρόλο που μπορεί να ορισθούν εναλλακτικά με χρήση:
 .TP
 \fB\-h\fR, \fB\-\-help\-option\fR=\fISTRING\fR
-help option string
+αλφαριθμητικό επιλογής βοήθεια
 .TP
 \fB\-v\fR, \fB\-\-version\-option\fR=\fISTRING\fR
-version option string
+αλφαριθμητικό επιλογής έκδοσης
 .TP
 \fB\-\-version\-string\fR=\fISTRING\fR
-version string
+αλφαριθμητικό έκδοσης
 .TP
 \fB\-\-no\-discard\-stderr\fR
-include stderr when parsing option output
+να συμπεριληφθεί το stderr κατά την ανάλυση του αποτελέσματος της επιλογής
 .PP
-Report bugs to <bug\-help2man@gnu.org>.
+Αναφέρετε σφάλματα σε <bug\-help2man@gnu.org>.
 .SH "INCLUDE FILES"
 Επιπλέον υλικό μπορεί να συμπεριληφθεί στο παραγόμενο αποτέλεσμα με
 .B \-\-include
diff --git a/help2man.eo.1 b/help2man.eo.1
index c52adec..6b88672 100644
--- a/help2man.eo.1
+++ b/help2man.eo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "2012-04" "help2man 1.40.9" "Uzant-Komandoj"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "2012-06" "help2man 1.40.10" "Uzant-Komandoj"
 .SH NOMO
 help2man \- generas simplan man-paĝon
 .SH RESUMO
diff --git a/help2man.fi.1 b/help2man.fi.1
index f927543..8f2397b 100644
--- a/help2man.fi.1
+++ b/help2man.fi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "huhtikuu 2012" "help2man 1.40.9" "Käyttäjän sovellukset"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "kesäkuu 2012" "help2man 1.40.10" "Käyttäjän sovellukset"
 .SH NIMI
 help2man \- luo yksinkertainen man-sivu
 .SH YLEISKATSAUS
diff --git a/help2man.fr.1 b/help2man.fr.1
index 9e12386..cfed7da 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "avril 2012" "help2man 1.40.9" "Commandes"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "juin 2012" "help2man 1.40.10" "Commandes"
 .SH NOM
 help2man \- crée une page de manuel sommaire
 .SH SYNOPSIS
diff --git a/help2man.it.1 b/help2man.it.1
index 8c2aaa6..c9a431d 100644
--- a/help2man.it.1
+++ b/help2man.it.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "aprile 2012" "help2man 1.40.9" "Comandi utente"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "giugno 2012" "help2man 1.40.10" "Comandi utente"
 .SH NOME
 help2man \- genera una semplice pagina di manuale
 .SH SINTASSI
diff --git a/help2man.ja.1 b/help2man.ja.1
index e97c2af..df1231b 100644
--- a/help2man.ja.1
+++ b/help2man.ja.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "2012年4月" "help2man 1.40.9" "ユーザーコマンド"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "2012年6月" "help2man 1.40.10" "ユーザーコマンド"
 .SH 名前
 help2man \- 簡易マニュアルページの生成
 .SH 書式
diff --git a/help2man.pl.1 b/help2man.pl.1
index 45aca00..1029287 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "kwiecień 2012" "help2man 1.40.9" "Polecenia użytkownika"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "czerwiec 2012" "help2man 1.40.10" "Polecenia użytkownika"
 .SH NAZWA
 help2man \- generowanie prostej strony podręcznika
 .SH SKŁADNIA
diff --git a/help2man.pt_BR.1 b/help2man.pt_BR.1
index 5406200..3994d33 100644
--- a/help2man.pt_BR.1
+++ b/help2man.pt_BR.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "abril de 2012" "help2man 1.40.9" "Comandos de usuário"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "junho de 2012" "help2man 1.40.10" "Comandos de usuário"
 .SH NOME
 help2man \- gera uma página de manual simples
 .SH SINOPSE
diff --git a/help2man.ru.1 b/help2man.ru.1
index 75b1ad2..e3c402c 100644
--- a/help2man.ru.1
+++ b/help2man.ru.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "20.04.2012" "help2man 1.40.9" "Пользовательские команды"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "03.06.2012" "help2man 1.40.10" "Пользовательские команды"
 .SH ИМЯ
 help2man \- генерирует простую справочную страницу
 .SH ОБЗОР
diff --git a/help2man.sr.1 b/help2man.sr.1
index fb0047a..aa7195a 100644
--- a/help2man.sr.1
+++ b/help2man.sr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH ГНУ "1" "април 2012." "ГНУ help2man 1.40.9" "Корисничке наредбе"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH ГНУ "1" "јун 2012." "ГНУ help2man 1.40.10" "Корисничке наредбе"
 .SH НАЗИВ
 help2man \— ствара страницу упутства
 .SH УВОД
diff --git a/help2man.sv.1 b/help2man.sv.1
index f393e2b..4ebf2e3 100644
--- a/help2man.sv.1
+++ b/help2man.sv.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "april 2012" "help2man 1.40.9" "Användarkommandon"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "juni 2012" "help2man 1.40.10" "Användarkommandon"
 .SH NAMN
 help2man \- generera en enkel manualsida
 .SH BESKRIVNING
diff --git a/help2man.uk.1 b/help2man.uk.1
index b61bf11..40d395c 100644
--- a/help2man.uk.1
+++ b/help2man.uk.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "20.04.12" "help2man 1.40.9" "Команди користувача"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "03.06.12" "help2man 1.40.10" "Команди користувача"
 .SH НАЗВА
 help2man \— програма для створення простих сторінок довідника
 .SH "КОРОТКИЙ ОПИС"
diff --git a/help2man.vi.1 b/help2man.vi.1
index 59deeee..ff22fe2 100644
--- a/help2man.vi.1
+++ b/help2man.vi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH HELP2MAN "1" "Tháng tư 2012" "help2man 1.40.9" "Lệnh người dùng"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
+.TH HELP2MAN "1" "Tháng sáu 2012" "help2man 1.40.10" "Lệnh người dùng"
 .SH TÊN
 help2man \- tạo một trang hướng dẫn đơn giản
 .SH "TÓM TẮT"
diff --git a/po/de.gmo b/po/de.gmo
index 43bffca..61a4f3b 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 8e406e7..2199869 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,16 +1,16 @@
 # Translation of help2man to German
-# Copyright (C) 1997-2003 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the help2man package.
-# Chris Leick 2009, 2011, 2012 <c.leick@vollbio.de>.
-#
+# Chris Leick <c.leick@vollbio.de>, 2009.
+# Arun Persaud <arun@nubati.net>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man 1.40.8\n"
+"Project-Id-Version: help2man 1.40.7\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2012-04-08 23:16+1000\n"
-"PO-Revision-Date: 2012-04-19 23:30+1000\n"
-"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"POT-Creation-Date: 2012-06-03 10:13+1000\n"
+"PO-Revision-Date: 2012-06-02 15:36-0700\n"
+"Last-Translator: Arun Persaud <arun@nubati.net>\n"
+"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr ""
 "GNU %s %s\n"
 "\n"
 "Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
-"2010\n"
+"2010,\n"
 "2011, 2012 Free Software Foundation, Inc.\n"
 "Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen\n"
 "zu erhalten. Es gibt KEINE Gewährleistung, nicht einmal für\n"
@@ -72,24 +72,23 @@ msgid ""
 "\n"
 "Report bugs to <bug-help2man@gnu.org>.\n"
 msgstr ""
-"»%s« generiert aus der Ausgabe von »--help« und »--version« eine\n"
+"`%s' generiert aus der Ausgabe von »--help« und »--version« eine\n"
 "Handbuchseite.\n"
 "\n"
 "Aufruf: %s [OPTION]... PROGRAMM\n"
 "\n"
 " -n, --name=ZEICHENKETTE    Beschreibung für den NAME-Abschnitt\n"
 " -s, --section=ABSCHNITT    Abschnittsnummer der Handbuchseite (1, 6, 8)\n"
-" -m, --manual=TEXT          Name des Handbuchs (Anwenderbefehle, ...)\n"
-" -S, --source=TEXT          Quelle des Programms (FSF, Debian, ...)\n"
+" -m, --manual=TEXT          Name des Handbuchs (Anwenderbefehle,…)\n"
+" -S, --source=TEXT          Quelle des Programms (FSF, Debian,…)\n"
 " -L, --locale=ZEICHENKETTE  Locale auswählen (Vorgabe »C«)\n"
-" -i, --include=DATEI        Material aus »DATEI« einbinden\n"
-" -I, --opt-include=DATEI    Material aus »DATEI« einbinden, wenn es\n"
+" -i, --include=DATEI        Material aus »DATEI« einschließen\n"
+" -I, --opt-include=DATEI    Material aus »DATEI« einschließen, wenn es\n"
 "                            existiert\n"
-" -o, --output=DATEI         in »DATEI« ausgeben\n"
+" -o, --output=DATEI         Ausgabe an »DATEI« senden\n"
 " -p, --info-page=DATEI      Name des Texinfo-Handbuchs\n"
-" -N, --no-info              Verweis auf Texinfo-Handbuch unterdrücken\n"
-" -l, --libtool              das »lt-« aus dem Programmnamen ausschließen\n"
-"     --help                 diese Hilfe anzeigen, dann beenden\n"
+" -N, --no-info              Zeiger auf Texinfo-Handbuch unterdrücken\n"
+"     --help                 Diese Hilfe anzeigen, dann beenden\n"
 "     --version              Versionsnummer anzeigen, dann beenden\n"
 "\n"
 "PROGRAMM sollte »--help«- und »--version«-Optionen\n"
@@ -286,9 +285,7 @@ msgstr "%s: Es wurde keine »%s«-Information von %s erhalten%s"
 
 #: help2man:669
 msgid "Try `--no-discard-stderr' if option outputs to stderr"
-msgstr ""
-"Versuchen Sie »--no-discard-stderr« falls die Option auf der "
-"Standardfehlerausgabe ausgibt."
+msgstr "Versuche »--no-discard-stderr« falls Optionen nach stderr ausgeben"
 
 #: help2man.h2m.PL:76
 msgid "Include file for help2man man page"
@@ -376,7 +373,7 @@ msgstr ""
 
 #: help2man.h2m.PL:129
 msgid "The section output order (for those included) is:"
-msgstr "Die Reihenfolge, in der die Abschnitte ausgegeben werden, ist:"
+msgstr "Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:"
 
 #: help2man.h2m.PL:138
 msgid "other"
@@ -402,7 +399,7 @@ msgstr ""
 "ersetzen, was automatisch generiert würde (obwohl Sie das\n"
 "weitere immer noch, wenn nötigt, mit\n"
 ".B --name\n"
-"überschreiben können).\n"
+"überschreiben können.\n"
 
 #: help2man.h2m.PL:159
 msgid ""
diff --git a/po/el.gmo b/po/el.gmo
index 9bd06d9..f9c9e22 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index c57b7e0..54c9c99 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,21 +1,22 @@
 # Greek translation for help2man.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the help2man package.
 # Michael Kotsarinis <mk73628@gmail.com>, 2010
+# Savvas Radevic <vicedar@gmail.com>, 2012
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man 1.40.4\n"
+"Project-Id-Version: help2man 1.40.7\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2012-04-08 23:16+1000\n"
-"PO-Revision-Date: 2012-03-17 17:56+0100\n"
+"POT-Creation-Date: 2012-06-03 10:13+1000\n"
+"PO-Revision-Date: 2012-05-05 22:23+0100\n"
 "Last-Translator: Savvas Radevic <vicedar@gmail.com>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"
 "Language: Greek\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
@@ -45,7 +46,7 @@ msgstr ""
 "Συγγραφή: Brendan O'Dea <bod@debian.org>\n"
 
 #: help2man:79
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
 "\n"
diff --git a/po/help2man.pot b/po/help2man.pot
index 08166b3..d616dd7 100644
--- a/po/help2man.pot
+++ b/po/help2man.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2012-04-20 22:40+1000\n"
+"POT-Creation-Date: 2012-06-03 10:18+1000\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"
diff --git a/po/sr.gmo b/po/sr.gmo
index 90e2550..3a59781 100644
Binary files a/po/sr.gmo and b/po/sr.gmo differ
diff --git a/po/sr.po b/po/sr.po
index bcc8a09..ec066ee 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,13 +1,13 @@
 # Serbian translation of help2man.
 # Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the help2man package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man-1.40.4\n"
+"Project-Id-Version: help2man-1.40.7\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2012-04-08 23:16+1000\n"
-"PO-Revision-Date: 2011-12-29 10:56+0200\n"
+"POT-Creation-Date: 2012-06-03 10:13+1000\n"
+"PO-Revision-Date: 2012-05-02 10:03+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
 "Language: sr\n"