[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-91-g829c13e

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=829c13e4c32a8990b36ab8086b64b3d3774b1059

The branch, branch-1.11 has been updated
       via  829c13e4c32a8990b36ab8086b64b3d3774b1059 (commit)
       via  d7ab85e6c53b15d01a0bcb78dac248fea41e00d4 (commit)
       via  a28702cf5c4494c5f5bb062f512b610c95be9f8a (commit)
      from  b866ca1e3da0e478675de31b9be15249f3c87809 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 829c13e4c32a8990b36ab8086b64b3d3774b1059
Merge: b866ca1e3da0e478675de31b9be15249f3c87809 
d7ab85e6c53b15d01a0bcb78dac248fea41e00d4
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 6 12:45:03 2010 +0200

    Merge branch 'maint' into branch-1.11

-----------------------------------------------------------------------

Summary of changes:
 AUTHORS           |    4 ++++
 ChangeLog         |   14 ++++++++++++++
 THANKS            |    1 +
 doc/automake.texi |   30 +++++++++++++++---------------
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f1cd414..e63f8b7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,3 +15,7 @@ Alexandre Oliva
 Alexandre Duret-Lutz
   Major overhaul of everything.
   Maintenance since 2002.
+
+Ralf Wildenhues
+  Random breakage.
+  Maintenance since 2006.
diff --git a/ChangeLog b/ChangeLog
index a33e763..c52669a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-06-06  Ralf Wildenhues  <address@hidden>
+
+       Rewrite manual to be gender-neutral.
+       * doc/automake.texi (GNU Build System)
+       (Standard Directory Variables, General Operation, CVS)
+       (Hard-Coded Install Paths, Dependencies As Side Effects):
+       Rewrite text to not contain gender-specific pronouns when
+       speaking about developers or users, either by avoiding pronouns
+       or by addressing them as `you' instead.
+       * THANKS: Update.
+       Report by Christina Gratorp.
+
+       * AUTHORS: Update.
+
 2010-06-06  Stefano Lattarini  <address@hidden>
 
        Make tests on user extensibility of silent-rules mode stricter.
diff --git a/THANKS b/THANKS
index 271ae2b..fe91cbe 100644
--- a/THANKS
+++ b/THANKS
@@ -57,6 +57,7 @@ Chris Hoogendyk               address@hidden
 Chris Pickett          address@hidden
 Chris Provenzano       address@hidden
 Christian Cornelssen   address@hidden
+Christina Gratorp      address@hidden
 Claudio Fontana                address@hidden
 Clifford Wolf          address@hidden
 Dagobert Michelsen     address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 3a1415b..d96bc9e 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -456,13 +456,13 @@ This chapter is the written version of the first part of 
his tutorial.
 @section Introducing the GNU Build System
 @cindex GNU Build System, introduction
 
-It is a truth universally acknowledged, that a developer in
-possession of a new package, must be in want of a build system.
+It is a truth universally acknowledged, that as a developer in
+possession of a new package, you must be in want of a build system.
 
 In the Unix world, such a build system is traditionally achieved using
 the command @command{make} (@pxref{Top, , Overview, make, The GNU Make
-Manual}).  The developer expresses the recipe to build his package in
-a @file{Makefile}.  This file is a set of rules to build the files in
+Manual}).  You express the recipe to build your package in a
address@hidden  This file is a set of rules to build the files in
 the package.  For instance the program @file{prog} may be built by
 running the linker on the files @file{main.o}, @file{foo.o}, and
 @file{bar.o}; the file @file{main.o} may be built by running the
@@ -725,8 +725,8 @@ installed into @var{docdir}, which defaults to
 
 @opindex --prefix
 
-A user who wishes to install a package on his own account could proceed
-as follows:
+As a user, if you wish to install a package on your own account, you
+could proceed as follows:
 
 @example
 ~/amhello-1.0 % @kbd{./configure --prefix ~/usr}
@@ -1761,7 +1761,7 @@ copied verbatim into the generated file.  This allows you 
to add
 arbitrary code into the generated @file{Makefile.in}.  For instance,
 the Automake distribution includes a non-standard rule for the
 @code{git-dist} target, which the Automake maintainer uses to make
-distributions from his source control system.
+distributions from the source control system.
 
 @cindex GNU make extensions
 
@@ -10454,7 +10454,7 @@ happen.  CVS's timestamp handling can also let you 
think an
 out-of-date file is up-to-date.
 
 For instance, suppose a developer has modified @file{Makefile.am} and
-has rebuilt @file{Makefile.in}.  He then decides to do a last-minute
+has rebuilt @file{Makefile.in}, and then decides to do a last-minute
 change to @file{Makefile.am} right before checking in both files
 (without rebuilding @file{Makefile.in} to account for the change).
 
@@ -11532,10 +11532,10 @@ standard directory variables (@samp{$(prefix)}, 
@samp{$(bindir)},
 @samp{$(datadir)}, etc.), the effect will be the same:
 user-installations are impossible.
 
-When a (non-root) user wants to install a package, he usually has no
-right to install anything in @file{/usr} or @file{/usr/local}.  So he
-does something like @samp{./configure --prefix ~/usr} to install
-package in his own @file{~/usr} tree.
+As a (non-root) user who wants to install a package, you usually have no
+right to install anything in @file{/usr} or @file{/usr/local}.  So you
+do something like @samp{./configure --prefix ~/usr} to install a
+package in your own @file{~/usr} tree.
 
 If a package attempts to install something to some hard-coded path
 (e.g., @file{/etc/afile}), regardless of this @option{--prefix} setting,
@@ -12552,9 +12552,9 @@ given header file, like this:
 maude.o: maude.c something.h
 @end example
 
-Now suppose that the developer removes @file{something.h} and updates
address@hidden so that this include is no longer needed.  If he runs
address@hidden, he will get an error because there is no way to create
+Now suppose that you remove @file{something.h} and update @file{maude.c}
+so that this include is no longer needed.  If you run @command{make},
+you will get an error because there is no way to create
 @file{something.h}.
 
 We fixed this problem in a later release by further massaging the


hooks/post-receive
-- 
GNU Automake