Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes and improvements #32

Merged
merged 5 commits into from
Jul 21, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
MANIFEST
.DS_Store
_book
node_modules
12 changes: 6 additions & 6 deletions how_internet_works/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

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.
First thing you need to understand is that a website is just a bunch of files saved on a harddisk. Just like your movies, music or pictures.
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,
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 them 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 harddisk. 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.

Ok, but you want to know how the Internet looks like, right?
Expand All @@ -37,11 +37,11 @@ Your letter goes to the post office. Then it goes to another that is nearer your

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 and address.
Instead of addresses with street name, city, zipcode and country, we use IP addresses. Your computer asks the 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 a 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 Transfer Protocol).

So basically, when you have a website you need to have a *server* (machine) where it lives. 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) where it lives. The *server* is waiting for any incoming *requests* (letters that ask it 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 letters are personalized especially for the person that has just written to you, right? Django helps you with creating these personalized, interesting letters :).

Expand Down
2 changes: 1 addition & 1 deletion python_installation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Huh, it's exciting, right?! You'll write your first line of code in just minutes!

But first, let us tell you what Python is. Python is a very popular programming language that can be used for creating websites, games, science, graphics, and much, much more.
But first, let us tell you what Python is. Python is a very popular programming language that can be used for creating websites, games, science, 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. That makes it easy to learn, but don't worry, Python is also really powerful!

Expand Down
6 changes: 3 additions & 3 deletions python_introduction/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ On Windows you need to go to Start menu → All Programs → Accessories → Com

A window should pop up on your screen. This window is a prompt, waiting for commands from you. We want to open up a Python console, so type in `python3` and hit Enter.

C:\Users\Name> C:\Python34\python
C:\Users\Name> python3
Python 3.4.1 (...)
Type "copyright", "credits" or "license" for more information.
>>>

### Linux and OX X
### Linux and OS X

On Mac OS X you can do this by launching the `Terminal` application (it's in Applications → Utilities). On Linux, it's probably under Applications → Accessories → Terminal.

Expand Down Expand Up @@ -122,7 +122,7 @@ Let's say we want to create a new variable called `name`:

You see? It's easy! Simply: name equals Ola.

As you've noticed, your program didn't return anything like it did before. How do we now that the variable actually is there? Simply enter `name` and hit Enter:
As you've noticed, your program didn't return anything like it did before. How do we know that the variable actually is there? Simply enter `name` and hit Enter:

>>> name
'Ola'
Expand Down