From 0de18c36efd60f28e4e3d293346d410c3be334bd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Apr 2009 10:04:12 -0700 Subject: [PATCH] remove trailing whitespace to placate Jim, more license syncs --- build-aux/gendocs.sh | 8 ++++---- config/srclist.txt | 11 +++++++++++ doc/COPYING.LESSERv2 | 2 +- doc/COPYING.LESSERv3 | 4 ++-- doc/Copyright/assign.future.manual | 2 +- doc/Copyright/assign.manual | 8 ++++---- doc/Copyright/request-assign.changes | 2 +- doc/gendocs_template | 10 +++++----- doc/gendocs_template_min | 8 ++++---- doc/gpl-2.0.texi | 2 +- doc/lgpl-2.1.texi | 2 +- doc/maintain.texi | 10 +++++----- doc/standards.texi | 4 ++-- 13 files changed, 42 insertions(+), 31 deletions(-) mode change 100755 => 100644 build-aux/gendocs.sh diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh old mode 100755 new mode 100644 index ba767441ad..a1ed4b48fc --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,7 +2,7 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2009-01-02.08 +scriptversion=2009-04-08.09 # Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. @@ -19,7 +19,7 @@ scriptversion=2009-01-02.08 # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# +# # Original author: Mohit Agarwal. # Send bug reports and any other correspondence to bug-texinfo@gnu.org. @@ -98,7 +98,7 @@ You can set the environment variables MAKEINFO, TEXI2DVI, and DVIPS to control the programs that get executed, and GENDOCS_TEMPLATE_DIR to control where the gendocs_template file is looked for. (With --docbook, the environment variables DOCBOOK2HTML, DOCBOOK2PDF, DOCBOOK2PS, and -DOCBOOK2TXT are also respected.) +DOCBOOK2TXT are also respected.) By default, makeinfo is run in the default (English) locale, since that's the language of most Texinfo manuals. If you happen to have a @@ -247,7 +247,7 @@ if test -z "$use_texi2html"; then cd ${split_html_dir} || exit 1 tar -czf $dotdot_outdir/${PACKAGE}.html_node.tar.gz -- *.html ) - html_node_tgz_size=`calcsize $outdir/${PACKAGE}.html_node.tar.gz` + html_node_tgz_size=`calcsize $outdir/${PACKAGE}.html_node.tar.gz` rm -f $outdir/html_node/*.html mkdir -p $outdir/html_node/ mv ${split_html_dir}/*.html $outdir/html_node/ diff --git a/config/srclist.txt b/config/srclist.txt index 70f20acdf2..3bd58e2e76 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -28,6 +28,17 @@ $GNUSTANDARDS/make-stds.texi doc $GNUSTANDARDS/gnu-oids.texi doc $GNUSTANDARDS/fdl.texi doc # +$GNUWWWLICENSES/lgpl-3.0.txt doc/COPYING.LESSERv3 +$GNUWWWLICENSES/old-licenses/lgpl-2.1.txt doc/COPYING.LESSERv2 +$GNUWWWLICENSES/gpl-3.0.txt doc/COPYINGv3 +$GNUWWWLICENSES/old-licenses/gpl-2.0.txt doc/COPYINGv2 +$GNUWWWLICENSES/old-licenses/lgpl-2.1.texi doc +$GNUWWWLICENSES/old-licenses/gpl-2.0.texi doc +$GNUWWWLICENSES/old-licenses/fdl-1.2.texi doc +$GNUWWWLICENSES/agpl-3.0.texi doc +$GNUWWWLICENSES/fdl-1.3.texi doc +$GNUWWWLICENSES/fdl-1.3.texi doc/fdl.texi +# # The official forms for contributors to fill out, mentioned in maintain. $GNUORG/conditions.text doc/Copyright $GNUORG/Copyright/request-assign.changes doc/Copyright diff --git a/doc/COPYING.LESSERv2 b/doc/COPYING.LESSERv2 index 5ab7695ab8..602bfc9463 100644 --- a/doc/COPYING.LESSERv2 +++ b/doc/COPYING.LESSERv2 @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/doc/COPYING.LESSERv3 b/doc/COPYING.LESSERv3 index fc8a5de7ed..cca7fc278f 100644 --- a/doc/COPYING.LESSERv3 +++ b/doc/COPYING.LESSERv3 @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ the following: a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the diff --git a/doc/Copyright/assign.future.manual b/doc/Copyright/assign.future.manual index 8247dbc554..3f7e92ee49 100644 --- a/doc/Copyright/assign.future.manual +++ b/doc/Copyright/assign.future.manual @@ -16,7 +16,7 @@ license manuals produced there will do. Here is a sample wording: Digital Stimulation Corporation hereby disclaims all copyright interest in the changes and enhancements made by Hugh Heffner to the manual "The Seduction Manual", including both those he has already - made and those he will make in the future. We do not consider them + made and those he will make in the future. We do not consider them as works made for hire for us. , 1 April 1987 diff --git a/doc/Copyright/assign.manual b/doc/Copyright/assign.manual index 3301bff4b7..c566d77792 100644 --- a/doc/Copyright/assign.manual +++ b/doc/Copyright/assign.manual @@ -41,10 +41,10 @@ questions, or would like something to be changed, ask me via email. ASSIGNMENT For $1 and other good and valuable consideration, receipt of which I -acknowledge, I, NAME OF PERSON, hereby transfer to the Free Software -Foundation, Inc. (the "Foundation") my entire right, title, and interest -(including all rights under copyright) in my manual "NAME OF MANUAL" (the -"Work"), subject to the conditions below. The work hereby assigned shall +acknowledge, I, NAME OF PERSON, hereby transfer to the Free Software +Foundation, Inc. (the "Foundation") my entire right, title, and interest +(including all rights under copyright) in my manual "NAME OF MANUAL" (the +"Work"), subject to the conditions below. The work hereby assigned shall further include any future changes and/or enhancements hereafter made by me. Upon thirty days' prior written notice, the Foundation agrees to grant me diff --git a/doc/Copyright/request-assign.changes b/doc/Copyright/request-assign.changes index 4ced490b65..a430efff11 100644 --- a/doc/Copyright/request-assign.changes +++ b/doc/Copyright/request-assign.changes @@ -3,7 +3,7 @@ send you the assignment form that covers the changes you have already written. That form will cover subsequent corrections to those changes, but it will not cover other unrelated future changes to the same program. - + Please use your full legal name (in ASCII characters) as the subject line of the message. --------------------------------------------------------------------- REQUEST: SEND FORM FOR CHANGES ALREADY MADE diff --git a/doc/gendocs_template b/doc/gendocs_template index 94cecef453..1bb1a5c11a 100644 --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -15,7 +15,7 @@

This manual (%%PACKAGE%%) is available in the following formats:

    -
  • HTML +
  • HTML (%%HTML_MONO_SIZE%%K bytes) - entirely on one web page.
  • HTML - with one web page per node.
    • @@ -28,7 +28,7 @@ chapter. %%ENDIF HTML_CHAPTER%%
  • HTML compressed - (%%HTML_MONO_GZ_SIZE%%K gzipped characters) - entirely on + (%%HTML_MONO_GZ_SIZE%%K gzipped characters) - entirely on one web page.
  • HTML compressed (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file) - @@ -69,7 +69,7 @@ script.)

    - + @@ -77,9 +77,9 @@ script.)