about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-12-21 00:03:17 -0500
committerMike Frysinger <vapier@gentoo.org>2013-01-13 13:24:28 -0500
commitaba5e59604da465adc6eb65b33a414dfc29904de (patch)
tree51132e1f5d2936663dcf819905ae36cac75ba5e1
parente557e9e51927c46fda6a3e312efed23f403d6ff0 (diff)
downloadglibc-aba5e59604da465adc6eb65b33a414dfc29904de.tar.gz
glibc-aba5e59604da465adc6eb65b33a414dfc29904de.tar.xz
glibc-aba5e59604da465adc6eb65b33a414dfc29904de.zip
manual: glob flags: fix sorting order
Reviewed-by: Carlos O'Donell <carlos@systemhalted.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--ChangeLog5
-rw-r--r--manual/pattern.texi14
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 55c36f2f7f..68b5d321f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-01-13  Mike Frysinger  <vapier@gentoo.org>
 
+	* manual/pattern.texi (Flags for Globbing): Move GLOB_NOSORT after
+	GLOB_NOESCAPE.
+
+2013-01-13  Mike Frysinger  <vapier@gentoo.org>
+
 	* manual/pattern.texi (Flags for Globbing): Highlight GNU extensions.
 
 2013-01-13  Mike Frysinger  <vapier@gentoo.org>
diff --git a/manual/pattern.texi b/manual/pattern.texi
index 60e9dc864b..1966f3f148 100644
--- a/manual/pattern.texi
+++ b/manual/pattern.texi
@@ -495,13 +495,6 @@ matches.)
 
 @comment glob.h
 @comment POSIX.2
-@item GLOB_NOSORT
-Don't sort the file names; return them in no particular order.
-(In practice, the order will depend on the order of the entries in
-the directory.)  The only reason @emph{not} to sort is to save time.
-
-@comment glob.h
-@comment POSIX.2
 @item GLOB_NOESCAPE
 Don't treat the @samp{\} character specially in patterns.  Normally,
 @samp{\} quotes the following character, turning off its special meaning
@@ -514,6 +507,13 @@ If you use @code{GLOB_NOESCAPE}, then @samp{\} is an ordinary character.
 @code{glob} does its work by calling the function @code{fnmatch}
 repeatedly.  It handles the flag @code{GLOB_NOESCAPE} by turning on the
 @code{FNM_NOESCAPE} flag in calls to @code{fnmatch}.
+
+@comment glob.h
+@comment POSIX.2
+@item GLOB_NOSORT
+Don't sort the file names; return them in no particular order.
+(In practice, the order will depend on the order of the entries in
+the directory.)  The only reason @emph{not} to sort is to save time.
 @end vtable
 
 @node More Flags for Globbing