Use the official FDL license wording in license text.

* README-hacking (footer): use the official FDL license wording as
listed in FDL's "ADDENDUM: How to use this License for your
documents". Update copyright year.
* NEWS (footer): Likewise.
* doc/find-maint.texi: Likewise.
* doc/find.texi: Likewise.
* doc/regexprops.texi: Likewise.
* lib/regexprops.c (copying): Amend the code to emit the updated
wording.  Update the copyright year.

6 files changed, 20 insertions, 21 deletions

diff --git a/NEWS b/NEWS
index 01a7f597..62aca687 100644
--- a/NEWS
+++ b/NEWS
@@ -1973,12 +1973,11 @@ LocalWords: strncasecmp strcasecmp LIBOBJS FUNC prunefs allout libexec
 LocalWords: testsuite Texinfo chdir inode fstype afs fls ls EOF lname
 LocalWords: regex ilname iname ipath iregex printf fprintf
 
-Copyright (C) 1996, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1996, 1999, 2000, 2001, 2003-2015 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the ``GNU Free
-Documentation License'' file as part of this distribution.
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the ``GNU Free Documentation
+License'' file as part of this distribution.
diff --git a/README-hacking b/README-hacking
index 2e34e292..427f29c9 100644
--- a/README-hacking
+++ b/README-hacking
@@ -238,11 +238,11 @@ In case you're wondering why we bother with all of this, read this:
 
 
 ========================================================================
-Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+Copyright (C) 2009, 2010, 2014, 2015 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the ``GNU Free
-Documentation License'' file as part of this distribution.
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the ``GNU Free Documentation
+License'' file as part of this distribution.
diff --git a/doc/find-maint.texi b/doc/find-maint.texi
index c32bbfb6..5f6a5a74 100644
--- a/doc/find-maint.texi
+++ b/doc/find-maint.texi
@@ -23,14 +23,14 @@ be made and tested, and what resources exist to help developers.
 
 This is edition @value{EDITION}, for findutils version @value{VERSION}.
 
-Copyright @copyright{} 2007, 2008, 2010, 2011 Free Software Foundation,
+Copyright @copyright{} 2007, 2008, 2010-2015 Free Software Foundation,
 Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3
 or any later version published by the Free Software Foundation;
-with no Invariant Sections, with no
-Front-Cover Texts, and with no Back-Cover Texts.
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+Texts.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
 @end copying
diff --git a/doc/find.texi b/doc/find.texi
index d222f653..a12c55ea 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -31,14 +31,14 @@
 This file documents the GNU utilities for finding files that match
 certain criteria and performing various operations on them.
 
-Copyright @copyright{} 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,
-2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 1996, 1998, 2000, 2001, 2003-2015 Free
+Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the section entitled
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled
 ``GNU Free Documentation License''.
 @end copying
 
diff --git a/doc/regexprops.texi b/doc/regexprops.texi
index 719a649f..537b64e0 100644
--- a/doc/regexprops.texi
+++ b/doc/regexprops.texi
@@ -4,8 +4,8 @@
 @c Permission is granted to copy, distribute and/or modify this document
 @c under the terms of the GNU Free Documentation License, Version 1.3 or
 @c any later version published by the Free Software Foundation; with no
-@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-@c Texts.  A copy of the license is included in the ``GNU Free
+@c Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+@c A copy of the license is included in the ``GNU Free
 @c Documentation License'' file as part of this distribution.
 
 @c this regular expression description is for: findutils
diff --git a/lib/regexprops.c b/lib/regexprops.c
index 62704037..3409b4c4 100644
--- a/lib/regexprops.c
+++ b/lib/regexprops.c
@@ -1,7 +1,7 @@
 /* regexprops.c -- document the properties of the regular expressions
    understood by gnulib.
 
-   Copyright 2005, 2007, 2010, 2011 Free Software Foundation, Inc.
+   Copyright 2005, 2007, 2010, 2011, 2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -459,8 +459,8 @@ copying (void)
       ,"Permission is granted to copy, distribute and/or modify this document"
       ,"under the terms of the GNU Free Documentation License, Version 1.3 or"
       ,"any later version published by the Free Software Foundation; with no"
-      ,"Invariant Sections, with no Front-Cover Texts, and with no Back-Cover"
-      ,"Texts.  A copy of the license is included in the ``GNU Free"
+      ,"Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts."
+      ,"A copy of the license is included in the ``GNU Free"
       ,"Documentation License'' file as part of this distribution."
       ""
       ,NULL