doc: wording, --news-file.

* doc/automake.texi: avoid @strong for emphasis; wording.
* HACKING: add --news-file option to sample announce-gen invocation.

diff --git a/HACKING b/HACKING
index 1b39d7cdc8cb976cc7a277902b24763c78673514..34f4599bf173ae7dfd793d36e90a25633763e0d2 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -595,6 +595,7 @@
     $gnulib/build-aux/announce-gen --release-type=$reltype \
       --package-name=$pkg --previous-version=$prever \
       --current-version=$newver --gpg-key-id=$gpgkey \
+      --news-file=NEWS \
       --url-directory=https://$host.gnu.org/gnu/$pkg
   and merge this with the just-written announcement file.
 

diff --git a/doc/automake.texi b/doc/automake.texi
index 91364148aa3dcf2cc78af64141ee13b6fc5bf84c..9b0f27e14c0b686186b8400d28c5624caf01191e 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1667,7 +1667,7 @@ mailing list of your package, or your own mail address.
 The argument to @code{AM_INIT_AUTOMAKE} is a list of options for
 @command{automake} (@pxref{Options}).  @option{-Wall} and
 @option{-Werror} ask @command{automake} to turn on all warnings and
-report them as errors.  We are speaking of @strong{Automake} warnings
+report them as errors.  We are speaking of @emph{Automake} warnings
 here, such as dubious instructions in @file{Makefile.am}.  This has
 absolutely nothing to do with how the compiler will be called, even
 though it may support options with similar names.  Using @option{-Wall
@@ -2656,7 +2656,7 @@ therefore @command{autoconf} must be in your @env{PATH}.  If there is
 an @env{AUTOCONF} variable in your environment it will be used
 instead of @command{autoconf}; this allows you to select a particular
 version of Autoconf.  By the way, don't misunderstand this paragraph:
-@command{automake} runs @command{autoconf} to @strong{scan} your
+@command{automake} runs @command{autoconf} to @emph{scan} your
 @file{configure.ac}; this won't build @file{configure} and you still
 have to run @command{autoconf} yourself for this purpose.
 
@@ -11573,12 +11573,12 @@ bin_PROGRAMS = doit
 doit_SOURCES = doit.foo
 @end example
 
-This was the simpler and more common case.  In other cases, you will
-have to help Automake to figure out which extensions you are defining your
+That is the simpler and more common case.  In other cases, you have to
+help Automake to figure out which extensions you are defining your
 suffix rule for.  This usually happens when your extension does not
-start with a dot.  Then, all you have to do is to put a list of new
-suffixes in the @code{SUFFIXES} variable @strong{before} you define your
-implicit rule.
+start with a dot.  Then, you have to put the list of new suffixes in
+the @code{SUFFIXES} variable @emph{before} you define your implicit
+rule.
 
 For instance, the following definition prevents Automake from misinterpreting
 the @samp{.idlC.cpp:} rule as an attempt to transform @file{.idlC} files into
@@ -12648,10 +12648,10 @@ older than the requested version.
 
 @heading What is in the API
 
-Automake's programming interface is not easy to define.  Basically it
-should include at least all @strong{documented} variables and targets
-that a @file{Makefile.am} author can use, any behavior associated with
-them (e.g., the places where @samp{-hook}'s are run), the command line
+Automake's programming interface is not easy to define.  It includes
+at least all documented variables and targets that a
+@file{Makefile.am} author can use, any behavior associated with them
+(e.g., the places where @samp{-hook}'s are run), the command line
 interface of @command{automake} and @command{aclocal}, @dots{}
 
 @heading What is not in the API