[automake-commit] branch master updated: doc: HACKING bug merge; doc/local.mk help2man update hints.

[Karl Berry]

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

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e5168045087f356b6657ef172fe6f33b399b882a

The following commit(s) were added to refs/heads/master by this push:
     new e51680450 doc: HACKING bug merge; doc/local.mk help2man update hints.
e51680450 is described below

commit e5168045087f356b6657ef172fe6f33b399b882a
Author: Karl Berry <karl@freefriends.org>
AuthorDate: Sat May 27 17:59:51 2023 -0700

    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.
---
 HACKING      | 4 ++++
 doc/local.mk | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/HACKING b/HACKING
index 26b01c5e6..e0ac01875 100644
--- 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 d72e8e6bb..f76d6d66f 100644
--- 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).