Java2Dig
diff --git a/‎en/_sources/getting_started.txt‎
Lines changed: 67 additions & 34 deletions b/‎en/_sources/getting_started.txt‎
Lines changed: 67 additions & 34 deletions
diff --git a/‎en/_sources/simple_drawing.txt‎
Lines changed: 18 additions & 11 deletions b/‎en/_sources/simple_drawing.txt‎
Lines changed: 18 additions & 11 deletions
@@ -16,10 +16,11 @@ Python 3 is preferable, being the newest version out!
 
 .. note::
 
-   On Windows, you'll want to add :program:`Python` to your path, so it 
-   can be found by other programs. To do this, navigate to your 
-   installation directory (:file:`C:\\Python33\\`), open the :file:`Tools`, 
-   then :file:`Scripts` folders, and run the :file:`win_add2path.py` 
+   On Windows, you'll want to add :program:`Python` to your PATH, so it 
+   can be found by other programs. With Python 3.5 or later, there should be 
+   and option to do this in the installer. Otherwise, you can navigate to your 
+   installation directory (:file:`C:\\Python34\\`), open the :file:`Tools`, 
+   then :file:`Scripts` folder, and run the :file:`win_add2path.py` 
    file by double clicking on it.
 
 And a Code Editor
@@ -32,6 +33,10 @@ favourite knife. To start off with, you'll just want a basic, easy-to-use one
 that doesn't get in your way, but is still effective at writing python code. 
 Here are some suggestions for those:
 
+- `Atom`_: A new code editor available for Windows, Mac and Linux. It's 
+  an open-source project developed by GitHub and is very easy to add 
+  functionality for, with its packages system.
+
 - `Sublime Text`_: A great all around editor that's easy to use. It's Ctl+B 
   shortcut lets you run the python file you're working on straight away. Runs 
   on Windows, Mac and Linux.
@@ -48,6 +53,7 @@ Here are some suggestions for those:
 - `Komodo Edit`_: a sleak, free editor for Mac, Windows and Linux, based on the 
   more powerful Komodo IDE.
 
+.. _Atom: https://atom.io
 .. _Sublime Text: http://www.sublimetext.com/
 .. _Geany: http://www.geany.org/
 .. _TextMate: http://macromates.com/
@@ -59,25 +65,24 @@ If you'd like our recommendation, try out Sublime Text first.
 
 .. tip::
 
-   Wordpad, TextEdit, Notepad, and Word are **not** suitable text 
-   editors.
+   Wordpad, TextEdit, Notepad, and Word are **not** suitable code editors.
 
 What is Python, exactly?
 ========================
 
 Ok, so python is this thing called a **programming language**. It takes text that 
 you've written (usually referred to as **code**), turns it into instructions for 
 your computer, and runs those instructions. We'll be learning how to write code 
-to do cool and useful stuff. No longer will you be bound to use others' 
-programs to do things with your computer!
+to do cool and useful stuff. No longer will you be bound to use *others'* 
+programs to do things with your computer - you can make your own!
 
 Practically, Python is just another program on your computer. The first thing to 
 learn is how to use and interact with it. There are in fact many ways to do this; 
 the first one to learn is to interact with python's interpreter, 
 using your **operating system's** (OS) console.
 
 A **console** (or 'terminal', or 'command prompt') is a *textual* way to 
-interact with your OS, just as the 'desktop', in conjuction with your mouse, 
+interact with your OS, just as the 'desktop', in conjunction with your mouse, 
 is the *graphical* way to interact your system.
 
 Opening a console on Mac OS X
@@ -118,39 +123,39 @@ look like::
 
 Window's Command Prompt is not quite as powerful as its counterparts on Linux 
 and OS X, so you might like to start the Python Interpreter (see just below) 
-directly, or using the IDLE program that Python comes with. You can find these 
-in the Start menu.
+directly, or using the :program:`IDLE` program that Python comes with. 
+You can find these in the Start menu.
 
 Using Python
 ============
 
 The python program that you have installed will by default act as something 
-called an **interpreter**. An interpreter takes commands and runs them as you 
-enter them - very handy for trying things out.
+called an **interpreter**. An interpreter takes text commands and runs 
+them as you enter them - very handy for trying things out.
 
 Just type :program:`python` at your console, hit :kbd:`Enter`, and you should 
 enter Python's Interpreter.
 
 To find out which version of python you're running, 
