From: Georg Brandl <georg@python.org>
Date: Tue, 27 Oct 2009 14:03:07 +0000 (+0000)
Subject: Merged revisions 70590,70650,70704,70768-70769,70776,71008,71010-71011 via svnmerge... 
X-Git-Tag: v2.6.5rc1~471
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=785595448b75dff35383063542e77a42afbc6aa8;p=python

Merged revisions 70590,70650,70704,70768-70769,70776,71008,71010-71011 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70590 | skip.montanaro | 2009-03-25 01:52:11 +0100 (Mi, 25 Mär 2009) | 1 line

  clarify the type of data returned
........
  r70650 | benjamin.peterson | 2009-03-28 20:16:10 +0100 (Sa, 28 Mär 2009) | 1 line

  give os.symlink and os.link() better parameter names #5564
........
  r70704 | benjamin.peterson | 2009-03-30 04:49:32 +0200 (Mo, 30 Mär 2009) | 1 line

  there's actually three methods here #5600
........
  r70768 | andrew.kuchling | 2009-03-31 00:29:15 +0200 (Di, 31 Mär 2009) | 1 line

  Typo fixes
........
  r70769 | andrew.kuchling | 2009-03-31 00:29:53 +0200 (Di, 31 Mär 2009) | 1 line

  Remove comment
........
  r70776 | andrew.kuchling | 2009-03-31 01:08:24 +0200 (Di, 31 Mär 2009) | 1 line

  typo fix
........
  r71008 | andrew.kuchling | 2009-04-02 02:02:14 +0200 (Do, 02 Apr 2009) | 1 line

  Typo fix
........
  r71010 | benjamin.peterson | 2009-04-02 02:11:52 +0200 (Do, 02 Apr 2009) | 1 line

  fix markup
........
  r71011 | benjamin.peterson | 2009-04-02 02:12:47 +0200 (Do, 02 Apr 2009) | 1 line

  this should be :noindex:
........
---

diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index 8848756df8..042334ab99 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -72,8 +72,8 @@ The :mod:`csv` module defines the following functions:
    dialect.  For full details about the dialect and formatting parameters, see
    section :ref:`csv-fmt-params`.
 
-   All data read are returned as strings.  No automatic data type conversion is
-   performed.
+   Each row read from the csv file is returned as a list of strings.  No
+   automatic data type conversion is performed.
 
    A short usage example::
 
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index a07dd3bf08..8fa790e248 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -178,7 +178,7 @@ Basic Usage
    to a :class:`unicode` object and passed to :func:`loads`.
 
    *object_hook* is an optional function that will be called with the result of
-   any object literal decode (a :class:`dict`).  The return value of
+   any object literal decoded (a :class:`dict`).  The return value of
    *object_hook* will be used instead of the :class:`dict`.  This feature can be used
    to implement custom decoders (e.g. JSON-RPC class hinting).
 
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index f174550f63..fa179df5b4 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -915,9 +915,10 @@ Files and Directories
    .. versionadded:: 2.3
 
 
-.. function:: link(src, dst)
+.. function:: link(source, link_name)
 
-   Create a hard link pointing to *src* named *dst*. Availability: Unix.
+   Create a hard link pointing to *source* named *link_name*. Availability:
+   Unix.
 
 
 .. function:: listdir(path)
@@ -1238,9 +1239,10 @@ Files and Directories
       Added access to values as attributes of the returned object.
 
 
-.. function:: symlink(src, dst)
+.. function:: symlink(source, link_name)
 
-   Create a symbolic link pointing to *src* named *dst*. Availability: Unix.
+   Create a symbolic link pointing to *source* named *link_name*. Availability:
+   Unix.
 
 
 .. function:: tempnam([dir[, prefix]])
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 444858cf5b..08b4103ac9 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -243,6 +243,7 @@ does an index lookup using :func:`__getitem__`.
 Some simple format string examples::
 
    "First, thou shalt count to {0}" # References first positional argument
+   "Bring me a {}"                  # Implicitly references the first positional argument
    "My quest is {name}"             # References keyword argument 'name'
    "Weight in tons {0.weight}"      # 'weight' attribute of first positional arg
    "Units destroyed: {players[0]}"  # First element of keyword argument 'players'.
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
index fc0a004dae..b50bdbe816 100644
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -176,8 +176,8 @@ Here are some simple examples::
 Browser Controller Objects
 --------------------------
 
-Browser controllers provide these methods which parallel two of the module-level
-convenience functions:
+Browser controllers provide these methods which parallel three of the
+module-level convenience functions:
 
 
 .. method:: controller.open(url[, new[, autoraise=1]])
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 9cfa9802e6..1ffad387f8 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -84,8 +84,6 @@ for each change.
 
 .. ========================================================================
 .. Large, PEP-level features and changes should be described here.
-.. Should there be a new section here for 3k migration?
-.. Or perhaps a more general section describing module changes/deprecation?
 .. ========================================================================
 
 Python 3.0