Merge pull request #64 from MarysiaLowas/master

Clearing up some unclear bits and editorial changes

README.md

@@ -26,7 +26,7 @@ It will (more or less) look like this:
 
 ![Figure 0.1](images/application.png)
 
-Ok, [let's start at the beginning...](how_internet_works/README.md)
+OK, [let's start at the beginning...](how_internet_works/README.md)
 
 ## About and contributing
 

deploy/README.md

@@ -14,14 +14,14 @@ But first, Heroku needs us to install the `django-toolbelt` package. Go to your
 
     (myvenv) $ pip install dj-database-url gunicorn whitenoise
 
-After the installation is finished, run this command:
+After the installation is finished, go to the `mysite` directory and run this command:
 
     (myvenv) $ pip freeze > requirements.txt
 
 This will create a file called `requirements.txt` with a list of your installed packages (i.e. Python libraries that you are using, for example Django :)).
 
 Open this file and add the following line at the bottom:
-    
+
     pyscopg2==2.5.3
 
 This line is needed for your application to work on Heroku.
@@ -73,7 +73,7 @@ Another thing we need to do is modify our website's `settings.py` file. Open `my
     ALLOWED_HOSTS = ['*']
 
     STATIC_ROOT = 'staticfiles'
-    
+
     DEBUG = False
 
 At the end of the `mysite/settings.py`, copy and paste this:
@@ -90,7 +90,7 @@ Then save the file.
 ## mysite/wsgi.py
 
 Open the `mysite/wsgi.py` file and add these lines at the end:
-    
+
     from whitenoise.django import DjangoWhiteNoise
     application = DjangoWhiteNoise(application)
 

python_installation/README.md

@@ -4,7 +4,7 @@ Huh, it's exciting, right?! You'll write your first line of code in just a few m
 
 But first, let us tell you what Python is. Python is a very popular programming language that can be used for creating websites, games, scientific software, graphics and much, much more.
 
-Python was conceived in the late 1980s and its main goal is to be readable by human beings (not only machines!), which is why it looks much simpler than other programming languages. This makes it easy to learn, but don't worry, Python is also really powerful!
+Python originated in the late 1980s and its main goal is to be readable by human beings (not only machines!), which is why it looks much simpler than other programming languages. This makes it easy to learn, but don't worry, Python is also really powerful!
 
 # Python installation
 
@@ -18,7 +18,7 @@ You can download Python for Windows from the website https://www.python.org/down
 
 ### Linux
 
-It is very likely that you already have Python installed out of the box. To check if you have it installed (and which version it is), you type the following into your console:
+It is very likely that you already have Python installed out of the box. To check if you have it installed (and which version it is), open a console and type the following command:
 
     $ python3 --version
     Python 3.4.1

python_introduction/README.md

@@ -6,7 +6,7 @@ Let's write some code!
 
 ## Python prompt
 
-To start tinkering with Python, we need to open up a *prompt* on your computer. How you get there depends on the operating system but once it's open, everything is equal.
+To start playing with Python, we need to open up a *prompt* on your computer. How you get there depends on the operating system but once it's open, everything is equal.
 
 ### Windows
 
@@ -34,7 +34,9 @@ A window should pop up on your screen. This window is a prompt, waiting for comm
 
 After running the Python command, the prompt changed to `>>>`. For us it means that for now we may only use commands in the Python language. You don't have to type in `>>>` - Python will do that for you.
 
-Let's start with something really simple. For example, try typing some math, like `2 + 3` and hit Enter.
+If you want to exit the Python console at any point, just type `exit()` or hit `Ctrl + D`. You won't see `>>>` any longer.
+
+But now, we don't want to exit the Python console. We want to learn more about it. Let's start with something really simple. For example, try typing some math, like `2 + 3` and hit Enter.
 
     >>> 2 + 3
     5
@@ -83,7 +85,7 @@ Wonder why sometimes you call functions by adding `.` at the end of the string (
 
 ### Summary
 
-Ok, enough of strings. So far you've learned about:
+OK, enough of strings. So far you've learned about:
 
 - __the prompt__ - typing commands (code) into prompt give you Python answers
 - __numbers and strings__ - in Python it's math and text objects
@@ -114,7 +116,7 @@ It worked! We used `str` function inside of `len` function. `str` is converting
 
 ## Variables
 
-An important concept in programming is variables. A variable is nothing more than a name for something so you can use it later. Programmers use these variables to store data, make their code more readable and to not help them remember what things are.
+An important concept in programming is variables. A variable is nothing more than a name for something so you can use it later. Programmers use these variables to store data, make their code more readable and to help them remember what things are.
 
 Let's say we want to create a new variable called `name`: