Minor updates and add bin to contents.

James William Pye · James William Pye · commit 8e5182087362 · 2009-03-12T13:08:48.000-07:00
diff --git a/postgresql/documentation/admin.py b/postgresql/documentation/admin.py
@@ -33,33 +33,31 @@
 
 By default, a Python installation on Windows cannot build extension modules.
 py-postgresql provides optimizations for various key points, but can be
-installed and used without them. When an installation is performed on 'win32'
-systems, extension modules are *not* built by default.
+installed and used without them. When a source installation is performed on
+'win32' systems, extension modules are *not* built by default.
 
 In order to enable the compilation of extensions, set the environment variable
-``PY_BUILD_EXTENSIONS`` to a non-empty string before executing the ``setup.py``
+``PY_BUILD_EXTENSIONS`` to '1' before executing the ``setup.py``
 script::
 
 	C:\-> setenv PY_BUILD_EXTENSIONS 1
-	C:\-> python3 setup.py install
+	C:\-> c:\python30\python setup.py install
 
-Or if mingw32 installed::
+Or more likely, compile using mingw32::
 
 	C:\-> setenv PY_BUILD_EXTENSIONS 1
-	C:\-> python3 setup.py build_ext --compiler=mingw32
-	C:\-> python3 setup.py install
+	C:\-> c:\python30\python setup.py build_ext --compiler=mingw32
+	C:\-> c:\python30\python setup.py install
 
 
 Environment
 -----------
 
 py-postgresql is not included with the PostgreSQL distribution, so it's
 impossible for certain defaults to be filled in in a way that's consistent with
-bundled applications.
-
- ``PGINSTALLATION``
-  The default installation to use and reference when collecting client
-  parameters or managing clusters.
+bundled applications. ``PGINSTALLATION`` can be used to direct the Python
+libraries at the appropriate PostgreSQL installation. This should be set to the
+absolute path of the ``pg_config`` executable.
 """
 
 __docformat__ = 'reStructuredText'
diff --git a/postgresql/documentation/gotchas.py b/postgresql/documentation/gotchas.py
@@ -2,9 +2,9 @@
 # copyright 2009, James William Pye
 # http://python.projects.postgresql.org
 ##
-r"""
-py-postgresql gotchas
-=====================
+r'''
+Gotchas
+=======
 
 It is recognized that decisions were made that may not always be ideal for a
 given user. In order to highlight those potential issues and hopefully bring
@@ -57,7 +57,7 @@
 
 The driver enables standard compliant strings. Stop using non-standard features.
 ;)
-"""
+'''
 
 __docformat__ = 'reStructuredText'
 if __name__ == '__main__':
diff --git a/postgresql/documentation/index.py b/postgresql/documentation/index.py
@@ -26,6 +26,9 @@
  Client Parameters
   `postgresql.documentation.clientparameters`
 
+ Console Scripts
+  `postgresql.documentation.bin`
+
  Gotchas
   `postgresql.documentation.gotchas`
 
diff --git a/sphinx-src/Makefile b/sphinx-src/Makefile
@@ -78,4 +78,5 @@ dump: mkdirs
 	env PYTHONPATH=.. python -m postgresql.documentation.admin dump >admin.txt
 	env PYTHONPATH=.. python -m postgresql.documentation.driver dump >driver.txt
 	env PYTHONPATH=.. python -m postgresql.documentation.clientparameters dump >clientparameters.txt
+	env PYTHONPATH=.. python -m postgresql.documentation.bin dump >bin.txt
 	env PYTHONPATH=.. python -m postgresql.documentation.gotchas dump >gotchas.txt
diff --git a/sphinx-src/index.rst b/sphinx-src/index.rst
@@ -14,6 +14,7 @@ accessing a PostgreSQL database.
    admin
    driver
    clientparameters
+   bin
    gotchas
 
 ------------------

-Original file line number
+Diff line change
    admin
    driver
    clientparameters
 +   bin
    gotchas
 ------------------