Merge pull request realpython#100 from imbilltucker/master

Kenneth Reitz · Kenneth Reitz · commit 574ab18175d1 · 2012-03-12T12:58:13.000-07:00
fix typo, add Python Koans, WingIDE
diff --git a/docs/dev/env.rst b/docs/dev/env.rst
@@ -82,6 +82,7 @@ PyCharm / IntelliJ IDEA
 
 `PyCharm <http://www.jetbrains.com/pycharm/>`_ is developed by JetBrains, also known for IntelliJ IDEA. Both share the same code base and most of PyCharm's features can be brought to IntelliJ with the free `Python Plug-In <http://plugins.intellij.net/plugin/?id=631/>`_.
 
+
 Eclipse
 -------
 
@@ -94,6 +95,7 @@ Komodo IDE
 `Komodo IDE <http://www.activestate.com/komodo-ide>`_ is developed by ActiveState and is a commerical IDE for Windows, Mac
 and Linux.
 
+
 Spyder
 ------
 
@@ -104,6 +106,11 @@ and `rope <http://rope.sourceforge.net/>`_.
 Spyder is open-source (free), offers code completion, syntax highlighting, class and function browser, and object inspection.
 
 
+WingIDE
+-------
+
+`WingIDE <http://wingware.com/>`_ a python specific IDE.   Runs for Linux, Windows, and Mac (as on X11 application, which frustrates some Mac users).  
+
 
 Interpreter Tools
 :::::::::::::::::
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
@@ -53,6 +53,24 @@ and Markov Analysis.
     `Think Python <http://greenteapress.com/thinkpython/html/index.html>`_
 
 
+Python Koans 
+~~~~~~~~~~~~
+
+Python Koans is a port of Edgecase's Ruby Koans.  It uses a test-driven approach, q.v. TEST DRIVEN DESIGN SECTION
+to provide an interactive
+tutorial teaching basic python concepts.  By fixing assertion statements that fail in a test script, this
+provides sequential steps to learning python.  
+
+For those used to languages and figuring out puzzles on their own, this can be a fun, attractive option.
+For those new to python and programming, having an additional resource or reference will be helpful.
+
+    `Python Koans <http://bitbucket.org/mcrute/python_koans>`_
+
+More information about test driven development can be found at these resources:
+
+    `Test Driven Development <http://en.wikipedia.org/wiki/Test-driven_development>`
+
+
 Advanced
 --------
 
diff --git a/docs/notes/styleguide.rst b/docs/notes/styleguide.rst
@@ -12,15 +12,15 @@ approriate.
 The Guide is written as :ref:`restructuredtext-ref`.
 
 .. note:: Parts of The Guide may not yet match this style guide. Feel free
-   to update those parts to by in sync with The Guide Style Guide
+   to update those parts to be in sync with The Guide Style Guide
 
 .. note:: On any page of the rendered HTML you can click "Show Source" to
    see how authors have styled the page.
 
 Relevancy
 ---------
 
-Stride to keep any contributions relevant to the :ref:`purpose of The Guide
+Strive to keep any contributions relevant to the :ref:`purpose of The Guide
 <about-ref>`.
 
 * Avoid including too much information on subjects that don't directly
