[Python-checkins] cpython (merge 3.5 -> default): Issue #25615: Merge glob doc from 3.5

[martin.panter]

https://hg.python.org/cpython/rev/a6bc96c2b8be
changeset:   99183:a6bc96c2b8be
parent:      99179:06820c2bd0b6
parent:      99182:f928dcb448a9
user:        Martin Panter <vadmium+py at gmail.com>
date:        Tue Nov 17 00:19:27 2015 +0000
summary:
  Issue #25615: Merge glob doc from 3.5

files:
  Doc/library/glob.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -12,13 +12,13 @@
 --------------
 
 The :mod:`glob` module finds all the pathnames matching a specified pattern
-according to the rules used by the Unix shell.  No tilde expansion is done, but
-``*``, ``?``, and character ranges expressed with ``[]`` will be correctly
-matched.  This is done by using the :func:`os.listdir` and
-:func:`fnmatch.fnmatch` functions in concert, and not by actually invoking a
-subshell.  Note that unlike :func:`fnmatch.fnmatch`, :mod:`glob` treats
-filenames beginning with a dot (``.``) as special cases.  (For tilde and shell
-variable expansion, use :func:`os.path.expanduser` and
+according to the rules used by the Unix shell, although results are returned in
+arbitrary order.  No tilde expansion is done, but ``*``, ``?``, and character
+ranges expressed with ``[]`` will be correctly matched.  This is done by using
+the :func:`os.listdir` and :func:`fnmatch.fnmatch` functions in concert, and
+not by actually invoking a subshell.  Note that unlike :func:`fnmatch.fnmatch`,
+:mod:`glob` treats filenames beginning with a dot (``.``) as special cases.
+(For tilde and shell variable expansion, use :func:`os.path.expanduser` and
 :func:`os.path.expandvars`.)
 
 For a literal match, wrap the meta-characters in brackets.

-- 
Repository URL: https://hg.python.org/cpython