summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKwpolska <kwpolska@gmail.com>2013-07-20 12:56:25 +0200
committerKwpolska <kwpolska@gmail.com>2013-07-20 12:56:25 +0200
commit587385bfe0d48da1f33635c23bcb792650e5ef1f (patch)
treea33bc46b2ed2704ec49f88b77102c09748ffa95a
parentca033b83fe0ba8ea5c9424345df85c61fed0f597 (diff)
downloadpython-requests-587385bfe0d48da1f33635c23bcb792650e5ef1f.tar.gz
Grammar fixes and such
Signed-off-by: Kwpolska <kwpolska@gmail.com>
-rw-r--r--README.rst2
-rw-r--r--docs/dev/todo.rst2
-rw-r--r--docs/user/advanced.rst2
-rw-r--r--docs/user/authentication.rst2
-rw-r--r--docs/user/quickstart.rst9
5 files changed, 9 insertions, 8 deletions
diff --git a/README.rst b/README.rst
index 48334cb7..50701321 100644
--- a/README.rst
+++ b/README.rst
@@ -84,7 +84,7 @@ Contribute
----------
#. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a Contributor Friendly tag for issues that should be ideal for people who are not very familiar with the codebase yet.
-#. Fork `the repository`_ on Github to start making your changes to the **master** branch (or branch off of it).
+#. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
#. Write a test which shows that the bug was fixed or that the feature works as expected.
#. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
diff --git a/docs/dev/todo.rst b/docs/dev/todo.rst
index dcc06f26..1f2216b5 100644
--- a/docs/dev/todo.rst
+++ b/docs/dev/todo.rst
@@ -6,7 +6,7 @@ Requests is under active development, and contributions are more than welcome!
#. Check for open issues or open a fresh issue to start a discussion around a bug.
There is a Contributor Friendly tag for issues that should be ideal for people who are not very
familiar with the codebase yet.
-#. Fork `the repository <https://github.com/kennethreitz/requests>`_ on Github and start making your
+#. Fork `the repository <https://github.com/kennethreitz/requests>`_ on GitHub and start making your
changes to a new branch.
#. Write a test which shows that the bug was fixed.
#. Send a pull request and bug the maintainer until it gets merged and published. :)
diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst
index 246313fc..de9beaa9 100644
--- a/docs/user/advanced.rst
+++ b/docs/user/advanced.rst
@@ -120,7 +120,7 @@ Requests can verify SSL certificates for HTTPS requests, just like a web browser
>>> requests.get('https://kennethreitz.com', verify=True)
requests.exceptions.SSLError: hostname 'kennethreitz.com' doesn't match either of '*.herokuapp.com', 'herokuapp.com'
-I don't have SSL setup on this domain, so it fails. Excellent. Github does though::
+I don't have SSL setup on this domain, so it fails. Excellent. GitHub does though::
>>> requests.get('https://github.com', verify=True)
<Response [200]>
diff --git a/docs/user/authentication.rst b/docs/user/authentication.rst
index 6c213eaa..4b29007c 100644
--- a/docs/user/authentication.rst
+++ b/docs/user/authentication.rst
@@ -87,7 +87,7 @@ authentication. Some of the best have been brought together under the
- NTLM_
If you want to use any of these forms of authentication, go straight to their
-Github page and follow the instructions.
+GitHub page and follow the instructions.
New Forms of Authentication
diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst
index 6e3e08d3..86e42d06 100644
--- a/docs/user/quickstart.rst
+++ b/docs/user/quickstart.rst
@@ -343,7 +343,7 @@ Requests will automatically perform location redirection while using the GET
and OPTIONS verbs.
GitHub redirects all HTTP requests to HTTPS. We can use the ``history`` method
-of the Response object to track redirection. Let's see what Github does::
+of the Response object to track redirection. Let's see what GitHub does::
>>> r = requests.get('http://github.com')
>>> r.url
@@ -353,8 +353,9 @@ of the Response object to track redirection. Let's see what Github does::
>>> r.history
[<Response [301]>]
-The :class:`Response.history` list contains a list of the
-:class:`Request` objects that were created in order to complete the request. The list is sorted from the oldest to the most recent request.
+The :class:`Response.history` list contains the :class:`Request` objects that
+were created in order to complete the request. The list is sorted from the
+oldest to the most recent request.
If you're using GET or OPTIONS, you can disable redirection handling with the
``allow_redirects`` parameter::
@@ -389,7 +390,7 @@ seconds with the ``timeout`` parameter::
.. admonition:: Note:
- ``timeout`` only effects the connection process itself, not the
+ ``timeout`` only affects the connection process itself, not the
downloading of the response body.