Merge pull request #220 from jwilk-forks/master

Fix typos

6 files changed, 14 insertions, 14 deletions

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 676a5d3..b79ee44 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -279,7 +279,7 @@ Urwid 1.0.1
 
  * Fix for a LineBox border __init__() parameters
 
- * Fix input input of UTF-8 in tour.py example by converting captions
+ * Fix input of UTF-8 in tour.py example by converting captions
    to unicode
 
  * Fix tutorial examples' use of TextCanvas and switch to using
@@ -307,7 +307,7 @@ Urwid 1.0.0
  * New experimental Terminal widget with xterm emulation and
    terminal.py example program (by aszlig)
 
- * Edit widget now supports a mask (for passwords), has a
+ * Edit widget now supports a mask (for passwords), has an
    insert_text_result() method for full-field validation and
    normalizes input text to Unicode or bytes based on the caption
    type used
@@ -566,7 +566,7 @@ Urwid 0.9.8
    without blocking.
 
  * The Columns, Pile and ListBox widgets now choose their first
-   selectable child widget as the focus widget by defaut.
+   selectable child widget as the focus widget by default.
 
  * New ListWalker base class for list walker classes.
 
@@ -593,7 +593,7 @@ Urwid 0.9.8
 
  * The raw_display module now uses an alternate buffer so that the
    original screen can be restored on exit. The old behaviour is
-   available by seting the alternate_buffer parameter of start() or
+   available by setting the alternate_buffer parameter of start() or
    run_wrapper() to False.
 
  * Many internal string processing functions have been rewritten in C to
@@ -611,7 +611,7 @@ Urwid 0.9.7.2
 
  * Fixed a UTF-8 input bug.
 
- * Added a clear() function to the the display modules to force the
+ * Added a clear() function to the display modules to force the
    screen to be repainted on the next draw_screen() call.
 
 
@@ -1048,7 +1048,7 @@ Urwid 0.8.6
 
    register_palette() and register_palette_entry() now accept "default"
    as foreground and/or background. If the terminal's default attributes
-   cannot be detected black on light gray will be used to accomodate
+   cannot be detected black on light gray will be used to accommodate
    terminals with always-black cursors.
 
    "default" is now the default for text with no attributes. This means
diff --git a/docs/manual/canvascache.rst b/docs/manual/canvascache.rst
index bb5f094..a2d0bd4 100644
--- a/docs/manual/canvascache.rst
+++ b/docs/manual/canvascache.rst
@@ -53,7 +53,7 @@ will remain in the cache, and others will be garbage collected.
 Future Work
 ===========
 
-A updating method that invalidates regions of the display without redrawing
+An updating method that invalidates regions of the display without redrawing
 parent widgets would be more efficient for the common case of a single change
 on the screen that does not affect the screen layout. Send an email to the
 mailing list if you're interested in helping with this or other display
diff --git a/docs/manual/overview.rst b/docs/manual/overview.rst
index 9360147..a9e953b 100644
--- a/docs/manual/overview.rst
+++ b/docs/manual/overview.rst
@@ -35,7 +35,7 @@ you can also write your own text layout classes.
 
 Urwid supports a range of common :ref:`display attributes
 <display-attributes>`, including 256-color foreground and background settings,
-bold, underline and standount settings for displaying text. Not all of these
+bold, underline and standout settings for displaying text. Not all of these
 are supported by all terminals, so Urwid helps you write applications that
 support different color modes depending on what the user's terminal supports
 and what they choose to enable.
diff --git a/docs/manual/widgets.rst b/docs/manual/widgets.rst
index 44fe7d3..9fabb97 100644
--- a/docs/manual/widgets.rst
+++ b/docs/manual/widgets.rst
@@ -150,7 +150,7 @@ return ``None``.
   container.focus_position
 
 is a read/write property that provides access to the position of the
-container's widget in focus.  This will often be a integer value but may be
+container's widget in focus.  This will often be an integer value but may be
 any object.
 :class:`Columns`, :class:`Pile`, :class:`GridFlow`, :class:`Overlay` and
 :class:`ListBox` with a :class:`SimpleListWalker` or :class:`SimpleFocusListWalker`
@@ -237,7 +237,7 @@ and proceeding along each child widget until reaching a leaf
 (non-container) widget.
 
 Note that the list does not contain the topmost container widget
-(i.e, on which this method is called), but does include the
+(i.e., on which this method is called), but does include the
 lowest leaf widget.
 
 ::
diff --git a/docs/tutorial/index.rst b/docs/tutorial/index.rst
index 1a84bb6..b4a6553 100644
--- a/docs/tutorial/index.rst
+++ b/docs/tutorial/index.rst
@@ -151,7 +151,7 @@ a widget before the correct one has been created.
   assigning to its :attr:`MainLoop.widget` property.
 
 * :ref:`decoration-widgets` like :class:`AttrMap` have an
-  ``original_widget`` property that we can assign to to change the widget they wrap.
+  ``original_widget`` property that we can assign to change the widget they wrap.
 
 * :class:`Divider` widgets are used to create blank lines,
   colored with :class:`AttrMap`.
@@ -317,9 +317,9 @@ return to previous menus by pressing *ESC*.
    :linenos:
 
 * *menu_button()* returns an :class:`AttrMap`-decorated :class:`Button`
-  and attaches a *callback* to the the its ``'click'`` signal.  This function is
+  and attaches a *callback* to its ``'click'`` signal.  This function is
   used for both sub-menus and final selection buttons.
-* *sub_menu()* creates a menu button and a closure that will open the the
+* *sub_menu()* creates a menu button and a closure that will open the
   menu when that button is clicked.  Notice that
   :ref:`text markup <text-markup>` is used to add ``'...'`` to the end of
   the *caption* passed to *menu_button()*.
diff --git a/urwid/container.py b/urwid/container.py
index 1ad2543..0483482 100755
--- a/urwid/container.py
+++ b/urwid/container.py
@@ -92,7 +92,7 @@ class WidgetContainerMixin(object):
         (non-container) widget.
 
         Note that the list does not contain the topmost container widget
-        (i.e, on which this method is called), but does include the
+        (i.e., on which this method is called), but does include the
         lowest leaf widget.
         """
         out = []