From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 6 Jun 2010 10:45:07 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~416
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=915d00c655eb3eebc7b9ca7a0b2dfd76ccc87b2a;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

915d00c655eb3eebc7b9ca7a0b2dfd76ccc87b2a
diff --cc ChangeLog
index 237da58a0,653c42104..ba0d2330e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,19 +1,23 @@@
+ 2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	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  <stefano.lattarini@gmail.com>
  
 +	Tiny fix in silent8.test (display output of `make' command).
 +	* tests/silent8.test: Make sure that the captured output of `make'
 +	command is always displayed.
 +
  	Make tests on user extensibility of silent-rules mode stricter.
  	* tests/silent6.test: Made stricter w.r.t. the grepping of the
  	output produced by `make'.