summaryrefslogtreecommitdiffstats
path: root/Doc/faq
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-12-19 23:26:38 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-12-19 23:26:38 (GMT)
commit0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5 (patch)
treee10c3b719b557d04b2e66354c2e64f564f0a934e /Doc/faq
parent480e8e38a077280313ea66476350a06ee5d7ca5d (diff)
downloadcpython-0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5.zip
cpython-0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5.tar.gz
cpython-0639d5aeb61d6b7b0e1e1cbbdd7dd89a420a47f5.tar.bz2
Merged revisions 76904 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76904 | ezio.melotti | 2009-12-20 00:41:49 +0200 (Sun, 20 Dec 2009) | 1 line #7388: "python".capitalize() in the Doc ........
Diffstat (limited to 'Doc/faq')
-rw-r--r--Doc/faq/extending.rst2
-rw-r--r--Doc/faq/library.rst2
-rw-r--r--Doc/faq/windows.rst2
3 files changed, 3 insertions, 3 deletions
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index 7f3fda7..9091193 100644
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -434,7 +434,7 @@ How do I find undefined g++ symbols __builtin_new or __pure_virtual?
--------------------------------------------------------------------
To dynamically load g++ extension modules, you must recompile Python, relink it
-using g++ (change LINKCC in the python Modules Makefile), and link your
+using g++ (change LINKCC in the Python Modules Makefile), and link your
extension module using g++ (e.g., ``g++ -shared -o mymodule.so mymodule.o``).
diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst
index b5c469e..a7d7052 100644
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -61,7 +61,7 @@ interpreter is installed on your platform.
If you would like the script to be independent of where the Python interpreter
lives, you can use the "env" program. Almost all Unix variants support the
-following, assuming the python interpreter is in a directory on the user's
+following, assuming the Python interpreter is in a directory on the user's
$PATH::
#!/usr/bin/env python
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index a5ede41..2a19c98 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -208,7 +208,7 @@ The important things to remember are:
for developing code by experiment.
-How do I make python scripts executable?
+How do I make Python scripts executable?
----------------------------------------
On Windows 2000, the standard Python installer already associates the .py