summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-04-04 12:29:37 (GMT)
committerGuido van Rossum <guido@python.org>1995-04-04 12:29:37 (GMT)
commit02ee80d408727c5b9ddebdbdedbfbb03a17f24ea (patch)
tree38c22002616aae2deebeaf4a968790d8f4a6f671 /Doc
parent25f6fcc55049e6e3e4e5073817d7b8243186c812 (diff)
downloadcpython-02ee80d408727c5b9ddebdbdedbfbb03a17f24ea.zip
cpython-02ee80d408727c5b9ddebdbdedbfbb03a17f24ea.tar.gz
cpython-02ee80d408727c5b9ddebdbdedbfbb03a17f24ea.tar.bz2
minor things
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/libintro.tex10
-rw-r--r--Doc/lib/libobjs.tex5
-rw-r--r--Doc/lib/libselect.tex4
-rw-r--r--Doc/libintro.tex10
-rw-r--r--Doc/libobjs.tex5
-rw-r--r--Doc/libselect.tex4
6 files changed, 20 insertions, 18 deletions
diff --git a/Doc/lib/libintro.tex b/Doc/lib/libintro.tex
index 4435c1a..70d7478 100644
--- a/Doc/lib/libintro.tex
+++ b/Doc/lib/libintro.tex
@@ -3,10 +3,10 @@
The ``Python library'' contains several different kinds of components.
It contains data types that would normally be considered part of the
-``core'' of the language, such as numbers and lists. For these types,
-the core language defines the form of literals and places some
-constraints on their semantics, but it does not fully describe the
-semantics. (On the other hand, the core of the language defines
+``core'' of a language, such as numbers and lists. For these types,
+the Python language core defines the form of literals and places some
+constraints on their semantics, but does not fully define the
+semantics. (On the other hand, the language core does define
syntactic properties like the spelling and priorities of operators.)
The library also contains built-in functions and exceptions ---
@@ -39,7 +39,7 @@ skip to the next chapter when you get bored, you will get a reasonable
overview of the available modules and application areas that are
supported by the Python library. Of course, you don't \emph{have} to
read it like a novel --- you can also browse the table of contents (in
-front of the manual) or look for a specific function, module or term
+front of the manual), or look for a specific function, module or term
in the index (in the back). And finally, if you enjoy learning about
random subjects, you choose a random page number (see module
\code{rand}) and read a section or two.
diff --git a/Doc/lib/libobjs.tex b/Doc/lib/libobjs.tex
index 9006b8a..b4dd409 100644
--- a/Doc/lib/libobjs.tex
+++ b/Doc/lib/libobjs.tex
@@ -3,9 +3,10 @@
\nodename{Built-in Objects}
Names for built-in exceptions and functions are found in a separate
-symbol table. This table is searched last, so local and global
+symbol table. This table is searched last when the interpreter looks
+up the meaning of a name, so local and global
user-defined names can override built-in names. Built-in types are
-described together here for easy reference. %
+described together here for easy reference.%
\footnote{Most descriptions sorely lack explanations of the exceptions
that may be raised --- this will be fixed in a future version of
this manual.}
diff --git a/Doc/lib/libselect.tex b/Doc/lib/libselect.tex
index 421d1aa..0b50101 100644
--- a/Doc/lib/libselect.tex
+++ b/Doc/lib/libselect.tex
@@ -12,14 +12,14 @@ corresponding string, as would be printed by the C function
\code{perror()}.
\end{excdesc}
-\begin{funcdesc}{select}{iwtd\, owtd\, ewtd\, timeout}
+\begin{funcdesc}{select}{iwtd\, owtd\, ewtd\optional{\, timeout}}
This is a straightforward interface to the \UNIX{} \code{select()}
system call. The first three arguments are lists of `waitable
objects': either integers representing \UNIX{} file descriptors or
objects with a parameterless method named \code{fileno()} returning
such an integer. The three lists of waitable objects are for input,
output and `exceptional conditions', respectively. Empty lists are
-allowed. The optional last argument is a time-out specified as a
+allowed. The optional \var{timeout} argument specifies a time-out as a
floating point number in seconds. When the \var{timeout} argument
is omitted the function blocks until at least one file descriptor is
ready. A time-out value of zero specifies a poll and never blocks.
diff --git a/Doc/libintro.tex b/Doc/libintro.tex
index 4435c1a..70d7478 100644
--- a/Doc/libintro.tex
+++ b/Doc/libintro.tex
@@ -3,10 +3,10 @@
The ``Python library'' contains several different kinds of components.
It contains data types that would normally be considered part of the
-``core'' of the language, such as numbers and lists. For these types,
-the core language defines the form of literals and places some
-constraints on their semantics, but it does not fully describe the
-semantics. (On the other hand, the core of the language defines
+``core'' of a language, such as numbers and lists. For these types,
+the Python language core defines the form of literals and places some
+constraints on their semantics, but does not fully define the
+semantics. (On the other hand, the language core does define
syntactic properties like the spelling and priorities of operators.)
The library also contains built-in functions and exceptions ---
@@ -39,7 +39,7 @@ skip to the next chapter when you get bored, you will get a reasonable
overview of the available modules and application areas that are
supported by the Python library. Of course, you don't \emph{have} to
read it like a novel --- you can also browse the table of contents (in
-front of the manual) or look for a specific function, module or term
+front of the manual), or look for a specific function, module or term
in the index (in the back). And finally, if you enjoy learning about
random subjects, you choose a random page number (see module
\code{rand}) and read a section or two.
diff --git a/Doc/libobjs.tex b/Doc/libobjs.tex
index 9006b8a..b4dd409 100644
--- a/Doc/libobjs.tex
+++ b/Doc/libobjs.tex
@@ -3,9 +3,10 @@
\nodename{Built-in Objects}
Names for built-in exceptions and functions are found in a separate
-symbol table. This table is searched last, so local and global
+symbol table. This table is searched last when the interpreter looks
+up the meaning of a name, so local and global
user-defined names can override built-in names. Built-in types are
-described together here for easy reference. %
+described together here for easy reference.%
\footnote{Most descriptions sorely lack explanations of the exceptions
that may be raised --- this will be fixed in a future version of
this manual.}
diff --git a/Doc/libselect.tex b/Doc/libselect.tex
index 421d1aa..0b50101 100644
--- a/Doc/libselect.tex
+++ b/Doc/libselect.tex
@@ -12,14 +12,14 @@ corresponding string, as would be printed by the C function
\code{perror()}.
\end{excdesc}
-\begin{funcdesc}{select}{iwtd\, owtd\, ewtd\, timeout}
+\begin{funcdesc}{select}{iwtd\, owtd\, ewtd\optional{\, timeout}}
This is a straightforward interface to the \UNIX{} \code{select()}
system call. The first three arguments are lists of `waitable
objects': either integers representing \UNIX{} file descriptors or
objects with a parameterless method named \code{fileno()} returning
such an integer. The three lists of waitable objects are for input,
output and `exceptional conditions', respectively. Empty lists are
-allowed. The optional last argument is a time-out specified as a
+allowed. The optional \var{timeout} argument specifies a time-out as a
floating point number in seconds. When the \var{timeout} argument
is omitted the function blocks until at least one file descriptor is
ready. A time-out value of zero specifies a poll and never blocks.