Fri Jun 26 09:31:04 2009 UTC ()
Remove superfluous Pp. Grammar improvement, typo fix, sort sections, fix Xr.�


(wiz)
diff -r1.1 -r1.2 src/usr.bin/unzip/unzip.1
cvs diff -r1.1 -r1.2 src/usr.bin/unzip/unzip.1 (expand / switch to unified diff)

--- src/usr.bin/unzip/unzip.1 2009/06/25 20:27:05 1.1
+++ src/usr.bin/unzip/unzip.1 2009/06/26 09:31:04 1.2
@@ -14,91 +14,89 @@ @@ -14,91 +14,89 @@
14.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 14.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
15.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 16.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
17.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 17.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
18.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 18.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 19.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 20.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 21.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 22.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 23.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24.\" SUCH DAMAGE. 24.\" SUCH DAMAGE.
25.\" 25.\"
26.\" $FreeBSD: revision 180125$ 26.\" $FreeBSD: revision 180125$
27.\" $NetBSD: unzip.1,v 1.1 2009/06/25 20:27:05 joerg Exp $ 27.\" $NetBSD: unzip.1,v 1.2 2009/06/26 09:31:04 wiz Exp $
28.\" 28.\"
29.Dd June 30, 2008 29.Dd June 30, 2008
30.Dt UNZIP 1 30.Dt UNZIP 1
31.Os 31.Os
32.Sh NAME 32.Sh NAME
33.Nm unzip 33.Nm unzip
34.Nd extract files from a ZIP archive 34.Nd extract files from a ZIP archive
35.Sh SYNOPSIS 35.Sh SYNOPSIS
36.Nm 36.Nm
37.Op Fl afjLlnoqtu 37.Op Fl afjLlnoqtu
38.Op Fl d Ar dir 38.Op Fl d Ar dir
39.Op Fl x Ar pattern 39.Op Fl x Ar pattern
40.Ar zipfile 40.Ar zipfile
41.Sh DESCRIPTION 41.Sh DESCRIPTION
42.\" ... 
43.Pp 
44The following options are available: 42The following options are available:
45.Bl -tag -width Fl 43.Bl -tag -width Fl
46.It Fl a 44.It Fl a
47When extracting a text file, convert DOS-style line endings to 45When extracting a text file, convert DOS-style line endings to
48Unix-style line endings. 46Unix-style line endings.
49.It Fl d Ar dir 47.It Fl d Ar dir
50Extract files into the specified directory rather than the current 48Extract files into the specified directory rather than the current
51directory. 49directory.
52.It Fl f 50.It Fl f
53Update existing. 51Update existing.
54Extract only files from the zipfile, if a file with the same name 52Extract only files from the zipfile if a file with the same name
55already exists on disk and is older than the former. 53already exists on disk and is older than the former.
56Otherwise, the file is silently skipped. 54Otherwise, the file is silently skipped.
57.It Fl j 55.It Fl j
58Ignore directories stored in the zipfile; instead, extract all files 56Ignore directories stored in the zipfile; instead, extract all files
59directly into the extraction directory. 57directly into the extraction directory.
60.It Fl L 58.It Fl L
61Convert the names of the extracted files and directories to lowercase. 59Convert the names of the extracted files and directories to lowercase.
62.It Fl l 60.It Fl l
63List, rather than extract, the contents of the zipfile. 61List, rather than extract, the contents of the zipfile.
64.It Fl n 62.It Fl n
65No overwrite. 63No overwrite.
66When extacting a file from the zipfile, if a file with the same name 64When extracting a file from the zipfile, if a file with the same name
67already exists on disk, the file is silently skipped. 65already exists on disk, the file is silently skipped.
68.It Fl o 66.It Fl o
69Overwrite. 67Overwrite.
70When extacting a file from the zipfile, if a file with the same name 68When extacting a file from the zipfile, if a file with the same name
71already exists on disk, the existing file is replaced with the file 69already exists on disk, the existing file is replaced with the file
72from the zipfile. 70from the zipfile.
73.It Fl q 71.It Fl q
74Quiet: print less information while extracting. 72Quiet: print less information while extracting.
75.It Fl t 73.It Fl t
76Test: do not extract anything, but verify the checksum of every file 74Test: do not extract anything, but verify the checksum of every file
77in the archive. 75in the archive.
78.It Fl u 76.It Fl u
79Update. 77Update.
80When extracting a file from the zipfile, if a file with the same name 78When extracting a file from the zipfile, if a file with the same name
81already exists on disk, the existing file is replaced with the file 79already exists on disk, the existing file is replaced with the file
82from the zipfile if and only if the latter is newer than the former. 80from the zipfile if and only if the latter is newer than the former.
83Otherwise, the file is silently skipped. 81Otherwise, the file is silently skipped.
84.It Fl x Ar pattern 82.It Fl x Ar pattern
85Exclude files matching the pattern 83Exclude files matching the pattern
86.Ar pattern . 84.Ar pattern .
87.El 85.El
88.Pp 86.Pp
89Note that only one of 87Note that only one of
90.Fl n , 88.Fl n ,
91.Fl o 89.Fl o ,
92and 90and
93.Fl u 91.Fl u
94may be specified. 92may be specified.
95.Sh ENVIRONMENT 93.Sh ENVIRONMENT
96If the 94If the
97.Ev UNZIP_DEBUG 95.Ev UNZIP_DEBUG
98environment variable is defined, the 96environment variable is defined, the
99.Fl q 97.Fl q
100command-line option has no effect, and additional debugging 98command-line option has no effect, and additional debugging
101information will be printed to 99information will be printed to
102.Va stderr . 100.Va stderr .
103.Sh COMPATIBILITY 101.Sh COMPATIBILITY
104The 102The
@@ -127,42 +125,42 @@ utility. @@ -127,42 +125,42 @@ utility.
127Instead, the 125Instead, the
128.Nm 126.Nm
129utility will assume that a file is a text file if no non-ASCII 127utility will assume that a file is a text file if no non-ASCII
130characters are present within the first block of data decompressed for 128characters are present within the first block of data decompressed for
131that file. 129that file.
132If non-ASCII characters appear in subsequent blocks of data, a warning 130If non-ASCII characters appear in subsequent blocks of data, a warning
133will be issued. 131will be issued.
134.Pp 132.Pp
135The 133The
136.Nm 134.Nm
137utility is only able to process ZIP archives handled by 135utility is only able to process ZIP archives handled by
138.Xr libarchive 3 . 136.Xr libarchive 3 .
139Depending on the installed version of 137Depending on the installed version of
140.Xr libarchive , 138.Xr libarchive 3 ,
141this may or may not include self-extracting archives. 139this may or may not include self-extracting archives.
142.Sh BUGS 
143The 
144.Nm 
145utility currently does not support asking the user whether to 
146overwrite or skip a file that already exists on disk. 
147To be on the safe side, it will fail if it encounters a file that 
148already exists and neither the 
149.Fl n 
150nor the 
151.Fl o 
152command line option was specified. 
153.Sh SEE ALSO 140.Sh SEE ALSO
154.Xr libarchive 3 141.Xr libarchive 3
155.Sh HISTORY 142.Sh HISTORY
156The 143The
157.Nm 144.Nm
158utility appeared in 145utility appeared in
159.Nx 6.0 . 146.Nx 6.0 .
160.Sh AUTHORS 147.Sh AUTHORS
161The 148The
162.Nm 149.Nm
163utility and this manual page were written by 150utility and this manual page were written by
164.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . 151.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
165It uses the 152It uses the
166.Xr archive 3 153.Xr archive 3
167library developed by 154library developed by
168.An Tim Kientzle Aq kientzle@FreeBSD.org . 155.An Tim Kientzle Aq kientzle@FreeBSD.org .
 156.Sh BUGS
 157The
 158.Nm
 159utility currently does not support asking the user whether to
 160overwrite or skip a file that already exists on disk.
 161To be on the safe side, it will fail if it encounters a file that
 162already exists and neither the
 163.Fl n
 164nor the
 165.Fl o
 166command line option was specified.