-use ``python -V`` to tell you.
+instead type  ``python -V`` in your console to tell you.
 
 Interacting With Python
 -----------------------
 
 After Python opens, it will show you some contextual information similar to this::
 
-    Python 3.3.2 (default, May 21 2013, 15:40:45)
-    [GCC 4.8.0 20130502 (prerelease)] on linux
+    Python 3.5.0 (default, Sep 20 2015, 11:28:25) 
+    [GCC 5.2.0] on linux
     Type "help", "copyright", "credits" or "license" for more information.
-    >>>
+    >>> 
 
 .. note::
 
    The prompt **>>>** on the last line indicates that you are now in an
    interactive Python interpeter session, also called the "Python shell".
    **This is different from the normal terminal command prompt!**
 
-You can now enter some python code. Try::
+You can now enter some code for python to run. Try::
 
     print("Hello world")
 
@@ -167,22 +172,50 @@ An extremely useful command is ``help()``, which enters a help functionality
 to explore all the stuff python lets you do, right from the interpreter.
 Press :kbd:`q` to close the help window and return to the Python prompt.
 
-To leave the interactive shell, press :kbd:`Ctrl-Z` and then 
-:kbd:`Enter` on Windows, or :kbd:`Ctrl-D` on OS X or Linux. Alternatively, 
-you could also run the python command ``exit()``!
+To leave the interactive shell and go back to the console (the *system* shell), 
+press :kbd:`Ctrl-Z` and then :kbd:`Enter` on Windows, or :kbd:`Ctrl-D` on 
+OS X or Linux. Alternatively, you could also run the python command ``exit()``!
+
+
+Exercise
+--------
+
+Just above we demonstrated entering a command to figure out some math. Try 
+some math commands of your own! What operations does python know? Get it 
+to tell you what 239 and 588 added together, and then squared is.
+
+.. rst-class:: solution
+
+Solution
+--------
+
+Here are  some ways you might have got the answer:
+
+
+    >>> 239 + 588
+    827
+    >>> 827 * 827
+    683929
+
+    >>> (239 + 588) * (239 + 588)
+    683929
+
+    >>> (239 + 588) ** 2
+    683929
 
 Running Python files
 --------------------
 
 When you have a lot of python code to run, you will want to save it into 
-a file so, for instance, you can modify small parts of it (fix a bug) and 
-re-run it without having to repeatedly re-type the rest. 
-Instead you can save your code to a file and pass a file name to the 
-:program:`python` executable. It will execute that file instead of launching 
-the interactive interpreter.
-
-**Let's try that**.  Create a file :file:`hello.py` in your current directory
-with your favorite text editor and write the print command from above.  Now
+a file, so for instance, you can modify small parts of it (fix a bug) and 
+re-run the code without having to repeatedly re-type the rest. 
+Instead of typing commands in one-by-one you can save your code to a 
+file and pass the file name to the :program:`python` program. 
+It will execute that file's code instead of 
+launching its interactive interpreter.
+
+**Let's try that!**  Create a file :file:`hello.py` in your current directory
+with your favorite code editor and write the print command from above.  Now
 save that file. On Linux or OS X, you can also run ``touch hello.py`` to create
 an empty file to edit. To run this file with python, it's pretty easy:
 
@@ -193,7 +226,7 @@ an empty file to edit. To run this file with python, it's pretty easy:
 .. note::
 
    Make sure you are at your system command prompt, which will have ``$`` or 
-   ``>`` at the end, not at python's (which has ``>>>`` instead)!
+   ``>`` at the end, **not** at python's (which has ``>>>`` instead)!
 
 On Windows you should also be able to double-click the Python file to run it.
 
@@ -208,8 +241,8 @@ And now we are all set and can get started with turtle!
 
    Not getting "Hello world" but some crazy error about "can't open 
    file" or "No such file or directory?" Your command line might not be 
-   running in the directory you saved the file in. You can use 
-   the system command line to change your active directory with the 
+   running in the directory that you saved the file in. You can change 
+   the working directory of your current command line with the 
    :command:`cd` command, which stands for "change directory". On Windows, 
    you might want something like::
 
@@ -222,7 +255,7 @@ And now we are all set and can get started with turtle!
      $ cd Desktop/Python_Exercises
 
    This changes to the directory Python_Exercises under the Desktop folder 
