From: Mike Verdone <redacted>
Date: Wed, 12 Mar 2014 20:35:34 +0000 (+0100)
Subject: Merge pull request #211 from justinclift/master
X-Git-Tag: twitter-1.14.1~1
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/da754eff81e7c83d4b0a3ee43673a5e21ace3ecd?hp=e7ebaea801c3f55001a8fee95471af869ac26007

Merge pull request #211 from justinclift/master

Trivial typo fix
---

diff --git a/README b/README
index 5c087ef..18de04e 100644
--- a/README
+++ b/README
@@ -78,7 +78,7 @@ The Twitter API is documented at:
 
 Examples::
 
-```python 
+```python
 from twitter import *
 
 # see "Authentication" section below for tokens and keys
@@ -255,7 +255,7 @@ to do this. Please see the twitter.oauth_dance module to see how this
 is done. If you are making a command-line app, you can use the
 oauth_dance() function directly.
 
-Performing the "oauth dance" gets you an ouath token and oauth secret
+Performing the "oauth dance" gets you an oauth token and oauth secret
 that authenticate the user with Twitter. You should save these for
 later so that the user doesn't have to do the oauth dance again.
 
diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index aafa6a6..31cfee5 100644
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -369,7 +369,7 @@ class Action(object):
 
     def ask(self, subject='perform this action', careful=False):
         '''
-        Requests fromt he user using `raw_input` if `subject` should be
+        Requests from the user using `raw_input` if `subject` should be
         performed. When `careful`, the default answer is NO, otherwise YES.
         Returns the user answer in the form `True` or `False`.
         '''