Merge pull request #211 from justinclift/master

Trivial typo fix

diff --git a/README b/README
index 5c087ef303223f7a3344073de50d9211c6d7fcdb..18de04e1ef3e89a1cd3cb13b02825a54f501da36 100644 (file)
--- 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 aafa6a60e18daed24257a2701edfd76476fc2771..31cfee57f63d87b5168f6116f512d077111f08b5 100644 (file)
--- 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`.
         '''