diff --git a/Doc/api/init.tex b/Doc/api/init.tex index 712ca5432ba..ba16b3c6dba 100644 --- a/Doc/api/init.tex +++ b/Doc/api/init.tex @@ -233,7 +233,7 @@ environment variables. The returned string consists of a series of directory names separated by a platform dependent delimiter character. The delimiter character is \character{:} on \UNIX, - \character{;} on DOS/Windows, and \character{\e n} (the \ASCII{} + \character{;} on Windows, and \character{\e n} (the \ASCII{} newline character) on Macintosh. The returned string points into static storage; the caller should not modify its value. The value is available to Python code as the list diff --git a/Doc/doc/doc.tex b/Doc/doc/doc.tex index b88350f9050..22f9d13dab4 100644 --- a/Doc/doc/doc.tex +++ b/Doc/doc/doc.tex @@ -927,8 +927,8 @@ This \UNIX\ is also followed by a space. \begin{macrodesc}{program}{\p{name}} The name of an executable program. This may differ from the file name for the executable for some platforms. In particular, - the \file{.exe} (or other) extension should be omitted for DOS - and Windows programs. + the \file{.exe} (or other) extension should be omitted for + Windows programs. \end{macrodesc} \begin{macrodesc}{programopt}{\p{option}} diff --git a/Doc/lib/libos.tex b/Doc/lib/libos.tex index 45354bc639f..17b7c67db04 100644 --- a/Doc/lib/libos.tex +++ b/Doc/lib/libos.tex @@ -64,7 +64,7 @@ function. \begin{datadesc}{name} The name of the operating system dependent module imported. The following names have currently been registered: \code{'posix'}, -\code{'nt'}, \code{'dos'}, \code{'mac'}, \code{'os2'}, \code{'ce'}, +\code{'nt'}, \code{'mac'}, \code{'os2'}, \code{'ce'}, \code{'java'}, \code{'riscos'}. \end{datadesc} @@ -1444,14 +1444,14 @@ parse or concatenate pathnames --- use \function{os.path.split()} and \begin{datadesc}{altsep} An alternative character used by the operating system to separate pathname components, or \code{None} if only one separator character exists. This is -set to \character{/} on DOS and Windows systems where \code{sep} is a +set to \character{/} on Windows systems where \code{sep} is a backslash. \end{datadesc} \begin{datadesc}{pathsep} The character conventionally used by the operating system to separate search patch components (as in \envvar{PATH}), such as \character{:} for -\POSIX{} or \character{;} for DOS and Windows. +\POSIX{} or \character{;} for Windows. \end{datadesc} \begin{datadesc}{defpath} @@ -1464,5 +1464,5 @@ key. The string used to separate (or, rather, terminate) lines on the current platform. This may be a single character, such as \code{'\e n'} for \POSIX{} or \code{'\e r'} for Mac OS, or multiple characters, -for example, \code{'\e r\e n'} for DOS and Windows. +for example, \code{'\e r\e n'} for Windows. \end{datadesc} diff --git a/Doc/lib/libundoc.tex b/Doc/lib/libundoc.tex index f854d7b6236..71496d2ffc4 100644 --- a/Doc/lib/libundoc.tex +++ b/Doc/lib/libundoc.tex @@ -46,9 +46,6 @@ and are not documented beyond this mention. There's little need to document these. \begin{description} -\item[\module{dospath}] ---- Implementation of \module{os.path} on MS-DOS. - \item[\module{ntpath}] --- Implementation on \module{os.path} on Win32, Win64, WinCE, and OS/2 platforms. diff --git a/Doc/lib/libuu.tex b/Doc/lib/libuu.tex index e938c4faebd..53354f23e3f 100644 --- a/Doc/lib/libuu.tex +++ b/Doc/lib/libuu.tex @@ -14,7 +14,7 @@ is also accepted, and the corresponding file will be opened for reading and writing; the pathname \code{'-'} is understood to mean the standard input or output. However, this interface is deprecated; it's better for the caller to open the file itself, and be sure that, when -required, the mode is \code{'rb'} or \code{'wb'} on Windows or DOS. +required, the mode is \code{'rb'} or \code{'wb'} on Windows. This code was contributed by Lance Ellinghouse, and modified by Jack Jansen. diff --git a/Doc/ref/ref2.tex b/Doc/ref/ref2.tex index b2ffa6f4802..6fba7f444ae 100644 --- a/Doc/ref/ref2.tex +++ b/Doc/ref/ref2.tex @@ -56,7 +56,7 @@ by following the explicit or implicit \emph{line joining} rules. A physical line ends in whatever the current platform's convention is for terminating lines. On \UNIX, this is the \ASCII{} LF (linefeed) -character. On DOS/Windows, it is the \ASCII{} sequence CR LF (return +character. On Windows, it is the \ASCII{} sequence CR LF (return followed by linefeed). On Macintosh, it is the \ASCII{} CR (return) character. diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex index 512dd6e64be..41d7e334788 100644 --- a/Doc/tut/tut.tex +++ b/Doc/tut/tut.tex @@ -176,7 +176,7 @@ your local Python guru or system administrator. (E.g., \file{/usr/local/python} is a popular alternative location.) Typing an end-of-file character (\kbd{Control-D} on \UNIX, -\kbd{Control-Z} on DOS or Windows) at the primary prompt causes the +\kbd{Control-Z} on Windows) at the primary prompt causes the interpreter to exit with a zero exit status. If that doesn't work, you can exit the interpreter by typing the following commands: \samp{import sys; sys.exit()}.