diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2010-08-19 04:13:01 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2010-08-19 04:15:42 -0700 |
commit | 0a694a16e5926f4950637044fd165200fb229f53 (patch) | |
tree | e330642446f3aec1d20913e40913db535d735cf0 /doc | |
parent | b3b15f7cbc61e003f62eff1549a4263a69682302 (diff) | |
download | tar-0a694a16e5926f4950637044fd165200fb229f53.tar.gz |
tar: update licenses to latest versions from www.gnu.org
* COPYING: Update to latest version; this is just minor formatting.
* doc/fdl.texi: Update from GFDL 1.2 to 1.3.
* doc/tar.texi: Adjust to new format of fdl.texi. Omit trailing
white space.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/fdl.texi | 110 | ||||
-rw-r--r-- | doc/tar.texi | 39 |
2 files changed, 100 insertions, 49 deletions
diff --git a/doc/fdl.texi b/doc/fdl.texi index fe78df8d..fc19dddd 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -1,13 +1,12 @@ +@c The GNU Free Documentation License. +@center Version 1.3, 3 November 2008 -@node GNU Free Documentation License -@appendixsec GNU Free Documentation License - -@cindex FDL, GNU Free Documentation License -@center Version 1.2, November 2002 +@c This file is intended to be included within another document, +@c hence no sectioning command or @node. @display -Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc. -51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +@uref{http://fsf.org/} Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -93,16 +92,16 @@ An image format is not Transparent if used for any substantial amount of text. A copy that is not ``Transparent'' is called ``Opaque''. Examples of suitable formats for Transparent copies include plain -@sc{ascii} without markup, Texinfo input format, La@TeX{} input -format, @acronym{SGML} or @acronym{XML} using a publicly available -@acronym{DTD}, and standard-conforming simple @acronym{HTML}, -PostScript or @acronym{PDF} designed for human modification. Examples -of transparent image formats include @acronym{PNG}, @acronym{XCF} and -@acronym{JPG}. Opaque formats include proprietary formats that can be -read and edited only by proprietary word processors, @acronym{SGML} or -@acronym{XML} for which the @acronym{DTD} and/or processing tools are -not generally available, and the machine-generated @acronym{HTML}, -PostScript or @acronym{PDF} produced by some word processors for +ASCII without markup, Texinfo input format, La@TeX{} input +format, SGML or XML using a publicly available +DTD, and standard-conforming simple HTML, +PostScript or PDF designed for human modification. Examples +of transparent image formats include PNG, XCF and +JPG. Opaque formats include proprietary formats that can be +read and edited only by proprietary word processors, SGML or +XML for which the DTD and/or processing tools are +not generally available, and the machine-generated HTML, +PostScript or PDF produced by some word processors for output purposes only. The ``Title Page'' means, for a printed book, the title page itself, @@ -112,6 +111,9 @@ formats which do not have any title page as such, ``Title Page'' means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. +The ``publisher'' means any person or entity that distributes copies +of the Document to the public. + A section ``Entitled XYZ'' means a named subunit of the Document whose title either is precisely XYZ or contains XYZ in parentheses following text that translates XYZ in another language. (Here XYZ stands for a @@ -380,13 +382,30 @@ title. @item TERMINATION -You may not copy, modify, sublicense, or distribute the Document except -as expressly provided for under this License. Any other attempt to -copy, modify, sublicense or distribute the Document is void, and will -automatically terminate your rights under this License. However, -parties who have received copies, or rights, from you under this -License will not have their licenses terminated so long as such -parties remain in full compliance. +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. @item FUTURE REVISIONS OF THIS LICENSE @@ -404,11 +423,46 @@ following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation. +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +@item +RELICENSING + +``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the +site means any set of copyrightable works thus published on the MMC +site. + +``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +``Incorporate'' means to publish or republish a Document, in whole or +in part, as part of another Document. + +An MMC is ``eligible for relicensing'' if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole +or in part into the MMC, (1) had no cover texts or invariant sections, +and (2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + @end enumerate @page -@appendixsubsec ADDENDUM: How to use this License for your documents +@heading ADDENDUM: How to use this License for your documents To use this License in a document you have written, include a copy of the License in the document and put the following copyright and @@ -418,7 +472,7 @@ license notices just after the title page: @group Copyright (C) @var{year} @var{your name}. Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.2 + 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, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU @@ -427,7 +481,7 @@ license notices just after the title page: @end smallexample If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with...Texts.'' line with this: +replace the ``with@dots{}Texts.'' line with this: @smallexample @group diff --git a/doc/tar.texi b/doc/tar.texi index 52b774cb..364d005e 100644 --- a/doc/tar.texi +++ b/doc/tar.texi @@ -41,11 +41,12 @@ Copyright @copyright{} 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, @quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +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 the Front-Cover Texts being ``A GNU Manual,'' +Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'', and with the Back-Cover Texts as in (a) below. A copy of the license -is included in the section entitled "GNU Free Documentation License". +is included in the section entitled ``GNU Free Documentation +License''. (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and modify this GNU manual. Buying copies from the FSF @@ -115,7 +116,7 @@ Appendices * Tar Internals:: * Genfile:: * Free Software Needs Free Documentation:: -* Copying This Manual:: +* GNU Free Documentation License:: * Index of Command Line Options:: * Index:: @@ -2465,7 +2466,7 @@ This option tells @command{tar} to read or write archives through @item --check-device Check device numbers when creating a list of modified files for incremental archiving. This is the default. @xref{device numbers}, -for a detailed description. +for a detailed description. @opsummary{checkpoint} @item --checkpoint[=@var{number}] @@ -2928,7 +2929,7 @@ suffix. @xref{--auto-compress}. @xref{gzip}. @item --no-check-device Do not check device numbers when creating a list of modified files for incremental archiving. @xref{device numbers}, for -a detailed description. +a detailed description. @opsummary{no-delay-directory-restore} @item --no-delay-directory-restore @@ -4162,7 +4163,7 @@ Disable all warning messages. @samp{Current %s is newer or same age} @kwindex unknown-keyword @cindex @samp{Ignoring unknown extended header keyword `%s'}, warning message -@item unknown-keyword +@item unknown-keyword @samp{Ignoring unknown extended header keyword `%s'} @end table @@ -4418,7 +4419,7 @@ of those members listed, with their data modification times, owners, etc. Other operations don't deal with these members as perfectly as you might prefer; if you were to use @option{--extract} to extract the archive, -only the most recently added copy of a member with the same name as +only the most recently added copy of a member with the same name as other members would end up in the working directory. This is because @option{--extract} extracts an archive in the order the members appeared in the archive; the most recently archived members will be extracted @@ -5740,7 +5741,7 @@ or @group $ @kbd{tar --directory sourcedir --create --file=- . \ | tar --directory targetdir --extract --file=-} -@end group +@end group @end smallexample @noindent @@ -5780,7 +5781,7 @@ sophisticated packages dedicated to that purpose. Some users are enthusiastic about @code{Amanda} (The Advanced Maryland Automatic Network Disk Archiver), a backup system developed by James da Silva @file{jds@@cs.umd.edu} and available on many Unix systems. -This is free software, and it is available from @uref{http://www.amanda.org}. +This is free software, and it is available from @uref{http://www.amanda.org}. @FIXME{ @@ -6022,7 +6023,7 @@ Use device numbers when preparing a list of changed files for an incremental dump. This is the default behavior. The purpose of this option is to undo the effect of the @option{--no-check-device} if it was given in @env{TAR_OPTIONS} environment variable -(@pxref{TAR_OPTIONS}). +(@pxref{TAR_OPTIONS}). @end table There is also another way to cope with changing device numbers. It is @@ -8692,7 +8693,7 @@ switch to @samp{posix}. a wide variety of compression programs, namely: @command{gzip}, @command{bzip2}, @command{lzip}, @command{lzma}, @command{lzop}, @command{xz} and traditional @command{compress}. The latter is -supported mostly for backward compatibility, and we recommend +supported mostly for backward compatibility, and we recommend against using it, because it is by far less effective than the other compression programs@footnote{It also had patent problems in the past.}. @@ -8702,7 +8703,7 @@ commands. The compression option is @option{-z} (@option{--gzip}) to create a @command{gzip} compressed archive, @option{-j} (@option{--bzip2}) to create a @command{bzip2} compressed archive, @option{--lzip} to create an @asis{lzip} compressed archive, -@option{-J} (@option{--xz}) to create an @asis{XZ} archive, +@option{-J} (@option{--xz}) to create an @asis{XZ} archive, @option{--lzma} to create an @asis{LZMA} compressed archive, @option{--lzop} to create an @asis{LSOP} archive, and @option{-Z} (@option{--compress}) to use @command{compress} program. @@ -8829,7 +8830,7 @@ compressor names along with each of these options. You can use any of these options on physical devices (tape drives, etc.) and remote files as well as on normal files; data to or from such devices or remote files is reblocked by another copy of the -@command{tar} program to enforce the specified (or default) record +@command{tar} program to enforce the specified (or default) record size. The default compression parameters are used. Most compression programs allow to override these by setting a program-specific environment variable. For example, when using @command{gzip} you can @@ -9019,7 +9020,7 @@ $ @kbd{tar --help | grep -- --bzip2} -j, --bzip2 filter the archive through lbzip2 @end group @end smallexample - + @noindent which means that running @command{tar --bzip2} will invoke @command{lbzip2}. @@ -12040,12 +12041,8 @@ Right margin of the text output. Used for wrapping. @appendix Free Software Needs Free Documentation @include freemanuals.texi -@node Copying This Manual -@appendix Copying This Manual - -@menu -* GNU Free Documentation License:: License for copying this manual -@end menu +@node GNU Free Documentation License +@appendix GNU Free Documentation License @include fdl.texi |