summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/lib/libfnmatch.tex30
-rw-r--r--Doc/libfnmatch.tex30
2 files changed, 26 insertions, 34 deletions
diff --git a/Doc/lib/libfnmatch.tex b/Doc/lib/libfnmatch.tex
index 824ee44..ecb77d3 100644
--- a/Doc/lib/libfnmatch.tex
+++ b/Doc/lib/libfnmatch.tex
@@ -2,10 +2,10 @@
\label{module-fnmatch}
\stmodindex{fnmatch}
-This module provides support for Unix shell-style wildcards, which are
-\emph{not} the same as regular expressions (which are
-documented in the \code{re} module). The special characters used
-in shell-style wildcards are:
+This module provides support for \UNIX{} shell-style wildcards, which
+are \emph{not} the same as regular expressions (which are documented
+in the \code{re}\refstmodindex{re} module). The special characters
+used in shell-style wildcards are:
\begin{itemize}
\item[\code{*}] matches everything
\item[\code{?}] matches any single character
@@ -13,13 +13,14 @@ in shell-style wildcards are:
\item[\code{[!}\var{seq}\code{]}] matches any character not in \var{seq}
\end{itemize}
-Note that the filename separator (\code{'/'} on Unix) is \emph{not}
-special to this module. See module \code{glob} for pathname expansion
-(\code{glob} uses \code{fnmatch} to match filename segments).
+Note that the filename separator (\code{'/'} on \UNIX{}) is \emph{not}
+special to this module. See module \code{glob}\refstmodindex{glob}
+for pathname expansion (\code{glob} uses \code{fnmatch()} to
+match filename segments).
\renewcommand{\indexsubitem}{(in module fnmatch)}
-\begin{funcdesc}{fnmatch}{filename\, pattern}
+\begin{funcdesc}{fnmatch}{filename, pattern}
Test whether the \var{filename} string matches the \var{pattern}
string, returning true or false. If the operating system is
case-insensitive, then both parameters will be normalized to all
@@ -28,17 +29,12 @@ require a case-sensitive comparision regardless of whether that's
standard for your operating system, use \code{fnmatchcase()} instead.
\end{funcdesc}
-\begin{funcdesc}{fnmatchcase}{}
+\begin{funcdesc}{fnmatchcase}{filename, pattern}
Test whether \var{filename} matches \var{pattern}, returning true or
false; the comparision is case-sensitive.
\end{funcdesc}
-\begin{funcdesc}{translate}{pattern}
-Translate a shell pattern into a corresponding regular expression,
-returning a string describing the pattern. It does not compile the
-expression. \strong{Version note:} in Python 1.4 and earlier, this
-function translated to \code{regex} (Emacs style) regular expressions;
-in 1.5 and later, it translates to \code{re} (Perl style) regular
-expressions.
-\end{funcdesc}
+\begin{seealso}
+\seemodule{glob}{Shell-style path expansion}
+\end{seealso}
diff --git a/Doc/libfnmatch.tex b/Doc/libfnmatch.tex
index 824ee44..ecb77d3 100644
--- a/Doc/libfnmatch.tex
+++ b/Doc/libfnmatch.tex
@@ -2,10 +2,10 @@
\label{module-fnmatch}
\stmodindex{fnmatch}
-This module provides support for Unix shell-style wildcards, which are
-\emph{not} the same as regular expressions (which are
-documented in the \code{re} module). The special characters used
-in shell-style wildcards are:
+This module provides support for \UNIX{} shell-style wildcards, which
+are \emph{not} the same as regular expressions (which are documented
+in the \code{re}\refstmodindex{re} module). The special characters
+used in shell-style wildcards are:
\begin{itemize}
\item[\code{*}] matches everything
\item[\code{?}] matches any single character
@@ -13,13 +13,14 @@ in shell-style wildcards are:
\item[\code{[!}\var{seq}\code{]}] matches any character not in \var{seq}
\end{itemize}
-Note that the filename separator (\code{'/'} on Unix) is \emph{not}
-special to this module. See module \code{glob} for pathname expansion
-(\code{glob} uses \code{fnmatch} to match filename segments).
+Note that the filename separator (\code{'/'} on \UNIX{}) is \emph{not}
+special to this module. See module \code{glob}\refstmodindex{glob}
+for pathname expansion (\code{glob} uses \code{fnmatch()} to
+match filename segments).
\renewcommand{\indexsubitem}{(in module fnmatch)}
-\begin{funcdesc}{fnmatch}{filename\, pattern}
+\begin{funcdesc}{fnmatch}{filename, pattern}
Test whether the \var{filename} string matches the \var{pattern}
string, returning true or false. If the operating system is
case-insensitive, then both parameters will be normalized to all
@@ -28,17 +29,12 @@ require a case-sensitive comparision regardless of whether that's
standard for your operating system, use \code{fnmatchcase()} instead.
\end{funcdesc}
-\begin{funcdesc}{fnmatchcase}{}
+\begin{funcdesc}{fnmatchcase}{filename, pattern}
Test whether \var{filename} matches \var{pattern}, returning true or
false; the comparision is case-sensitive.
\end{funcdesc}
-\begin{funcdesc}{translate}{pattern}
-Translate a shell pattern into a corresponding regular expression,
-returning a string describing the pattern. It does not compile the
-expression. \strong{Version note:} in Python 1.4 and earlier, this
-function translated to \code{regex} (Emacs style) regular expressions;
-in 1.5 and later, it translates to \code{re} (Perl style) regular
-expressions.
-\end{funcdesc}
+\begin{seealso}
+\seemodule{glob}{Shell-style path expansion}
+\end{seealso}