Skip to content

Commit 830d616

Browse files
committed
Issue DjangoGirls#1. Copy-editing up to and including Introduction to Python.
1 parent 711c18a commit 830d616

File tree

6 files changed

+94
-91
lines changed

6 files changed

+94
-91
lines changed

en/code_editor/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Code editor
22

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

7-
> **Note** You might have done this earlier in the Installation chapter - if so, you can skip right ahead to the next chapter!
7+
> **Note** You might have done this earlier in the Installation chapter if so, you can skip right ahead to the next chapter!
88
99
{% include "/code_editor/instructions.md" %}

en/code_editor/instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Sublime Text is a very popular editor with a free evaluation period. It's easy t
1616

1717
## Atom
1818

19-
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.
19+
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.
2020

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

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

3030
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.
3131

32-
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 :)
32+
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. :)
3333

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# How the Internet works
22

3-
> For readers at home: this chapter is covered in [How the Internet Works](https://www.youtube.com/watch?v=oM9yAA09wdc) video.
3+
> For readers at home: this chapter is covered in the [How the Internet Works](https://www.youtube.com/watch?v=oM9yAA09wdc) video.
44
5-
> This chapter is inspired by a talk "How the Internet works" by Jessica McKellar (http://web.mit.edu/jesstess/www/).
5+
> This chapter is inspired by the talk "How the Internet works" by Jessica McKellar (http://web.mit.edu/jesstess/www/).
66
77
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`?
88

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

1515
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
16-
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.
16+
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.
1717

18-
OK, but you want to know how the Internet looks like, right?
18+
OK, but you want to know how the Internet looks, right?
1919

2020
We drew you a picture! It looks like this:
2121

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

24-
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:
24+
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:
2525

2626
![Figure 1.2](images/internet_3.png)
2727

28-
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.
28+
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.
2929

3030
It looks like this:
3131

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

4040
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!
4141

42-
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.
42+
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.
4343

44-
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).
44+
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).
4545

4646
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).
4747

48-
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 :).
48+
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. :)
4949

50-
Enough talk, time to create!
50+
Enough talk time to create!

en/intro_to_command_line/README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# Introduction to the command-line interface
22

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

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

99
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.
1010

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

15-
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*.
15+
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*.
1616

1717
## Open the command-line interface
1818

@@ -28,7 +28,7 @@ Applications → Utilities → Terminal.
2828

2929
### Linux
3030

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

3333
## Prompt
3434

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

4343
>
4444

45-
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 :)
45+
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. :)
4646

47-
> 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.
47+
> 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.
4848
4949
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.
5050

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

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

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

@@ -136,7 +136,7 @@ Windows:
136136

137137
Here it is!
138138

139-
> 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.
139+
> 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.
140140
141141
---
142142

@@ -150,15 +150,15 @@ Windows:
150150

151151
> mkdir practice
152152

153-
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 :)
153+
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. :)
154154

155155
> 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.
156156
157157
---
158158

159159
### Exercise!
160160

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

163163
#### Solution:
164164

@@ -190,7 +190,7 @@ Windows:
190190

191191
> cd ..
192192

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

195195
Check where you are:
196196

@@ -204,7 +204,7 @@ Windows:
204204

205205
Now time to delete the `practice` directory:
206206

207-
> __Attention__: Deleting files using `del`, `rmdir` or `rm` is irrecoverable, meaning _deleted files will be gone forever_! So, be very careful with this command.
207+
> __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.
208208
209209
$ rm -r practice
210210

@@ -223,15 +223,15 @@ Windows:
223223

224224
### Exit
225225

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

228228
$ exit
229229

230230
Windows:
231231

232232
> exit
233233

234-
Cool, huh?:)
234+
Cool, huh? :)
235235

236236
## Summary
237237

en/python_installation/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ We're finally here!
44

55
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.
66

7-
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!
7+
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!
88

99
# Python installation
1010

11-
> **Note** If you already worked through the Installation steps, no need to do this again - you can skip straight ahead to the next chapter!
11+
> **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!
1212
1313
{% include "/python_installation/instructions.md" %}
1414

0 commit comments

Comments
 (0)