doc: HACKING bug merge; doc/local.mk help2man update hints.

* HACKING: give bug merge example.
* doc/local.mk: how to update help2man manually;
fix checklinkx sleep comment.

diff --git a/HACKING b/HACKING
index 26b01c5e673e7ac316bedee31fbcd0e42a75c120..e0ac01875ad585c9a03de9b6bd4dd58cf2dbec1c 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -431,6 +431,10 @@
   control@debbugs.gnu.org with a one-line body:
     tags 12345 + help confirmed
 
+* To merge bugs 12345 and 56789, mail to
+  control@debbugs.gnu.org with a one-line body:
+    merge 12345 56789
+
 * In general, all bug operations are done by mail.  Reference information:
     https://debbugs.gnu.org/server-control.html # dev info
 

diff --git a/doc/local.mk b/doc/local.mk
index d72e8e6bb2d20e9b21ba8444b085d56fa16f4b2c..f76d6d66ff0d74da8344acefa6ecd6c5389d9f7a 100644 (file)
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -31,7 +31,8 @@ man1_MANS = \
 $(man1_MANS): $(top_srcdir)/configure.ac
 
 CLEANFILES += $(man1_MANS)
-# XXX: This script should be updated with 'fetch' target.
+# XXX: This script should be updated with 'fetch' target, but isn't;
+# build help2man normally and copy it in manually. Preserve the #! path.
 EXTRA_DIST += %D%/help2man
 
 update_mans = \
@@ -58,7 +59,7 @@ update_mans = \
 ## under manual control. See https://debbugs.gnu.org/10371.
 ##
 checklinkx = $(top_srcdir)/contrib/checklinkx
-# that 4-second sleep seems to be what gnu.org likes.
+# that particular sleep seems to be what gnu.org likes.
 chlx_args = -v --sleep 8 #--exclude-url-file=/tmp/xf
 # Explanation of excludes:
 # - w3.org dtds, they are fine (and slow).