diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-06-08 23:25:22 -0700 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-06-08 23:25:22 -0700 |
commit | 53fe915ed92353da4ca16405994452acf8782126 (patch) | |
tree | a9a317c990ad87f613fd1f56831505f95c948aab | |
parent | 1c76959daa2cfa16b78e01faa63beaac719db4bc (diff) | |
parent | 82bcc63ff0e18d5e8a42314006cd3828ce8402a8 (diff) | |
download | six-53fe915ed92353da4ca16405994452acf8782126.tar.gz |
Merged in scop/six/spelling (pull request #77)
Documentation spelling fixes
-rw-r--r-- | documentation/index.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/index.rst b/documentation/index.rst index e43ab43..26d57ca 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -361,7 +361,7 @@ Binary and text data >>>>>>>>>>>>>>>>>>>> Python 3 enforces the distinction between byte strings and text strings far more -rigoriously than Python 2 does; binary data cannot be automatically coerced to +rigorously than Python 2 does; binary data cannot be automatically coerced to or from text data. six provides several functions to assist in classifying string data in all Python versions. @@ -509,7 +509,7 @@ For the most part, :mod:`six.moves` aliases are the names of the modules in Python 3. When the new Python 3 name is a package, the components of the name are separated by underscores. For example, ``html.parser`` becomes ``html_parser``. In some cases where several modules have been combined, the -Python 2 name is retained. This is so the appropiate modules can be found when +Python 2 name is retained. This is so the appropriate modules can be found when running on Python 2. For example, ``BaseHTTPServer`` which is in ``http.server`` in Python 3 is aliased as ``BaseHTTPServer``. |