Textual changes. "I" -> "we". More explanations and more info to avoid some problems.

asendecka · asendecka · commit 5de9cace40ae · 2014-07-08T23:08:24.000+02:00
diff --git a/database/README.md b/database/README.md
@@ -1,8 +1,8 @@
 # Database
 
-Most of web application have their own database. A database is a collection of data. This is a place in which you will store all information about users, all your blog post texts, etc..
+Most of web applications have their own database. A database is a collection of data. This is a place in which you will store all information about users, all your blog post texts, etc..
 
-We will be using a PostgreSQL database to store our data. It would be easier to just use a default Django database called sqlite, but it's not good for a production use. If you want to have your application available in the Internet, not only your computer, you will need PostgreSQL.
+We will be using a PostgreSQL database to store our data. It would be easier to use a default Django database called *sqlite*, but it's not good for a production use (by *production* we mean: real, running websites). If you want to have your application available in the Internet, not only on your computer, you will need PostgreSQL.
 
 # PostgreSQL installation
 
@@ -24,7 +24,7 @@ Of course, installation depends on Linux distribution. We've added most popular
 
 ### Ubuntu
 
-Go to your console and run following command:
+Go to your console and run a following command:
 
     sudo apt-get install postgresql postgresql-contrib
 
@@ -34,9 +34,10 @@ Go to your console and run following command:
 
 # Create database
 
-Now we need to create our database user and our first database!
+Now we need to create our database user and our first database. You can add many databases in PostgreSQL, so if you have more than one website, you should have a separate database for each one!
 
-First, let's make our console into postgres mode:
+First, let's make our console into postgres mode by typing `psql`. Remember the part about console?
+>On Mac OS X you can do this by launching the `Terminal` application (it's in Applications → Utilities). On Windows you need to go to Start menu → All Programs → Accessories → Command Prompt. On Linux, it's probably under Applications → Accessories → Terminal.
 
     $ psql
     psql (9.3.4)
@@ -48,11 +49,15 @@ Our `$` now changed into `#`, it means that we're now giving commands to Postgre
     # CREATE USER name;
     CREATE ROLE
 
-Of course, replace `name` with your own name. Now it's time for a database for your Django project:
+Of course, replace `name` with your own name. Remember that you should not use diacritic letters and whitespaces, i.e. `bożena maria` is invalid! You need to transform it into `bozena_maria`.
+
+Now it's time to create a database for your Django project:
 
     # CREATE DATABASE djangogirls OWNER name;
     CREATE DATABASE
 
-Awesome! All ready.
+Remember to replace `name` with the name you've chosen (i.e. `bozena_maria`).
+
+Awesome! All ready!
 
 
diff --git a/django/README.md b/django/README.md
@@ -4,23 +4,23 @@ Django (_/ˈdʒæŋɡoʊ/ jang-goh_) is a free and open source web application f
 
 You see, when you're building a website, you always need a similiar set of components: a way to handle user authentication (signing up, signing in, signing out), management panel for your website, forms, uploading files, etc.
 
-Luckily for you other people long ago noticed that web developers face similar problems when building a new site, so they teamed up and created frameworks (Django is one of them) that gives you ready components you can use.
+Luckily for you other people long ago noticed that web developers face similar problems when building a new site, so they teamed up and created frameworks (Django is one of them) that give you ready components you can use.
 
 Frameworks exist to save you from having to re-invent the wheel and help alleviate some of the overhead when you’re building a new site.
 
 ## Why do you need a framework?
 
 To understand what Django actually is for, we need a closer look at the servers. First thing is that the server needs to know that you want it to serve you a webpage.
 
-Imagine a mailbox (port) which is monitored for incoming letters (requests). It is done by a web server. The web server also sends the response with a webpage. But when you want to send something, you need to have some content. And Django is something that helps you create the content.
+Imagine a mailbox (port) which is monitored for incoming letters (requests). It is done by a web server. The web server also sends a response with a webpage. But when you want to send something, you need to have some content. And Django is something that helps you create the content.
 
-## What happen when someone request a website from your server?
+## What happen when someone requests a website from your server?
 
-When a request comes to a web server it's passed to Django which tries to figure out what actually is requested. It takes a webpage address used and tries to figure out what to do. This part is done by Django's urlresolver (Note that a website address is called URL - Uniform Resource Locator, so the name 'urlresolver' makes sense). It is not very smart here - it takes a list of patterns and tries to match the URL. Django checks patterns from top to the bottom and if something is matched then Django passes the request to the associated function called view.
+When a request comes to a web server it's passed to Django which tries to figure out what actually is requested. It takes a webpage address first and tries to figure out what to do. This part is done by Django's urlresolver (Note that a website address is called URL - Uniform Resource Locator, so the name *urlresolver* makes sense). It is not very smart - it takes a list of patterns and tries to match the URL. Django checks patterns from top to the bottom and if something is matched then Django passes the request to the associated function (which is called *view*).
 
-Imagine a postman with a letter who is walking down the street and checks each house number with the one on the letter. If it matches, they put the letter there.
+Imagine a postman with a letter. She is walking down the street and checks each house number with the one on the letter. If it matches, they put the letter there. This is how the urlresolver works!
 
-In the 'view' all interesting things are done: we can look at the database to look for some information to return it to the user. Maybe the user asked to change something in the data? Like a letter saying "Please change description of my job title." - the view can check if you are allowed to do that, then update the job title for you and send back a message: "Done!". Then the view generates a response and Django can send it to the user's web browser.
+In the *view* function all interesting things are done: we can look at a database to look for some information. Maybe the user asked to change something in the data? Like a letter saying "Please change description of my job." - the *view* can check if you are allowed to do that, then update the job description for you and send back a message: "Done!". Then the *view* generates a response and Django can send it to the user's web browser.
 
 Of course, the description above is a little bit simplified, but you don't need to know all the technical things yet. Knowing a general idea is enough.
 
diff --git a/python_introduction/README.md b/python_introduction/README.md
@@ -29,7 +29,7 @@ Nice! See how the answer popped out? Python knows math! You could try other comm
 - `5 - 1`
 - `40 / 2`
 
-Have fun with this for a little while and then get back here :)
+Have fun with this for a little while and then get back here :).
 
 As you can see, Python is a great calculator. If you're wondering what else you can do...
 
