Merge branch 'master' of github.com:DjangoGirls/tutorial

olasitarska · olasitarska · commit 1b0b2c42178d · 2014-07-08T20:28:54.000+02:00
diff --git a/how_internet_works/README.md b/how_internet_works/README.md
@@ -5,42 +5,44 @@
 We bet you use the Internet every day. But do you actually know what happens when you type an address like http://djangogirls.org in your browser and press 'Enter'?
 
 First thing you need to understand is that a website is just a bunch of files saved on a computer disk. Just like your movies, music or pictures.
-There is one part that is unique for websites: they include computer code called HTML.
+However, there is one part that is unique for websites: they include computer code called HTML.
 
 If you're not familiar with programming, it can be hard to grasp at first, but your web browsers (like Chrome, Safari, Firefox, etc) love HTML. Web browsers are designed to understand this code,
 follow the instructions and present all these files that your website is made of exactly the way you want them to be presented.
 
-As every file, we need to store files somewhere on a computer disk. For the Internet, we use special, powerful computers called servers. They don't have
+As every file, we need to store them somewhere on a computer disk. For the Internet, we use special, powerful computers called *servers*. They don't have
 a screen, mouse or a keyboard, because their main purpose is to store data and serve it. That's why they're all called *servers* -- because they *serve* you data.
 
-The Internet looks like this:
+Ok, but you want to know how the Internet looks like, right?
+
+We made a picture for you! It looks like this:
 
 ![Figure 1.1](images/internet_1.png)
 
-Looks like a mess, right? But in fact it is a network of connected machines (servers). Hundreds of thousands of machines. Many, many kilometers of cables around the world! You can see the Submarine Cable Map website (http://submarinecablemap.com/) to see how complicated the net is. Here is a screenshot from the website:
+Looks like a mess, right? But in fact it is a network of connected machines (*servers*). Hundreds of thousands of machines! Many, many kilometers of cables around the world! You can visit a Submarine Cable Map website (http://submarinecablemap.com/) to see how complicated the net is. Here is a screenshot from the website:
 
 ![Figure 1.2](images/internet_3.png)
 
-It is fascinating, isn't it? But obviously, it is not possible to have a wire between every machine connected to the Internet. So to reach a machine (for example the one where http://djangogirls.org is) we need to pass a request through many different machines.
+It is fascinating, isn't it? But obviously, it is not possible to have a wire between every machine connected to the Internet. So to reach a machine (for example the one where http://djangogirls.org is) we need to pass a request through many, many different machines.
 
 It looks like this:
 
 ![Figure 1.3](images/internet_2.png)
 
 Imagine that when you type http://djangogirls.org you send a letter that says: "Dear DjangoGirls, I want to see djangogirls.org website. Send it to me, please!"
 
-Your letter goes to the post office. Then it goes to another that is nearer your addressee, then to another and another till it is delivered to the destination. The only difference is that if you send letters (data packets) frequently to the same place, each letter could go through totally different post offices (routers), depending how they are distributed in each office.
+Your letter goes to the post office. Then it goes to another that is nearer your addressee, then to another and another till it is delivered to the destination. The only unique thing is that if you send letters (*data packets*) frequently to the same place, each letter could go through totally different post offices (*routers*), depending how they are distributed in each office.
 
 ![Figure 1.4](images/internet_4.png)
 
 Yes, it is as simple as that. You send messages and you expect some response. Of course, instead of paper and pen you use bytes of data, but the idea is the same!
 
-Instead of address with street name, city, zipcode and country, we use IP addresses. Your computer asks DNS (Domain Name System) first to translate djangogirls.org into an IP address. It works a little bit like old-fashioned phonebooks where you could look for the name of the person and find their phone number.
+Instead of address with street name, city, zipcode and country, we use IP addresses. Your computer asks DNS (Domain Name System) first to translate djangogirls.org into an IP address. It works a little bit like old-fashioned phonebooks where you could look for the name of the person and find their phone number and address.
 
-When you send a letter it needs to have certain features to be delivered correctly: address, postmark etc.. You also use language that the receiver understands, right? The same is with data packets you send in order to see a website: you use a protocol called HTTP (HyperText TransferProtocol).
+When you send a letter it needs to have certain features to be delivered correctly: address, postmark etc.. You also use language that the receiver understands, right? The same is with *data packets* you send in order to see a website: you use a protocol called HTTP (HyperText TransferProtocol).
 
-So basically, when you have a website you need to have a server (machine) on which it is. The server is waiting for any incoming requests (letters that ask you to send your website) and it sends back your website (in another letter).
+So basically, when you have a website you need to have a *server* (machine) on which it is. The *server* is waiting for any incoming *requests* (letters that ask you to send your website) and it sends back your website (in another letter).
 
-Since it is a Django tutorial, you will ask what Django does? When you send a response you don't always want to send the same thing to everybody. It is so much better if your letter are personalized especially for the person that has just written to you. Django helps you with creating these personalized, interesting letters :).
+Since it is a Django tutorial, you will ask what Django does? When you send a response you don't always want to send the same thing to everybody. It is so much better if your letters are personalized especially for the person that has just written to you, right? Django helps you with creating these personalized, interesting letters :).
 
-Enough talking, time to create!
+Enough talking, time to create! But first - the boring part - installation!
diff --git a/python_installation/README.md b/python_installation/README.md
@@ -2,7 +2,7 @@
 
 Huh, it's exciting, right?! You'll write your first line of code in just minutes!
 
-But first, let me tell you what Python is. Python is a very popular programming language that can be used to write websites, games, science, graphics, and many, many more.
+But first, let us tell you what Python is. Python is a very popular programming language that can be used to write websites, games, science, graphics, and many, many more.
 
 Python was conceived in the late 1980s and its main goal is to be readable by human beings (not only machines!) that's why it looks much simpler than other programming languages. That also makes it easy to learn, but don't worry, Python is also really powerful!
 
@@ -14,7 +14,7 @@ Django is written in Python. We need it to do anything in Django. Let's start wi
 
 ### Windows
 
-You can download Python for Windows from the website https://www.python.org/download/releases/3.4.1/. After downloading the ***.msi** file, you should execute it (double-click on it) and follow the instructions there. It is important to remember the path (the folder) where we installed Python. It will be needed later.
+You can download Python for Windows from the website https://www.python.org/download/releases/3.4.1/. After downloading the ***.msi** file, you should execute it (double-click on it) and follow the instructions there. It is important to remember the path (the folder) where you installed Python. It will be needed later!
 
 ### Linux
 
@@ -34,13 +34,13 @@ You type in the console:
 
 #### Fedora
 
-Yout type in the console:
+You type in the console:
 
     sudo yum install python3.4
 
 ### OS X
 
-You need to go to the website https://www.python.org/downloads/release/python-341/ and install the appropriate package for you operating system.
+You need to go to the website https://www.python.org/downloads/release/python-341/ and install the appropriate package for your operating system.
 
 ----
 
