diff options
| -rw-r--r-- | Doc/library/csv.rst | 4 | ||||
| -rw-r--r-- | Doc/library/json.rst | 2 | ||||
| -rw-r--r-- | Doc/library/os.rst | 10 | ||||
| -rw-r--r-- | Doc/library/string.rst | 1 | ||||
| -rw-r--r-- | Doc/library/webbrowser.rst | 4 | ||||
| -rw-r--r-- | Doc/whatsnew/2.6.rst | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst index 8848756..042334a 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 a07dd3b..8fa790e 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 f174550..fa179df 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 444858c..08b4103 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 fc0a004..b50bdbe 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 9cfa980..1ffad38 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 |