Merged revisions 65378-65379,65430 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65378 | georg.brandl | 2008-08-01 22:04:43 +0200 (Fri, 01 Aug 2008) | 4 lines

  Add the grammar to the reference manual, since the new docs don't
  have the feature of putting all the small EBNF snippets together
  into one big file.
........
  r65379 | georg.brandl | 2008-08-01 22:13:29 +0200 (Fri, 01 Aug 2008) | 2 lines

  This should really be a comment.
........
  r65430 | georg.brandl | 2008-08-03 11:21:18 +0200 (Sun, 03 Aug 2008) | 2 lines

  #3495: use current version.
........

diff --git a/Doc/library/site.rst b/Doc/library/site.rst
index a574878673efdc9a2b8560952bf62536a0479d19..50dfb383af8f7abf65368944919dd5c04fec39e3 100644 (file)
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -61,8 +61,8 @@ and :file:`bar.pth` contains::
 
 Then the following directories are added to ``sys.path``, in this order::
 
-   /usr/local/lib/python2.3/site-packages/bar
-   /usr/local/lib/python2.3/site-packages/foo
+   /usr/local/lib/python2.6/site-packages/bar
+   /usr/local/lib/python2.6/site-packages/foo
 
 Note that :file:`bletch` is omitted because it doesn't exist; the :file:`bar`
 directory precedes the :file:`foo` directory because :file:`bar.pth` comes

diff --git a/Doc/reference/grammar.rst b/Doc/reference/grammar.rst
new file mode 100644 (file)
index 0000000..83d0f85
--- /dev/null
+++ b/Doc/reference/grammar.rst
@@ -0,0 +1,7 @@
+Full Grammar specification
+==========================
+
+This is the full Python grammar, as it is read by the parser generator and used
+to parse Python source files:
+
+.. literalinclude:: ../../Grammar/Grammar

diff --git a/Doc/reference/index.rst b/Doc/reference/index.rst
index 18bf0537a927a43d78c73a5820216f23dc3ed445..adb5420f3d3910a2602a8c52a2f5f353f3d56749 100644 (file)
--- a/Doc/reference/index.rst
+++ b/Doc/reference/index.rst
@@ -27,4 +27,4 @@ interfaces available to C/C++ programmers in detail.
    simple_stmts.rst
    compound_stmts.rst
    toplevel_components.rst
-
+   grammar.rst

diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index e4c019215398674d4c188867208d47bffab3382c..4fe92ff088dd05973280e090e243276ad7ec6021 100644 (file)
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -727,10 +727,13 @@ raise a :exc:`SyntaxError`.
 the module search path is carried out differently.  The sequence of identifiers
 up to the last dot is used to find a "package"; the final identifier is then
 searched inside the package.  A package is generally a subdirectory of a
-directory on ``sys.path`` that has a file :file:`__init__.py`. [XXX Can't be
-bothered to spell this out right now; see the URL
-http://www.python.org/doc/essays/packages.html for more details, also about how
-the module search works from inside a package.]
+directory on ``sys.path`` that has a file :file:`__init__.py`.
+
+.. 
+   [XXX Can't be
+   bothered to spell this out right now; see the URL
+   http://www.python.org/doc/essays/packages.html for more details, also about how
+   the module search works from inside a package.]
 
 .. index:: builtin: __import__