Update

[chaz/tar] / doc / tar.texi

diff --git a/doc/tar.texi b/doc/tar.texi
index 1814bff43a1b7dae5c7cdd76e93fd01654994791..6621dc195c2156b2236fce8b869b6f90b330a56c 100644 (file)
--- a/doc/tar.texi
+++ b/doc/tar.texi
@@ -33,11 +33,10 @@ 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
 @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

-any later version published by the Free Software Foundation; with the
-Invariant Sections being "GNU General Public License", 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".
+any later version published by the Free Software Foundation; with no
+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".

 
 (a) The FSF's Back-Cover Text is: ``You are free to copy and modify
 this GNU Manual.  Buying copies from GNU Press supports the FSF in
 
 (a) The FSF's Back-Cover Text is: ``You are free to copy and modify
 this GNU Manual.  Buying copies from GNU Press supports the FSF in


@@ -2765,7 +2764,7 @@ would suppress security-related information.
 
 This keyword allows user control over the name that is written into the
 ustar header blocks for the extended headers.  The name is obtained
 
 This keyword allows user control over the name that is written into the
 ustar header blocks for the extended headers.  The name is obtained

-from @var{string} after substituting the following meta-characters:
+from @var{string} after making the following substitutions:

 
 @multitable @columnfractions .30 .70
 @headitem Meta-character @tab Replaced By
 
 @multitable @columnfractions .30 .70
 @headitem Meta-character @tab Replaced By


@@ -2790,8 +2789,8 @@ will use the following default value:
 @item globexthdr.name=@var{string}
 This keyword allows user control over the name that is written into
 the ustar header blocks for global extended header records.  The name
 @item globexthdr.name=@var{string}
 This keyword allows user control over the name that is written into
 the ustar header blocks for global extended header records.  The name

-shall will be obtained from the contents of @var{string}, after the
-following character substitutions have been made:
+is obtained from the contents of @var{string}, after making
+the following substitutions:

 
 @multitable @columnfractions .30 .70
 @headitem Meta-character @tab Replaced By
 
 @multitable @columnfractions .30 .70
 @headitem Meta-character @tab Replaced By


@@ -2802,7 +2801,7 @@ starting at 1.
 @item %% @tab A @samp{%} character.
 @end multitable
 
 @item %% @tab A @samp{%} character.
 @end multitable
 

-Any other @samp{%} characters in string produce undefined results.
+Any other @samp{%} characters in @var{string} produce undefined results.

 
 If no option @samp{globexthdr.name=string} is specified, @command{tar}
 will use the following default value:
 
 If no option @samp{globexthdr.name=string} is specified, @command{tar}
 will use the following default value:


@@ -4037,7 +4036,7 @@ files from @file{practice}:
 @smallexample
 $ @kbd{tar -cvf bluesrock.tar blues rock}
 blues
 @smallexample
 $ @kbd{tar -cvf bluesrock.tar blues rock}
 blues

-classical
+rock

 $ @kbd{tar -cvf folkjazz.tar folk jazz}
 folk
 jazz
 $ @kbd{tar -cvf folkjazz.tar folk jazz}
 folk
 jazz


@@ -4051,7 +4050,7 @@ contain what they are supposed to:
 $ @kbd{tar -tvf bluesrock.tar}
 -rw-r--r-- melissa user    105 1997-01-21 19:42 blues
 -rw-r--r-- melissa user     33 1997-01-20 15:34 rock
 $ @kbd{tar -tvf bluesrock.tar}
 -rw-r--r-- melissa user    105 1997-01-21 19:42 blues
 -rw-r--r-- melissa user     33 1997-01-20 15:34 rock

-$ @kbd{tar -tvf folkjazz.tar}
+$ @kbd{tar -tvf jazzfolk.tar}

 -rw-r--r-- melissa user     20 1996-09-23 16:44 folk
 -rw-r--r-- melissa user     65 1997-01-30 14:15 jazz
 @end smallexample
 -rw-r--r-- melissa user     20 1996-09-23 16:44 folk
 -rw-r--r-- melissa user     65 1997-01-30 14:15 jazz
 @end smallexample


@@ -4063,15 +4062,15 @@ $ @kbd{cd ..}
 $ @kbd{tar --concatenate --file=bluesrock.tar jazzfolk.tar}
 @end smallexample
 
 $ @kbd{tar --concatenate --file=bluesrock.tar jazzfolk.tar}
 @end smallexample
 

-If you now list the contents of the @file{bluesclass.tar}, you will see
+If you now list the contents of the @file{bluesrock.tar}, you will see

 that now it also contains the archive members of @file{jazzfolk.tar}:
 
 @smallexample
 $ @kbd{tar --list --file=bluesrock.tar}
 blues
 rock
 that now it also contains the archive members of @file{jazzfolk.tar}:
 
 @smallexample
 $ @kbd{tar --list --file=bluesrock.tar}
 blues
 rock

-jazz

 folk
 folk

+jazz

 @end smallexample
 
 When you use @option{--concatenate}, the source and target archives must
 @end smallexample
 
 When you use @option{--concatenate}, the source and target archives must


@@ -4649,8 +4648,8 @@ You can instruct @command{tar} to send the contents of each extracted
 file to the standard input of an external program:
 
 @table @option
 file to the standard input of an external program:
 
 @table @option

-@opindex to-program
-@item --to-program=@var{command}
+@opindex to-command
+@item --to-command=@var{command}

 Extract files and pipe their contents to the standard input of
 @var{command}. When this option is used, instead of creating the
 files specified, @command{tar} invokes @var{command} and pipes the
 Extract files and pipe their contents to the standard input of
 @var{command}. When this option is used, instead of creating the
 files specified, @command{tar} invokes @var{command} and pipes the