[Python-checkins] r83466 - in python/branches/release27-maint: Doc/documenting/markup.rst Doc/install/index.rst Doc/library/argparse.rst Misc/developers.txt

[georg.brandl]

Author: georg.brandl
Date: Sun Aug  1 23:23:50 2010
New Revision: 83466

Log:
Merged revisions 83160-83161,83166,83168-83169,83171 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83160 | georg.brandl | 2010-07-26 10:51:42 +0200 (Mo, 26 Jul 2010) | 1 line
  
  #9381: fix markup.
........
  r83161 | georg.brandl | 2010-07-26 11:33:12 +0200 (Mo, 26 Jul 2010) | 1 line
  
  Add Brian Quinlan.
........
  r83166 | georg.brandl | 2010-07-26 17:11:49 +0200 (Mo, 26 Jul 2010) | 1 line
  
  Fix grammar.
........
  r83168 | georg.brandl | 2010-07-26 19:00:20 +0200 (Mo, 26 Jul 2010) | 1 line
  
  Fix indentation in example.
........
  r83169 | georg.brandl | 2010-07-26 19:09:32 +0200 (Mo, 26 Jul 2010) | 1 line
  
  Add Reid.
........
  r83171 | georg.brandl | 2010-07-26 23:12:13 +0200 (Mo, 26 Jul 2010) | 1 line
  
  Clarify.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/documenting/markup.rst
   python/branches/release27-maint/Doc/install/index.rst
   python/branches/release27-maint/Doc/library/argparse.rst
   python/branches/release27-maint/Misc/developers.txt

Modified: python/branches/release27-maint/Doc/documenting/markup.rst
==============================================================================
--- python/branches/release27-maint/Doc/documenting/markup.rst	(original)
+++ python/branches/release27-maint/Doc/documenting/markup.rst	Sun Aug  1 23:23:50 2010
@@ -200,8 +200,8 @@
 
 .. describe:: cmdoption
 
-   Describes a command line option or switch.  Option argument names should be
-   enclosed in angle brackets.  Example::
+   Describes a Python command line option or switch.  Option argument names
+   should be enclosed in angle brackets.  Example::
 
       .. cmdoption:: -m <module>
 

Modified: python/branches/release27-maint/Doc/install/index.rst
==============================================================================
--- python/branches/release27-maint/Doc/install/index.rst	(original)
+++ python/branches/release27-maint/Doc/install/index.rst	Sun Aug  1 23:23:50 2010
@@ -314,8 +314,8 @@
 stash of Python modules.  This scheme's name is derived from the idea of a
 "home" directory on Unix, since it's not unusual for a Unix user to make their
 home directory have a layout similar to :file:`/usr/` or :file:`/usr/local/`.
-This scheme can be used by anyone, regardless of the operating system their
-installing for.
+This scheme can be used by anyone, regardless of the operating system they
+are installing for.
 
 Installing a new module distribution is as simple as ::
 

Modified: python/branches/release27-maint/Doc/library/argparse.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/argparse.rst	(original)
+++ python/branches/release27-maint/Doc/library/argparse.rst	Sun Aug  1 23:23:50 2010
@@ -698,8 +698,8 @@
 
    >>> class FooAction(argparse.Action):
    ...     def __call__(self, parser, namespace, values, option_string=None):
-   ...     print '%r %r %r' % (namespace, values, option_string)
-   ...     setattr(namespace, self.dest, values)
+   ...         print '%r %r %r' % (namespace, values, option_string)
+   ...         setattr(namespace, self.dest, values)
    ...
    >>> parser = argparse.ArgumentParser()
    >>> parser.add_argument('--foo', action=FooAction)

Modified: python/branches/release27-maint/Misc/developers.txt
==============================================================================
--- python/branches/release27-maint/Misc/developers.txt	(original)
+++ python/branches/release27-maint/Misc/developers.txt	Sun Aug  1 23:23:50 2010
@@ -20,6 +20,13 @@
 Permissions History
 -------------------
 
+- Brian Quinlan was given commit access on Jul 26 2010 by GFB,
+  for work related to PEP 3148.
+
+- Reid Kleckner was given commit access on Jul 11 2010 by GFB,
+  for work on the py3k-jit branch, at suggestion of the Unladen
+  Swallow team.
+
 - Alexander Belopolsky was given commit access on May 25 2010
   by MvL at suggestion of Mark Dickinson.