-   (yours might be somewhere a bit different). If you don't know the location 
+   (yours might be somewhere different). If you don't know the location 
    of the directory where you saved the file, you can simply drag the 
    directory to the command line window.  If you don't know which 
    directory your shell is currently running in use :command:`pwd`, 
@@ -233,4 +266,4 @@ And now we are all set and can get started with turtle!
    When playing around with turtle, avoid naming your file :file:`turtle.py` 
    --- rather use more appropriate names such as :file:`square.py` or 
    :file:`rectangle.py`.  Otherwise, whenever you refer to ``turtle``, Python 
-   will pick up *your* file instead of the standard turtle.
+   will pick up *your* file instead of the standard Python turtle module.
@@ -4,10 +4,11 @@ Simple drawing with turtle
 Introduction
 ============
 
-Turtle is like a drawing board.
+"Turtle" is a python feature like a drawing board, which lets you command
+a turtle to draw all over it!
 
-It has functions like ``turtle.forward(...)`` and ``turtle.left(...)`` which
-can move the turtle around.
+You can use functions like ``turtle.forward(...)`` and ``turtle.left(...)``
+which can move the turtle around.
 
 Before you can use turtle, you have to import it. We recommend playing around
 with it in the interactive interpreter first, as there is an extra bit of work
@@ -69,7 +70,7 @@ So much cuter!
 If you put the commands into a file, you might have recognized that the turtle
 window vanishes after the turtle finished its movement.  (That is because
 Python exits when your turtle has finished moving.  Since the turtle window
-belongs to Python, it terminates as well.)  To prevent that, just put
+belongs to Python, it goes away as well.)  To prevent that, just put
 ``turtle.exitonclick()`` at the bottom of your file.  Now the window stays open
 until you click on it::
 
@@ -86,7 +87,8 @@ until you click on it::
    Python is a programming language where horizontal indenting of text is
    important. We'll learn all about this in the Functions chapter later on,
    but for now just keep in mind that stray spaces or tabs before any line
-   of Python code can cause an unexpected error.
+   of Python code can cause an unexpected error. You could even try adding one
+   to check how python will complain!
 
 Drawing a square
 ================
@@ -139,8 +141,8 @@ Bonus
 If you want to get creative, you can modify your shape with the
 ``turtle.width(...)`` and ``turtle.color(...)`` functions.  How do you
 use these functions?  Before you can use a function you need to know
-its *signature* (for example the number of parameters and what they
-mean.) To find this out you can type ``help(turtle.color)`` into the
+its *signature* (for example what to put between the parentheses and what those
+things mean.) To find this out you can type ``help(turtle.color)`` into the
 Python shell. If there is a lot of text, Python will put the help text
 into a *pager*, which lets you page up and down. Press the :kbd:`q`
 key to exit the pager.
@@ -157,22 +159,26 @@ key to exit the pager.
 
 Another way to find out about functions is to browse the `online documentation`_.
 
-.. _online documentation: http://docs.python.org/library/turtle
+.. _online documentation: http://docs.python.org/3/library/turtle
 
 
 .. caution::
 
     If you misdrew anything, you can tell turtle to erase its drawing board
-    with the ``turtle.reset()`` directive or undo the most recent step with
+    with the ``turtle.reset()`` directive, or undo the most recent step with
     ``turtle.undo()``.
 
 .. tip::
 
    As you might have read in the help, you can modify the color with
    :samp:`turtle.color({colorstring})`.  These include but are not limited to
-   "red," "green," and "violet."  See the `colours manual`_ for an extensive
+   "red," "green," and "violet."  See this `colours manual`_ for an extensive
    list.
 
+   If you want to set an RGB value, make sure to run ``turtle.colormode(255)``
+   first. Then for instance you could run ``turtle.color(215, 100, 170)`` to
+   set a pink colour.
+
    .. _colours manual: http://www.tcl.tk/man/tcl8.5/TkCmd/colors.htm
 
 Drawing a rectangle
@@ -219,7 +225,8 @@ experiment with the angles between the individual squares.
 
 .. image:: /images/tiltedsquares.png
 
-The picture shows three 20 degree turns. You could try 20, 30 and 40, for example.
+The picture shows three 20 degree turns. But you could try 20, 30 and 40 degree
+turns, for example.
 
 .. rst-class:: solution