Mercurial > hg > octave-lyh > gnulib-hg
changeset 11480:43db6feede26
remove trailing whitespace to placate Jim, more license syncs
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Mon, 13 Apr 2009 10:04:12 -0700 |
parents | 2e168b9fc9aa |
children | 9a794a99b730 |
files | build-aux/gendocs.sh config/srclist.txt doc/COPYING.LESSERv2 doc/COPYING.LESSERv3 doc/Copyright/assign.future.manual doc/Copyright/assign.manual doc/Copyright/request-assign.changes doc/gendocs_template doc/gendocs_template_min doc/gpl-2.0.texi doc/lgpl-2.1.texi doc/maintain.texi doc/standards.texi |
diffstat | 13 files changed, 42 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
old mode 100755 new mode 100644 --- 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 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# +# # Original author: Mohit Agarwal. # Send bug reports and any other correspondence to bug-texinfo@gnu.org. @@ -98,7 +98,7 @@ 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 @@ 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/
--- a/config/srclist.txt +++ b/config/srclist.txt @@ -28,6 +28,17 @@ $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
--- a/doc/COPYING.LESSERv2 +++ b/doc/COPYING.LESSERv2 @@ -146,7 +146,7 @@ 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
--- 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 @@ 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
--- a/doc/Copyright/assign.future.manual +++ b/doc/Copyright/assign.future.manual @@ -16,7 +16,7 @@ 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. <signature of Ty Coon>, 1 April 1987
--- a/doc/Copyright/assign.manual +++ b/doc/Copyright/assign.manual @@ -41,10 +41,10 @@ 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
--- a/doc/Copyright/request-assign.changes +++ b/doc/Copyright/request-assign.changes @@ -3,7 +3,7 @@ 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
--- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -15,7 +15,7 @@ <p>This manual (%%PACKAGE%%) is available in the following formats:</p> <ul> -<li><a href="%%PACKAGE%%.html">HTML +<li><a href="%%PACKAGE%%.html">HTML (%%HTML_MONO_SIZE%%K bytes)</a> - entirely on one web page.</li> <li><a href="html_node/index.html">HTML</a> - with one web page per node.</li> @@ -28,7 +28,7 @@ chapter.</li> %%ENDIF HTML_CHAPTER%% <li><a href="%%PACKAGE%%.html.gz">HTML compressed - (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on + (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on one web page.</li> <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> - @@ -69,7 +69,7 @@ <!-- If needed, change the copyright block at the bottom. In general, --> <!-- all pages on the GNU web server should have the section about --> <!-- verbatim copying. Please do NOT remove this without talking --> -<!-- with the webmasters first. --> +<!-- with the webmasters first. --> <!-- Please make sure the copyright date is consistent with the document --> <!-- and that it is like this "2001, 2002" not this "2001-2002." --> </div><!-- for id="content", starts in the include above --> @@ -77,9 +77,9 @@ <div id="footer"> <p> -Please send FSF & GNU inquiries to +Please send FSF & GNU inquiries to <a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>. -There are also <a href="/contact/">other ways to contact</a> +There are also <a href="/contact/">other ways to contact</a> the FSF. <br /> Please send broken links and other corrections or suggestions to
--- a/doc/gendocs_template_min +++ b/doc/gendocs_template_min @@ -33,7 +33,7 @@ <p>This manual (%%PACKAGE%%) is available in the following formats:</p> <ul> -<li><a href="%%PACKAGE%%.html">HTML +<li><a href="%%PACKAGE%%.html">HTML (%%HTML_MONO_SIZE%%K bytes)</a> - entirely on one web page.</li> <li><a href="html_node/index.html">HTML</a> - with one web page per node.</li> @@ -46,7 +46,7 @@ chapter.</li> %%ENDIF HTML_CHAPTER%% <li><a href="%%PACKAGE%%.html.gz">HTML compressed - (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on + (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on one web page.</li> <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> - @@ -86,9 +86,9 @@ </p> <p> -Please send FSF & GNU inquiries to +Please send FSF & GNU inquiries to <a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>. -There are also <a href="/home.html#ContactInfo">other ways to contact</a> +There are also <a href="/home.html#ContactInfo">other ways to contact</a> the FSF. <br /> Please send broken links and other corrections (or suggestions) to
--- a/doc/gpl-2.0.texi +++ b/doc/gpl-2.0.texi @@ -2,7 +2,7 @@ @center Version 2, June 1991 @c This file is intended to be included within another document, -@c hence no sectioning command or @node. +@c hence no sectioning command or @node. @display Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
--- a/doc/lgpl-2.1.texi +++ b/doc/lgpl-2.1.texi @@ -2,7 +2,7 @@ @center Version 2.1, February 1999 @c This file is intended to be included within another document, -@c hence no sectioning command or @node. +@c hence no sectioning command or @node. @display Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
--- a/doc/maintain.texi +++ b/doc/maintain.texi @@ -5,7 +5,7 @@ @c For double-sided printing, uncomment: @c @setchapternewpage odd @c This date is automagically updated when you save this file: -@set lastupdate March 12, 2009 +@set lastupdate April 8, 2009 @c %**end of header @dircategory GNU organization @@ -322,7 +322,7 @@ papers. In any case, you should wait for the confirmation from the FSF that the signed papers have been received and accepted before integrating the new contributor's material, as usual. - + If a contributor is reluctant to sign an assignment for a large change, and is willing to sign a disclaimer instead, that is acceptable, so you should offer this alternative if it helps you reach agreement. We @@ -1708,10 +1708,10 @@ @node CVS Keywords in Web Pages @section CVS Keywords in Web Pages -@cindex cvs keywords in web pages -@cindex rcs keywords in web pages +@cindex CVS keywords in web pages +@cindex RCS keywords in web pages @cindex $ keywords in web pages -@cindex web pages, and cvs keywords +@cindex web pages, and CVS keywords Since @code{www.gnu.org} works through CVS, CVS keywords in your manual, such as @code{@w{$}Log$}, need special treatment (even if you
--- a/doc/standards.texi +++ b/doc/standards.texi @@ -3,7 +3,7 @@ @setfilename standards.info @settitle GNU Coding Standards @c This date is automagically updated when you save this file: -@set lastupdate January 31, 2009 +@set lastupdate April 8, 2009 @c %**end of header @dircategory GNU organization @@ -313,7 +313,7 @@ write modern GUI functionality within Guile. We don't reject programs written in other ``scripting languages'' such as Perl and Python, but using Guile is very important for the overall consistency of the GNU -system. +system. @node Compatibility