@@ -74,18 +74,18 @@ Ok, enough of strings. So far you've learned about:
 - __numbers and strings__ - in Python it's math and text objects
 - __methods__ - are actions in Python. You've used both English-language methods (upper, len) and symbolic ones (+, *).
 
-That's the basic of every programming language you learn. Ready for something harder? I bet you are!
+That's the basic of every programming language you learn. Ready for something harder? We bet you are!
 
 ## Errors
 
-Let's try something. Can we know the length of a number, the same way we learn about the length of our name? Try typing `len(304023)` and hit Enter:
+Let's try something. Can we get a length of a number, the same way we learn about the length of our name? Try typing `len(304023)` and hit Enter:
 
     >>> len(304023)
     Traceback (most recent call last):
       File "<stdin>", line 1, in <module>
     TypeError: object of type 'int' has no len()
 
-We got our first error! It says that objects of type "int" (integers, whole numbers) don't have a length. So what can we do now? Maybe we can write our number as string? Strings have length, right?
+We got our first error! It says that objects of type "int" (integers, whole numbers) don't have a length. So what can we do now? Maybe we can write our number as a string? Strings have length, right?
 
     >>> len(str(304023))
     6
@@ -112,7 +112,7 @@ As you've noticed, your program didn't return anything like it did before. How d
     >>> name
     'Ola'
 
-Yikes! Your first variable :) You can always change what it is:
+Yikes! Your first variable :)! You can always change what it is:
 
     >>> name = "Sonja"
     >>> name
@@ -134,7 +134,7 @@ Play with this for a while and see what you can do!
 
 ## Lists
 
-Beside strings and integers, Python has all sorts of different types of objects. Now we're going to introduce another one called __lists__. List is the exact thing you think about now: object that is a list of objects :)
+Beside strings and integers, Python has all sorts of different types of objects. Now we're going to introduce one called __list__. List is the exact thing you think about now: object that is a list of objects :)
 
 Go ahead and create a list:
 
@@ -145,7 +145,7 @@ Yes, it's empty. Not very useful, right? Let's create a list of lottery numbers.
 
     >>> lottery = [3, 42, 12, 19, 30, 59]
 
-All right, we have a list! What can we do with it? Let's see how many lottery numbers there is in a list. Do you have an idea which method you should use for that? You know this already!
+All right, we have a list! What can we do with it? Let's see how many lottery numbers there are in a list. Do you have an idea which method you should use for that? You know this already!
 
     >>> len(lottery)
     6
