X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=doc%2Fman1%2Fimagex-extract.1.in;h=74e9d755e88bbdc725ff05da6a84c7046539fe14;hp=7109b734560f2816d7041cfecb89218115259ad3;hb=aaa3f0eabacc3f364ee9f83069f5a063ac10d250;hpb=5aa1f3fd0bfdacf8ae14abf2f6be09f4229dc7b4

diff --git a/doc/man1/imagex-extract.1.in b/doc/man1/imagex-extract.1.in
index 7109b734..74e9d755 100644
--- a/doc/man1/imagex-extract.1.in
+++ b/doc/man1/imagex-extract.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "March 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "August 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-extract \- Extract files or directories from a WIM image
 .SH SYNOPSIS
@@ -56,11 +56,12 @@ case, the default behavior may be overridden through the
 By default, each path may contain the wildcard characters '?' and '*'.  The '?'
 character matches any non-path-separator character, whereas the '*' character
 matches zero or more non-path-separator characters.  Consequently, a single
-wildcard pattern may expand to multiple actual files or directories.  Use the
-\fB--no-wildcards\fR option to disable wildcard matching and search for each
+wildcard path, or "glob", may expand to multiple actual files or directories.
+Use the \fB--no-globs\fR option to disable wildcard matching and search for each
 path literally.
 .PP
-Each \fILISTFILE\fR must be a text file (UTF-8 or UTF-16LE encoded) that
+Each \fILISTFILE\fR must be a text file (UTF-8 or UTF-16LE encoded; plain ASCII
+is also fine) that
 contains a list of paths to extract, one per line.  Wildcard characters are
 allowed by default.  The following demonstrates an example listfile:
 .PP
@@ -122,18 +123,24 @@ See the documentation for this option in \fB@IMAGEX_PROGNAME@-apply\fR (1).
 \fB--include-invalid-names\fR
 See the documentation for this option in \fB@IMAGEX_PROGNAME@-apply\fR (1).
 .TP
-\fB--no-wildcards\fR
-Do not interpret wildcard characters in paths.  Each path will be searched for
-literally.
+\fB--no-globs\fR
+Do not recognize wildcard characters in paths.  Each path will be searched for
+literally.  In addition, if case insensitivity is enabled, do not allow a single
+path to match multiple files with the same case-insensitive name but different
+case-sensitive names.
+.IP
+\fB--no-wildcards\fR is also accepted as an alias for this option.
 .TP
 \fB--nullglob\fR
-If a wildcard pattern (a.k.a. a "glob") does not match any paths, ignore it and
-print a warning instead of failing with an error.  In other words, this option
-allows a wildcard pattern to successfully match zero files.  Note that this
-applies even if one of the paths does not contain wildcard characters.  Such a
-path is still treated as a "wildcard pattern", so with this option it may not
-match anything and therefore produce no error.  This option cannot be combined
-with \fB--no-wildcards\fR, as that would be meaningless.
+If a glob does not match any files, ignore it and print a warning instead of
+failing with an error.  In other words, this option allows a glob to
+successfully match zero files.
+.IP
+This option also affects paths that do not contain wildcard characters, since
+such paths are still considered globs unless \fB--no-globs\fR is enabled.  If
+case-insensitivity is enabled, such a glob could match multiple files with the
+same case-insensitive name but different case-sensitive names, whereas a
+non-glob path (with \fB--no-globs\fR) can match at most one file.
 .TP
 \fB--preserve-dir-structure\fR
 When extracting paths, preserve the archive directory structure instead of
@@ -158,10 +165,10 @@ point within the extraction location) are never done by \fB@IMAGEX_PROGNAME@
 extract\fR.  Use \fB@IMAGEX_PROGNAME@ apply\fR if you want this behavior.
 .PP
 Unlike \fB@IMAGEX_PROGNAME@ apply\fR, \fB@IMAGEX_PROGNAME@ extract\fR does not
-support extracting files directly to a NTFS volume using libntfs-3g.
+support extracting files directly to an NTFS volume using libntfs-3g.
 .PP
 wimlib v1.6.0 and later can extract files from version 3584 WIMs, which usually
-use packed, LZMS-compressed streams and may carry the \fI.esd\fR file extension
+contain LZMS-compressed solid blocks and may carry the \fI.esd\fR file extension
 rather than \fI.wim\fR.  However, \fI.esd\fR files downloaded directly by the
 Windows 8 web downloader have encrypted segments, and wimlib cannot extract such
 files until they are first decrypted.  Furthermore, such files are not designed