Skip to content

Commit

Permalink
Issue #1. Copy-editing up to and including Introduction to Python.
Browse files Browse the repository at this point in the history
  • Loading branch information
logological committed Jun 21, 2016
1 parent 711c18a commit 830d616
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 91 deletions.
4 changes: 2 additions & 2 deletions en/code_editor/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Code editor

> For readers at home: this chapter is covered in [Installing Python & Code Editor](https://www.youtube.com/watch?v=pVTaqzKZCdA&t=4m43s) video.
> For readers at home: this chapter is covered in the [Installing Python & Code Editor](https://www.youtube.com/watch?v=pVTaqzKZCdA&t=4m43s) video.
You're about to write your first line of code, so it's time to download a code editor!

> **Note** You might have done this earlier in the Installation chapter - if so, you can skip right ahead to the next chapter!
> **Note** You might have done this earlier in the Installation chapter if so, you can skip right ahead to the next chapter!
{% include "/code_editor/instructions.md" %}
4 changes: 2 additions & 2 deletions en/code_editor/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Sublime Text is a very popular editor with a free evaluation period. It's easy t

## Atom

Atom is an extremely new code editor created by [GitHub](https://github.com/). It's free, open-source, easy to install and easy to use. It's available for Windows, OSX and Linux.
Atom is an extremely new code editor created by [GitHub](https://github.com/). It's free, open-source, easy to install and easy to use. It's available for Windows, OS X and Linux.

[Download it here](https://atom.io/)

Expand All @@ -29,5 +29,5 @@ The first reason is that code needs to be **plain text**, and the problem with p

The second reason is that code editors are specialised for editing code, so they can provide helpful features like highlighting code with colour according to its meaning, or automatically closing quotes for you.

We'll see all this in action later. Soon, you'll come to think of your trusty old code editor as one of your favourite tools :)
We'll see all this in action later. Soon, you'll come to think of your trusty old code editor as one of your favourite tools. :)

20 changes: 10 additions & 10 deletions en/how_the_internet_works/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# How the Internet works

> For readers at home: this chapter is covered in [How the Internet Works](https://www.youtube.com/watch?v=oM9yAA09wdc) video.
> For readers at home: this chapter is covered in the [How the Internet Works](https://www.youtube.com/watch?v=oM9yAA09wdc) video.
> This chapter is inspired by a talk "How the Internet works" by Jessica McKellar (http://web.mit.edu/jesstess/www/).
> This chapter is inspired by the talk "How the Internet works" by Jessica McKellar (http://web.mit.edu/jesstess/www/).
We bet you use the Internet every day. But do you actually know what happens when you type an address like https://djangogirls.org into your browser and press `enter`?

Expand All @@ -13,19 +13,19 @@ If you're not familiar with programming it can be hard to grasp HTML at first, b
follow its instructions, and present these files that your website is made of, exactly the way you want.

As with every file, we need to store HTML files somewhere on a hard 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 called *servers* -- because they *serve* you data.
a screen, mouse or a keyboard, because their main purpose is to store data and serve it. That's why they're called *servers* because they *serve* you data.

OK, but you want to know how the Internet looks like, right?
OK, but you want to know how the Internet looks, right?

We drew you a picture! It looks like this:

![Figure 1.1](images/internet_1.png)

Looks like a mess, right? In fact it is a network of connected machines (the above mentioned *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:
Looks like a mess, right? In fact it is a network of connected machines (the above-mentioned *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 https://djangogirls.org is saved) we need to pass a request through many, 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 https://djangogirls.org is saved) we need to pass a request through many, many different machines.

It looks like this:

Expand All @@ -39,12 +39,12 @@ Your letter goes to the post office closest to you. Then it goes to another that

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 addresses with a street name, city, zip code and country name, we use IP addresses. Your computer first asks the DNS (Domain Name System) to translate djangogirls.org into an IP address. It works a little bit like old-fashioned phonebooks where you could look up the name of the person you want to contact and find their phone number and address.
Instead of addresses with a street name, city, zip code and country name, we use IP addresses. Your computer first asks the DNS (Domain Name System) to translate djangogirls.org into an IP address. It works a little bit like old-fashioned phonebooks where you can look up the name of the person you want to contact and find their phone number and address.

When you send a letter, it needs to have certain features to be delivered correctly: an address, stamp etc. You also use a language that the receiver understands, right? The same applies to the *data packets* you send to see a website. We use a protocol called HTTP (Hypertext Transfer Protocol).
When you send a letter, it needs to have certain features to be delivered correctly: an address, a stamp, etc. You also use a language that the receiver understands, right? The same applies to the *data packets* you send to see a website. We 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. When the *server* receives an incoming *request* (in a letter), it sends back your website (in another letter).

Since this 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 :).
Since this is a Django tutorial, you might 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 talk, time to create!
Enough talk time to create!
32 changes: 16 additions & 16 deletions en/intro_to_command_line/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Introduction to the command-line interface

> For readers at home: this chapter is covered in [Your new friend: Command Line](https://www.youtube.com/watch?v=jvZLWhkzX-8) video.
> For readers at home: this chapter is covered in the [Your new friend: Command Line](https://www.youtube.com/watch?v=jvZLWhkzX-8) video.
Huh, it's exciting, right?! You'll write your first line of code in just a few minutes :)
It's exciting, right?! You'll write your first line of code in just a few minutes! :)

__Let us introduce you to your first new friend: the command line!__

The following steps will show you how to use the black window all hackers use. It might look a bit scary at first but really it's just a prompt waiting for commands from you.

> **Note** Please note that throughout this book we use the terms 'directory' and 'folder' interchangably but they are one and the same thing.
> **Note** Please note that throughout this book we use the terms 'directory' and 'folder' interchangeably but they are one and the same thing.
## What is the command line?

The window, which is usually called the __command line__ or __command-line interface__, is a text-based application for viewing, handling, and manipulating files on your computer. Much like Windows Explorer or Finder on Mac, but without the graphical interface. Other names for the command line are: *cmd*, *CLI*, *prompt*, *console* or *terminal*.
The window, which is usually called the __command line__ or __command-line interface__, is a text-based application for viewing, handling, and manipulating files on your computer. It's much like Windows Explorer or Finder on the Mac, but without the graphical interface. Other names for the command line are: *cmd*, *CLI*, *prompt*, *console* or *terminal*.

## Open the command-line interface

Expand All @@ -28,7 +28,7 @@ Applications → Utilities → Terminal.

### Linux

It's probably under Applications → Accessories → Terminal, but that may depend on your system. If it's not there, just Google it :)
It's probably under Applications → Accessories → Terminal, but that may depend on your system. If it's not there, just Google it. :)

## Prompt

Expand All @@ -42,9 +42,9 @@ On Windows, it's a `>` sign, like this:

>

Each command will be prepended by this sign and one space, but you don't have to type it. Your computer will do it for you :)
Each command will be prepended by this sign and one space, but you don't have to type it. Your computer will do it for you. :)

> Just a small note: in your case there may be something like `C:\Users\ola>` or `Olas-MacBook-Air:~ ola$` before the prompt sign and that's 100% correct.
> Just a small note: in your case there may be something like `C:\Users\ola>` or `Olas-MacBook-Air:~ ola$` before the prompt sign, and this is 100% OK.
The part up to and including the `$` or the `>` is called the *command line prompt*, or *prompt* for short. It prompts you to input something there.

Expand All @@ -65,9 +65,9 @@ And then hit `enter`. This is our result:
$ whoami
olasitarska

As you can see, the computer has just printed your username. Neat, huh?:)
As you can see, the computer has just printed your username. Neat, huh? :)

> Try to type each command, do not copy-paste. You'll remember more this way!
> Try to type each command; do not copy-paste. You'll remember more this way!
## Basics

Expand Down Expand Up @@ -136,7 +136,7 @@ Windows:

Here it is!

> PRO tip: if you type `cd D` and then hit `tab` on your keyboard, the command line will automatically autofill the rest of the name so you can navigate faster. If there is more than one folder starting with "D", hit the `tab` button twice to get a list of options.
> PRO tip: if you type `cd D` and then hit `tab` on your keyboard, the command line will automatically fill in the rest of the name so you can navigate faster. If there is more than one folder starting with "D", hit the `tab` button twice to get a list of options.
---

Expand All @@ -150,15 +150,15 @@ Windows:

> mkdir practice

This little command will create a folder with the name `practice` on your desktop. You can check if it's there just by looking on your Desktop or by running a `ls` or `dir` command! Try it :)
This little command will create a folder with the name `practice` on your desktop. You can check if it's there just by looking on your Desktop or by running a `ls` or `dir` command! Try it. :)

> PRO tip: If you don't want to type the same commands over and over, try pressing the `up arrow` and `down arrow` on your keyboard to cycle through recently used commands.
---

### Exercise!

Small challenge for you: in your newly created `practice` directory create a directory called `test`. Use `cd` and `mkdir` commands.
A small challenge for you: in your newly created `practice` directory, create a directory called `test`. (Use the `cd` and `mkdir` commands.)

#### Solution:

Expand Down Expand Up @@ -190,7 +190,7 @@ Windows:

> cd ..

Using `..` with the `cd` command will change your current directory to the parent directory (this is the directory that contains your current directory).
Using `..` with the `cd` command will change your current directory to the parent directory (that is, the directory that contains your current directory).

Check where you are:

Expand All @@ -204,7 +204,7 @@ Windows:

Now time to delete the `practice` directory:

> __Attention__: Deleting files using `del`, `rmdir` or `rm` is irrecoverable, meaning _deleted files will be gone forever_! So, be very careful with this command.
> __Attention__: Deleting files using `del`, `rmdir` or `rm` is irrecoverable, meaning _the deleted files will be gone forever_! So be very careful with this command.
$ rm -r practice

Expand All @@ -223,15 +223,15 @@ Windows:

### Exit

That's it for now! You can safely close the command line now. Let's do it the hacker way, alright?:)
That's it for now! You can safely close the command line now. Let's do it the hacker way, alright? :)

$ exit

Windows:

> exit

Cool, huh?:)
Cool, huh? :)

## Summary

Expand Down
4 changes: 2 additions & 2 deletions en/python_installation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ We're finally here!

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 originated in the late 1980s and its main goal is to be readable by human beings (not only machines!). This 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!). This 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

> **Note** If you already worked through the Installation steps, no need to do this again - you can skip straight ahead to the next chapter!
> **Note** If you already worked through the Installation steps, there's no need to do this again you can skip straight ahead to the next chapter!
{% include "/python_installation/instructions.md" %}

Loading

0 comments on commit 830d616

Please sign in to comment.