@@ -167,13 +167,13 @@ Maybe we want to reverse the order? Let's do that!
     >>> print(lottery)
     [59, 42, 30, 19, 12, 3]
 
-It worked! If you want to add something to the list, you can do this by typing this command:
+Easy, right? If you want to add something to the list, you can do this by typing this command:
 
     >>> lottery.append(199)
     >>> print(lottery)
     [59, 42, 30, 19, 12, 3, 199]
 
-If you want to only read the first number, you can do this by using index. The first objects of list is an object number 0, next one is 1, and so on. Try this:
+If you want to read only the first number, you can do this by using index. The first object of the list is an object number 0, next one is 1, and so on. Try this:
 
     >>> print(lottery[0])
     59
@@ -268,7 +268,7 @@ Practice and have fun with Boolean by trying to run following commands:
 - `True or 1 == 1`
 - `1 != 2`
 
-Congrats! You can know move on to the essence of programming:
+Congrats! You can now move on to the essence of programming:
 
 ## If...elif...else
 
@@ -288,7 +288,7 @@ So far nothing has happened, as evidenced by dots `...` instead of incentives `>
             ^
     IndentationError: expected an indented block
 
-Well...something went wrong. Python needs to know whether the instruction we have written is a continuation of `if` or it is the next instruction not covered by the condition. To this purpose we need to indent our code:
+Well...something went wrong! Python needs to know whether the instruction we have written is a continuation of `if` or it is the next instruction not covered by the condition. We need to indent our code to make it work:
 
     >>> if 3 > 2:
     ...     print('It works!')
@@ -343,14 +343,14 @@ Time for the last part of this chapter!
 
 ## Methods (functions)
 
-Remember about methods like `len` that you can execute in Python? Well, good news, you will learn how to write you own functions now!
+Remember about methods like `len` that you can execute in Python? Well, good news, you will learn how to write your own functions now!
 
 A function is a set of instructions that Python should execute. Each function in Python starts with the keyword `def`, has a name and can have some parameters. Let's start with an easy one:
 
     >>> def hi():
     ...
 
-As you can see, there are the dots again! This means that nothing has really happenned yet.. and yes, we need to do a `TAB` before giving our instructions:
+As you can see, there are the dots again! This means that nothing has really happenned yet... and yes, we need to do a `TAB` before giving our instructions:
 
     >>> def hi():
     ...     print('Hi there!')
@@ -363,9 +363,9 @@ Ok, our first function is ready! Let's execute it:
     Hi there!
     How are you?
 
-Great! You're now a programmer, congratulate yourself :)
+Great! You're now a programmer, congratulate yourself :)!
 
-That was easy, so let's build our first function with parameters. We will use previous example with names:
+That was easy! Let's build our first function with parameters. We will use the previous example with names:
 
     >>> def hi(name):
     ...
@@ -403,19 +403,19 @@ Let's call the function now:
     >>> hi("Rachel")
     Hi Rachel!
 
-Congrats! :)
+Congratulations! You just learned how to write  functions :)!
 
 ## Loops
 
 That's the last part already. That was quick, right?:)
 
-As we mentioned, programmers are lazy, they don't like to repeat themselves. Programming is all about automating things, so we don't want to greet every girl by their name manually, right? That's where loops come handy.
+As we mentioned, programmers are lazy, they don't like to repeat themselves. Programming is all about automating things, so we don't want to greet every girl by their name manually, right? That's where loops come in handy.
 
 Remember lists yet? Let's do a list of all the girls:
 
     >>> girls = ['Rachel', 'Monica', 'Phoebe', 'Ola', 'You']
 
-We want to greet all of them by they name. We have `hi` function to do that, so let's use it in a loop:
+We want to greet all of them by their name. We have `hi` function to do that, so let's use it in a loop:
 
     >>> for name in girls:
     ...
@@ -453,7 +453,7 @@ You can also do `for` on numbers using `range` method:
 
 ## Summary
 
-That's it. __You totally rock!__ It really wasn't so easy, so you should feel proud about yourself. We're definitely proud of you for making it here!
+That's it. __You totally rock!__ It really wasn't so easy, so you should feel proud of yourself. We're definitely proud of you for making it here!
 
 Grab yourself a cupcake and go to the next chapter :)
 
