summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>1997-10-15 14:37:24 (GMT)
committerFred Drake <fdrake@acm.org>1997-10-15 14:37:24 (GMT)
commit9e63faaa66acaed188b84b073d80148f5b04413c (patch)
treea49edf2cfb1ced1cf3fb6c1acfe57bd1e3c3bbaf
parent654451dc54b2fa55f891bff72365d4e710245362 (diff)
downloadcpython-9e63faaa66acaed188b84b073d80148f5b04413c.zip
cpython-9e63faaa66acaed188b84b073d80148f5b04413c.tar.gz
cpython-9e63faaa66acaed188b84b073d80148f5b04413c.tar.bz2
Change Python-as-executable-script example to use "#! /usr/bin/env python"
since that's now the recommended way to do it. In pickling discussion, change "code{pickle}" (not missing leading "\") to "This" since the immediately preceeding sentence ended with the same text (with the proper "\"). Fixes a formatting bug and an odd glitch in the writing.
-rw-r--r--Doc/tut.tex10
-rw-r--r--Doc/tut/tut.tex10
2 files changed, 10 insertions, 10 deletions
diff --git a/Doc/tut.tex b/Doc/tut.tex
index 4291595..0afcb3f 100644
--- a/Doc/tut.tex
+++ b/Doc/tut.tex
@@ -295,12 +295,12 @@ On BSD'ish \UNIX{} systems, Python scripts can be made directly
executable, like shell scripts, by putting the line
\bcode\begin{verbatim}
-#! /usr/local/bin/python
+#! /usr/bin/env python
\end{verbatim}\ecode
%
-(assuming that's the name of the interpreter) at the beginning of the
-script and giving the file an executable mode. The {\tt \#!} must be
-the first two characters of the file.
+(assuming that the interpreter is on the user's PATH) at the beginning
+of the script and giving the file an executable mode. The {\tt \#!}
+must be the first two characters of the file.
\subsection{The Interactive Startup File}
@@ -2243,7 +2243,7 @@ complicated.
Rather than have users be constantly writing and debugging code to
save complicated data types, Python provides a standard module called
-\code{pickle}. code{pickle} is an amazing module that can take almost
+\code{pickle}. This is an amazing module that can take almost
any Python object (even some forms of Python code!), and convert it to
a string representation; this process is called \dfn{pickling}.
Reconstructing the object from the string representation is called
diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex
index 4291595..0afcb3f 100644
--- a/Doc/tut/tut.tex
+++ b/Doc/tut/tut.tex
@@ -295,12 +295,12 @@ On BSD'ish \UNIX{} systems, Python scripts can be made directly
executable, like shell scripts, by putting the line
\bcode\begin{verbatim}
-#! /usr/local/bin/python
+#! /usr/bin/env python
\end{verbatim}\ecode
%
-(assuming that's the name of the interpreter) at the beginning of the
-script and giving the file an executable mode. The {\tt \#!} must be
-the first two characters of the file.
+(assuming that the interpreter is on the user's PATH) at the beginning
+of the script and giving the file an executable mode. The {\tt \#!}
+must be the first two characters of the file.
\subsection{The Interactive Startup File}
@@ -2243,7 +2243,7 @@ complicated.
Rather than have users be constantly writing and debugging code to
save complicated data types, Python provides a standard module called
-\code{pickle}. code{pickle} is an amazing module that can take almost
+\code{pickle}. This is an amazing module that can take almost
any Python object (even some forms of Python code!), and convert it to
a string representation; this process is called \dfn{pickling}.
Reconstructing the object from the string representation is called