[debhelper-devel] [debhelper] 01/02: Regenerate po(t) files and document the documentation change

Niels Thykier nthykier at moszumanska.debian.org
Thu Jan 1 16:23:33 UTC 2015


This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 2c353f4f885717061fe512efa5b46696d3f482ed
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jan 1 17:15:55 2015 +0100

    Regenerate po(t) files and document the documentation change
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog          |   7 ++-
 man/po4a/po/de.po         | 108 +++++++++++++++++++++++++---------------------
 man/po4a/po/debhelper.pot | 102 +++++++++++++++++++++++--------------------
 man/po4a/po/es.po         | 108 +++++++++++++++++++++++++---------------------
 man/po4a/po/fr.po         | 108 +++++++++++++++++++++++++---------------------
 man/po4a/po/pt.po         | 108 +++++++++++++++++++++++++---------------------
 6 files changed, 293 insertions(+), 248 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5749780..2cf6419 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 debhelper (9.20141229) UNRELEASED; urgency=medium
 
+  [ Niels Thykier ]
   * Revert detection of unsafe binNMUs under compat 9 and
     earlier.  It had some false-positives.  (Closes: #773965)
 
- -- Niels Thykier <niels at thykier.net>  Mon, 29 Dec 2014 10:21:22 +0100
+  [ Axel Beckert ]
+  * Document that dh_installdocs will error out on --link-doc
+    between arch:all and arch:any packages in man 7 debhelper.
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 01 Jan 2015 17:05:01 +0100
 
 debhelper (9.20141222) unstable; urgency=medium
 
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index f87693d..a16332f 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20131227\n"
 "Report-Msgid-Bugs-To: debhelper at packages.debian.org\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-01-01 16:08+0000\n"
 "PO-Revision-Date: 2012-10-22 22:47+0100\n"
 "Last-Translator: Chris Leick <c.leick at vollbio.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -871,7 +871,7 @@ msgstr "Dieser Modus funktioniert wie v2 mit den folgenden Zusätzen:"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548
 msgid "-"
 msgstr "-"
 
@@ -1253,7 +1253,7 @@ msgid "Changes from v9 are:"
 msgstr "Änderungen gegenüber v9 sind:"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1264,6 +1264,14 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
@@ -1275,7 +1283,7 @@ msgstr ""
 "Befehlen offenlegen, die nicht in Debhelper enthalten sind."
 
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:559 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
 #: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
@@ -1283,12 +1291,12 @@ msgid "NOTES"
 msgstr "ANMERKUNGEN"
 
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:561
 msgid "Multiple binary package support"
 msgstr "Unterstützung mehrerer Binärpakete"
 
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:563
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1307,7 +1315,7 @@ msgstr ""
 "Ziel »binary-indep«."
 
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:571
 #, fuzzy
 #| msgid ""
 #| "To facilitate this, as well as give you more control over which packages "
@@ -1330,7 +1338,7 @@ msgstr ""
 "sind."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:577
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1338,7 +1346,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:581
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1347,12 +1355,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:586
 msgid "Automatic generation of Debian install scripts"
 msgstr "Automatisches Erzeugen von Debian-Installationsskripten"
 
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:588
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1369,7 +1377,7 @@ msgstr ""
 "erzeugten Kode ersetzt."
 
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:595
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1378,7 +1386,7 @@ msgstr ""
 "hinzufügen muss, dann wird Debhelper das komplette Skript erstellen."
 
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:598
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1387,7 +1395,7 @@ msgstr ""
 "dies durch den Parameter -n deaktiviert (siehe oben)."
 
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:601
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1401,7 +1409,7 @@ msgstr ""
 "etc. gesetzt sind):"
 
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:606
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1419,12 +1427,12 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:612
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Automatisches Erzeugen verschiedener Abhängigkeiten"
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:614
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1444,7 +1452,7 @@ msgstr ""
 "bietet, sie zu automatisieren."
 
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:622
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1458,7 +1466,7 @@ msgstr ""
 "Debhelper findet, dass Sie sie benötigen."
 
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:627
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1472,12 +1480,12 @@ msgstr ""
 "entspricht."
 
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:632
 msgid "Package build directories"
 msgstr "Paketbauverzeichnisse"
 
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:634
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1487,7 +1495,7 @@ msgstr ""
 "debian/I<Paket> ist."
 
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:637
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1507,13 +1515,13 @@ msgstr ""
 "Debhelper-Programm auswirkt."
 
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:645
 msgid "udebs"
 msgstr "Udebs"
 
 # FIXME : an udeb
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:647
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1531,17 +1539,17 @@ msgstr ""
 "übersprungen werden."
 
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:654
 msgid "ENVIRONMENT"
 msgstr "UMGEBUNGSVARIABLEN"
 
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:658
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:660
 #, fuzzy
 #| msgid ""
 #| "Set to B<1> to enable verbose mode. Debhelper will output every command "
@@ -1555,12 +1563,12 @@ msgstr ""
 "Bausystem verändert."
 
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:663
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:665
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1569,22 +1577,22 @@ msgstr ""
 "werden sollte und setzt dabei jeden Wert in F<debian/compat> außer Kraft."
 
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:668
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:670
 msgid "Set to B<1> to enable no-act mode."
 msgstr "auf B<1> gesetzt, um Modus ohne Aktion zu aktivieren."
 
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:672
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:674
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1593,7 +1601,7 @@ msgstr ""
 "Befehle vorangestellt."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:677
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1603,12 +1611,12 @@ msgstr ""
 "DH_OPTIONS zu verwenden."
 
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:680
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:682
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1620,7 +1628,7 @@ msgstr ""
 "entspricht, B<rm -rf> ausführen."
 
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:686
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1638,7 +1646,7 @@ msgstr ""
 "ist, wo auch immer Ihr Paket gebaut wird."
 
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:693
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1647,13 +1655,13 @@ msgstr ""
 "getrennt werden, wie in B<DH_ALWAYS_EXCLUDE=CVS:.svn>."
 
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
+#: debhelper.pod:698 dh:972 dh_auto_build:47 dh_auto_clean:50
 #: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
 #: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
 #: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
 #: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
 #: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: dh_installdocs:348 dh_installemacsen:141 dh_installexamples:108
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
 #: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
@@ -1667,37 +1675,37 @@ msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:702
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:704
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr ""
 "eine Zusammenstellung von F<debian/rules>-Beispieldateien, die Debhelper "
 "benutzen"
 
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:706
 #, fuzzy
 #| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgid "L<http://joeyh.name/code/debhelper/>"
 msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:708
 msgid "Debhelper web site."
 msgstr "Debhelper-Website"
 
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
+#: debhelper.pod:712 dh:978 dh_auto_build:53 dh_auto_clean:56
 #: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
 #: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
 #: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
 #: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
 #: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: dh_installdocs:354 dh_installemacsen:148 dh_installexamples:114
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
 #: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
@@ -1710,11 +1718,11 @@ msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
+#: debhelper.pod:714 dh:980 dh_auto_build:55 dh_auto_clean:58
 #: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
 #: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
 #: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
+#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:356
 #: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
@@ -2441,7 +2449,7 @@ msgstr ""
 #: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
 #: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
 #: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh_installdocs:350 dh_installexamples:110 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
 #: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
@@ -2458,7 +2466,7 @@ msgstr "L<debhelper(7)>"
 #: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
 #: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
 #: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh_installdocs:352 dh_installemacsen:146 dh_installexamples:112
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
 #: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 9a11ced..cb7ccca 100644
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-01-01 16:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -624,7 +624,7 @@ msgid "This mode works like v2, with the following additions:"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:314 debhelper.pod:319 debhelper.pod:323 debhelper.pod:337 debhelper.pod:342 debhelper.pod:347 debhelper.pod:352 debhelper.pod:366 debhelper.pod:370 debhelper.pod:375 debhelper.pod:379 debhelper.pod:391 debhelper.pod:396 debhelper.pod:402 debhelper.pod:408 debhelper.pod:421 debhelper.pod:428 debhelper.pod:432 debhelper.pod:436 debhelper.pod:449 debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480 debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 deb [...]
+#: debhelper.pod:314 debhelper.pod:319 debhelper.pod:323 debhelper.pod:337 debhelper.pod:342 debhelper.pod:347 debhelper.pod:352 debhelper.pod:366 debhelper.pod:370 debhelper.pod:375 debhelper.pod:379 debhelper.pod:391 debhelper.pod:396 debhelper.pod:402 debhelper.pod:408 debhelper.pod:421 debhelper.pod:428 debhelper.pod:432 debhelper.pod:436 debhelper.pod:449 debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480 debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 deb [...]
 msgid "-"
 msgstr ""
 
@@ -929,7 +929,7 @@ msgid "Changes from v9 are:"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -938,6 +938,14 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
@@ -945,17 +953,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121 dh_installemacsen:72 dh_installexamples:53 dh_installinit:140 dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: debhelper.pod:559 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121 dh_installemacsen:72 dh_installexamples:53 dh_installinit:140 dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
 msgid "NOTES"
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:561
 msgid "Multiple binary package support"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:563
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -967,7 +975,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:571
 msgid ""
 "To facilitate this, as well as give you more control over which packages are "
 "acted on by debhelper programs, all debhelper programs accept the B<-a>, "
@@ -977,7 +985,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:577
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -985,7 +993,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:581
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -994,12 +1002,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:586
 msgid "Automatic generation of Debian install scripts"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:588
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1010,21 +1018,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:595
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:598
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:601
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1033,7 +1041,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:606
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1045,12 +1053,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:612
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:614
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1062,7 +1070,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:622
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called "
@@ -1071,7 +1079,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:627
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1080,19 +1088,19 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:632
 msgid "Package build directories"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:634
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:637
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs "
@@ -1104,12 +1112,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:645
 msgid "udebs"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:647
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1120,70 +1128,70 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:654
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:658
 msgid "B<DH_VERBOSE>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:660
 msgid ""
 "Set to B<1> to enable verbose mode. Debhelper will output every command it "
 "runs. Also enables verbose build logs for some build systems like autoconf."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:663
 msgid "B<DH_COMPAT>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:665
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:668
 msgid "B<DH_NO_ACT>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:670
 msgid "Set to B<1> to enable no-act mode."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:672
 msgid "B<DH_OPTIONS>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:674
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:677
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:680
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:682
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1191,7 +1199,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:686
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1202,44 +1210,44 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:693
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131 dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79 dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:7 [...]
+#: debhelper.pod:698 dh:972 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131 dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79 dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:348 dh_installemacsen:141 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:7 [...]
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:702
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:704
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:706
 msgid "L<http://joeyh.name/code/debhelper/>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:708
 msgid "Debhelper web site."
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137 dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85 dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:8 [...]
+#: debhelper.pod:712 dh:978 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137 dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85 dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:354 dh_installemacsen:148 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:8 [...]
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86 dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345 dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60 dh_installman:271 dh_installmanpa [...]
+#: debhelper.pod:714 dh:980 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86 dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:356 dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60 dh_installman:271 dh_installmanpa [...]
 msgid "Joey Hess <joeyh at debian.org>"
 msgstr ""
 
@@ -1763,12 +1771,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:974 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:149 dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243 dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:26 [...]
+#: dh:974 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:149 dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243 dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:350 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:26 [...]
 msgid "L<debhelper(7)>"
 msgstr ""
 
 #. type: textblock
-#: dh:976 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105 dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245 dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:328 dh_installlogrotate: [...]
+#: dh:976 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105 dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245 dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:352 dh_installemacsen:146 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:328 dh_installlogrotate: [...]
 msgid "This program is a part of debhelper."
 msgstr ""
 
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index bf07836..4868d4b 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20120609\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-01-01 16:08+0000\n"
 "PO-Revision-Date: 2012-08-20 11:17+0200\n"
 "Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -956,7 +956,7 @@ msgstr "Este modo funciona como v2, con los siguientes añadidos:"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548
 msgid "-"
 msgstr "-"
 
@@ -1356,7 +1356,7 @@ msgid "Changes from v9 are:"
 msgstr "Los cambios desde el nivel v9 son:"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1365,6 +1365,14 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
@@ -1373,7 +1381,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:559 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
 #: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
@@ -1382,13 +1390,13 @@ msgstr "NOTAS"
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:561
 msgid "Multiple binary package support"
 msgstr "Compatibilidad con varios paquetes binarios"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:563
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1409,7 +1417,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:571
 #, fuzzy
 #| msgid ""
 #| "To facilitate this, as well as give you more control over which packages "
@@ -1431,7 +1439,7 @@ msgstr ""
 "los paquetes listados en el fichero de control."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:577
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1439,7 +1447,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:581
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1449,13 +1457,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:586
 msgid "Automatic generation of Debian install scripts"
 msgstr "Generación automática de los scripts de instalación de Debian"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:588
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1473,7 +1481,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:595
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1483,7 +1491,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:598
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1493,7 +1501,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:601
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1507,7 +1515,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:606
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1526,12 +1534,12 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:612
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Generación automática de diversas dependencias."
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:614
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1551,7 +1559,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:622
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1566,7 +1574,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:627
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1580,13 +1588,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:632
 msgid "Package build directories"
 msgstr "Directorios de construcción del paquete"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:634
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1597,7 +1605,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:637
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1617,13 +1625,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:645
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:647
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1642,19 +1650,19 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:654
 msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:658
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:660
 #, fuzzy
 #| msgid ""
 #| "Set to B<1> to enable verbose mode. Debhelper will output every command "
@@ -1669,13 +1677,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:663
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:665
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1685,25 +1693,25 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:668
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:670
 msgid "Set to B<1> to enable no-act mode."
 msgstr "Defina como B<1> para habilitar el modo no-act."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:672
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:674
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1712,7 +1720,7 @@ msgstr ""
 "de órdenes de todas las órdenes de debhelper."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:677
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1722,13 +1730,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:680
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:682
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1740,7 +1748,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:686
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1758,7 +1766,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:693
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1768,13 +1776,13 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
+#: debhelper.pod:698 dh:972 dh_auto_build:47 dh_auto_clean:50
 #: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
 #: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
 #: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
 #: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
 #: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: dh_installdocs:348 dh_installemacsen:141 dh_installexamples:108
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
 #: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
@@ -1789,19 +1797,19 @@ msgstr "VÉASE TAMBIÉN"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:702
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:704
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr "Varios ficheros de ejemplo F<debian/rules> que utilizan debhelper."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:706
 #, fuzzy
 #| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgid "L<http://joeyh.name/code/debhelper/>"
@@ -1809,19 +1817,19 @@ msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:708
 msgid "Debhelper web site."
 msgstr "Sitio web de Debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
+#: debhelper.pod:712 dh:978 dh_auto_build:53 dh_auto_clean:56
 #: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
 #: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
 #: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
 #: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
 #: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: dh_installdocs:354 dh_installemacsen:148 dh_installexamples:114
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
 #: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
@@ -1835,11 +1843,11 @@ msgstr "AUTOR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
+#: debhelper.pod:714 dh:980 dh_auto_build:55 dh_auto_clean:58
 #: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
 #: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
 #: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
+#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:356
 #: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
@@ -2579,7 +2587,7 @@ msgstr ""
 #: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
 #: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
 #: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh_installdocs:350 dh_installexamples:110 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
 #: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
@@ -2597,7 +2605,7 @@ msgstr "L<debhelper(7)>"
 #: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
 #: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
 #: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh_installdocs:352 dh_installemacsen:146 dh_installexamples:112
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
 #: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 62b4460..b020235 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-01-01 16:08+0000\n"
 "PO-Revision-Date: 2012-11-03 11:13-0400\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian at free.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -940,7 +940,7 @@ msgstr "Ce mode fonctionne comme v2 mais avec les ajouts suivants :"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548
 msgid "-"
 msgstr "-"
 
@@ -1353,7 +1353,7 @@ msgid "Changes from v9 are:"
 msgstr "Les changements par rapport à la version 9 sont :"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1362,6 +1362,14 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
@@ -1370,7 +1378,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:559 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
 #: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
@@ -1379,13 +1387,13 @@ msgstr "REMARQUES"
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:561
 msgid "Multiple binary package support"
 msgstr "Prise en charge de plusieurs paquets binaires"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:563
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1405,7 +1413,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:571
 #, fuzzy
 #| msgid ""
 #| "To facilitate this, as well as give you more control over which packages "
@@ -1427,7 +1435,7 @@ msgstr ""
 "paquets énumérés dans le fichier de contrôle."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:577
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1435,7 +1443,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:581
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1445,13 +1453,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:586
 msgid "Automatic generation of Debian install scripts"
 msgstr "Génération automatique des scripts Debian de maintenance du paquet"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:588
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1469,7 +1477,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:595
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1479,7 +1487,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:598
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1490,7 +1498,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:601
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1505,7 +1513,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:606
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1524,13 +1532,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:612
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Génération automatique des diverses dépendances."
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:614
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1550,7 +1558,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:622
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1565,7 +1573,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:627
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1579,13 +1587,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:632
 msgid "Package build directories"
 msgstr "Répertoires de construction du paquet"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:634
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1596,7 +1604,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:637
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1616,13 +1624,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:645
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:647
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1641,19 +1649,19 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:654
 msgid "ENVIRONMENT"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:658
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:660
 #, fuzzy
 #| msgid ""
 #| "Set to B<1> to enable verbose mode. Debhelper will output every command "
@@ -1667,13 +1675,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:663
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:665
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1683,25 +1691,25 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:668
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:670
 msgid "Set to B<1> to enable no-act mode."
 msgstr "Mettre cette variable à B<1> pour activer le mode simulation (no-act)."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:672
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:674
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1710,7 +1718,7 @@ msgstr ""
 "les commandes debhelper."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:677
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1720,13 +1728,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:680
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:682
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1739,7 +1747,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:686
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1758,7 +1766,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:693
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1768,13 +1776,13 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
+#: debhelper.pod:698 dh:972 dh_auto_build:47 dh_auto_clean:50
 #: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
 #: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
 #: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
 #: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
 #: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: dh_installdocs:348 dh_installemacsen:141 dh_installexamples:108
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
 #: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
@@ -1789,20 +1797,20 @@ msgstr "VOIR AUSSI"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:702
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:704
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr ""
 "Un ensemble d'exemples de fichiers F<debian/rules> qui utilisent debhelper."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:706
 #, fuzzy
 #| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgid "L<http://joeyh.name/code/debhelper/>"
@@ -1810,19 +1818,19 @@ msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:708
 msgid "Debhelper web site."
 msgstr "Le site internet de debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
+#: debhelper.pod:712 dh:978 dh_auto_build:53 dh_auto_clean:56
 #: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
 #: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
 #: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
 #: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
 #: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: dh_installdocs:354 dh_installemacsen:148 dh_installexamples:114
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
 #: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
@@ -1836,11 +1844,11 @@ msgstr "AUTEUR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
+#: debhelper.pod:714 dh:980 dh_auto_build:55 dh_auto_clean:58
 #: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
 #: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
 #: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
+#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:356
 #: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
@@ -2628,7 +2636,7 @@ msgstr ""
 #: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
 #: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
 #: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh_installdocs:350 dh_installexamples:110 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
 #: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
@@ -2646,7 +2654,7 @@ msgstr "L<debhelper(7)>"
 #: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
 #: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
 #: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh_installdocs:352 dh_installemacsen:146 dh_installexamples:112
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
 #: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po
index a6007be..ec841f6 100644
--- a/man/po4a/po/pt.po
+++ b/man/po4a/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20131227\n"
 "Report-Msgid-Bugs-To: debhelper at packages.debian.org\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-01-01 16:08+0000\n"
 "PO-Revision-Date: 2014-08-13 17:54+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro at gmx.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -856,7 +856,7 @@ msgstr "Este modo funciona como v2, com as seguintes adições:"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548
 msgid "-"
 msgstr "-"
 
@@ -1234,7 +1234,7 @@ msgid "Changes from v9 are:"
 msgstr "As alterações a partir de v9 são:"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1245,6 +1245,14 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
@@ -1256,7 +1264,7 @@ msgstr ""
 "incluídos no debhelper."
 
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:559 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
 #: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
@@ -1264,12 +1272,12 @@ msgid "NOTES"
 msgstr "NOTAS"
 
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:561
 msgid "Multiple binary package support"
 msgstr "Suporte a pacotes de múltiplos binários"
 
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:563
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1288,7 +1296,7 @@ msgstr ""
 "independentes de arquitectura na meta F<debian/rules> binary-indep."
 
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:571
 msgid ""
 "To facilitate this, as well as give you more control over which packages are "
 "acted on by debhelper programs, all debhelper programs accept the B<-a>, B<-"
@@ -1304,7 +1312,7 @@ msgstr ""
 "excepções em baixo."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:577
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1315,7 +1323,7 @@ msgstr ""
 "secção 5.6.8>)."
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:581
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1328,12 +1336,12 @@ msgstr ""
 "política proposta em  L<https://wiki.debian.org/BuildProfileSpec>."
 
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:586
 msgid "Automatic generation of Debian install scripts"
 msgstr "Geração automática de scripts de instalação Debian"
 
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:588
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1350,7 +1358,7 @@ msgstr ""
 "auto-gerado quando você correr o B<dh_installdeb>."
 
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:595
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1359,7 +1367,7 @@ msgstr ""
 "então o debhelper irá criar o script completo."
 
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:598
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1368,7 +1376,7 @@ msgstr ""
 "permitem que o seja desactivado pelo parâmetro -n (ver em cima)."
 
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:601
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1381,7 +1389,7 @@ msgstr ""
 "definidos com o comando \"set\"):"
 
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:606
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1399,12 +1407,12 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:612
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Geração automática de dependências variadas."
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:614
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1423,7 +1431,7 @@ msgstr ""
 "debhelper oferece um modo de automatizar isto."
 
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:622
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1437,7 +1445,7 @@ msgstr ""
 "que você precisa."
 
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:627
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1450,12 +1458,12 @@ msgstr ""
 "corresponderem à realidade."
 
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:632
 msgid "Package build directories"
 msgstr "Directórios de compilação de pacotes"
 
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:634
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1465,7 +1473,7 @@ msgstr ""
 "I<pacote>."
 
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:637
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1484,13 +1492,13 @@ msgstr ""
 "programa debhelper irá actuar."
 
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:645
 msgid "udebs"
 msgstr "udebs"
 
 # FIXME : an udeb
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:647
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1507,17 +1515,17 @@ msgstr ""
 "F<preinst>, F<postrm>, F<prerm>, e F<config>, etc."
 
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:654
 msgid "ENVIRONMENT"
 msgstr "AMBIENTE"
 
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:658
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:660
 msgid ""
 "Set to B<1> to enable verbose mode. Debhelper will output every command it "
 "runs. Also enables verbose build logs for some build systems like autoconf."
@@ -1527,12 +1535,12 @@ msgstr ""
 "detalhados para alguns sistemas de compilação como o autoconf."
 
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:663
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:665
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1541,22 +1549,22 @@ msgstr ""
 "correr, sobrepondo qualquer valor em F<debian/compat>."
 
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:668
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:670
 msgid "Set to B<1> to enable no-act mode."
 msgstr "Defina para B<1> para activar o modo no-act."
 
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:672
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:674
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1565,7 +1573,7 @@ msgstr ""
 "comandos de todos os comandos do debhelper."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:677
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1574,12 +1582,12 @@ msgstr ""
 "comando do debhelper, o que é geralmente melhor do que usar DH_OPTIONS."
 
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:680
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:682
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1591,7 +1599,7 @@ msgstr ""
 "sua árvore de compilação do pacote."
 
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:686
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1609,7 +1617,7 @@ msgstr ""
 "seu é compilado."
 
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:693
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1618,13 +1626,13 @@ msgstr ""
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
 
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
+#: debhelper.pod:698 dh:972 dh_auto_build:47 dh_auto_clean:50
 #: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
 #: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
 #: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
 #: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
 #: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: dh_installdocs:348 dh_installemacsen:141 dh_installexamples:108
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
 #: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
@@ -1638,35 +1646,35 @@ msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:702
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:704
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr "Um conjunto de ficheiros F<debian/rules> exemplo que usam debhelper."
 
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:706
 #, fuzzy
 #| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgid "L<http://joeyh.name/code/debhelper/>"
 msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:708
 msgid "Debhelper web site."
 msgstr "Sítio web do debhelper."
 
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
+#: debhelper.pod:712 dh:978 dh_auto_build:53 dh_auto_clean:56
 #: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
 #: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
 #: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
 #: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
 #: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: dh_installdocs:354 dh_installemacsen:148 dh_installexamples:114
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
 #: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
@@ -1679,11 +1687,11 @@ msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
+#: debhelper.pod:714 dh:980 dh_auto_build:55 dh_auto_clean:58
 #: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
 #: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
 #: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
+#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:356
 #: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
@@ -2400,7 +2408,7 @@ msgstr ""
 #: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
 #: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
 #: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh_installdocs:350 dh_installexamples:110 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
 #: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
@@ -2417,7 +2425,7 @@ msgstr "L<debhelper(7)>"
 #: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
 #: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
 #: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh_installdocs:352 dh_installemacsen:146 dh_installexamples:112
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
 #: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git




More information about the debhelper-devel mailing list