Merge pull request DjangoGirls#94 from JesseIrwin/master

olasitarska · olasitarska · commit 9b5ec265cb97 · 2014-08-05T09:01:22.000+02:00
minor changes to python intro and virtualenv instructions
diff --git a/deploy/README.md b/deploy/README.md
@@ -126,6 +126,8 @@ Create `.gitignore` file with the following content:
 
 and save it. The dot on the beginning of the file name is important! As you can see, we're now telling Heroku to ignore `local_settings.py` and don't download it, so it's only available on your computer (locally).
 
+__NOTE:__ Remember to replace `myvenv` with the name you gave your `virtualenv`!
+
 Next, we’ll create a new git repository and save our changes. Go to your console and run these commands:
 
     $ git init
diff --git a/django_admin/README.md b/django_admin/README.md
@@ -11,7 +11,7 @@ Let's open the `blog/admin.py` file and replace its content with this:
 
 As you can see, we import (include) the Post model defined in the previous chapter. To make our model visible on the admin page, we need to register the model with `admin.site.register(Post)`.
 
-Ok, time to look at our Post model. Go to the browser and type the address:
+Ok, time to look at our Post model. Remember to run `python manage.py runserver` in the console to run the web server. Go to the browser and type the address:
 
     http://127.0.0.1:8000/admin/
 
diff --git a/django_installation/README.md b/django_installation/README.md
@@ -35,10 +35,12 @@ where `C:\Python34\python` is the directory in which you previously installed Py
 
 ### Linux and OS X
 
-Creating a `virtualenv` on both Linux and OS X is as simple as running:
+Creating a `virtualenv` on both Linux and OS X is as simple as running `python3 -m venv myvenv`.
+It will look like this:
 
     ~/djangogirls$ python3 -m venv myvenv
 
+and just like the Windows instructions above, `myvenv` is the name of your `virtualenv`. You can use any other name, but stick to lowercase and use no spaces. It is also good idea to keep the name short - you'll be referencing it a lot!
 
 > __NOTE:__ Initiating the virtual environment on Ubuntu 14.04 like this currently gives the following error:
 
@@ -52,7 +54,7 @@ Creating a `virtualenv` on both Linux and OS X is as simple as running:
 
 ## Working with virtualenv
 
-The command above will create a directory called `myvenv` that contains our virtual environment (basically bunch of directory and files). All we want to do now is starting it by running:
+The command above will create a directory called `myvenv` (or whichever name you chose) that contains our virtual environment (basically bunch of directory and files). All we want to do now is starting it by running:
 
     C:\Users\Name\djangogirls> myvenv\Scripts\activate
 
@@ -62,6 +64,8 @@ on Windows, or:
 
 on OS X and Linux.
 
+Remember to replace `myvenv` with your chosen `virtualenv` name!
+
 > __NOTE:__ sometimes `source` might not be available. In those cases try doing this instead:
 
 >     ~/djangogirls$ . myvenv/bin/activate
diff --git a/django_orm/README.md b/django_orm/README.md
@@ -24,7 +24,7 @@ But what's next? To take actual blog posts from `Post` model we need something c
 
 ## Queryset
 
-So now we are interested in a list of blog posts, right? But all we have is model `Post`. A Queryset will give us a collection we are looking for. All we need to do is:
+So now we are interested in a list of blog posts, right? But all we have is model `Post`. A Queryset will give us a collection we are looking for. All we need to do is use:
 
     Post.objects.all()
 
@@ -34,15 +34,15 @@ And we have our first queryset! Now we can take each element out of it and displ
 
 But before we pass this queryset to the template and display blog posts we will do some magic and select only posts that are published (they have a `published_date` set).
 
-This is where we introduce a `filter`. We will use it instead of `all` in a previous line of code. In parentheses we will state what condition(s) needs to be met by a blog post to end up in our queryset. In our situation it is `published_date` that is not empty. The way to write it in Django is: `published_date__isnull=False` (`null` in programming means *empty*).
+This is where we introduce a `filter`. We will use it instead of `all` in `Post.objects.all()`. In parentheses we will state what condition(s) needs to be met by a blog post to end up in our queryset. In our situation it is `published_date` that is not empty. The way to write it in Django is: `published_date__isnull=False` (`null` in programming means *empty*). Now our piece of code looks like:
 
     Post.objects.filter(published_date__isnull=False)
 
 Finally, it would be good to have our posts ordered by publish date, right? We can do that with `order_by`. In parentheses we will type (in quotation marks `''`) the name of a field (`published_date`) to order by. Our final queryset looks like this:
 
     Post.objects.filter(published_date__isnull=False).order_by('published_date')
 
-Time to put this piece of code inside `post_list`, right?
+Now we put this piece of code inside the `post_list` file, by adding it to the function `def post_list(request)`:
 
     from django.shortcuts import render
     from .models import Post
diff --git a/django_start_project/README.md b/django_start_project/README.md
@@ -17,13 +17,13 @@ In console you should run (remember that you don't type `(myvenv) ~/djangogirls$
 
 > Remember to run everything in the virtualenv. If you don't see a prefix `(myvenv)` in your console you need to activate your virtualenv. We explained how to that in __Django installation__ chapter in __Working with virtualenv__ part.
 
-Run on Linux or Mac OS:
+Run on Windows:
 
-    (myvenv) ~/djangogirls$ django-admin.py startproject mysite .
+    (myvenv) ~/djangogirls$ python myvenv\Scripts\django-admin.py startproject mysite .
 
-or on Windows:
+or on Linux or Mac OS:
 
-    (myvenv) ~/djangogirls$ python myvenv\Scripts\django-admin.py startproject mysite .
+    (myvenv) ~/djangogirls$ django-admin.py startproject mysite .
 
 `django-admin.py` is a script that will create the directories and files for you. You should now have a directory structure which looks like this:
 
@@ -46,7 +46,7 @@ Let's ignore the other files for now - we won't change them. The only thing to r
 
 ## Changing settings
 
-Let's make some changes in `mysite/settings.py`.
+Let's make some changes in `mysite/settings.py`. Open the file using the code editor you installed earlier.
 
 It would be nice to have the correct time on our website. Go to http://en.wikipedia.org/wiki/List_of_tz_database_time_zones and copy your relevant time zone (TZ). (eg. `Europe/Berlin` ) 
 
@@ -55,6 +55,8 @@ You should find lines that contain `USE_TZ` and `TIME_ZONE` and modify them to l
     USE_TZ = False
     TIME_ZONE = 'Europe/Berlin'
 
+(But with the correct country and city for your timezone.)
+
 ## Setup a database
 
 There's a lot of different database software that can store data for your site. We'll use the default one, `sqlite3`.
diff --git a/python_introduction/README.md b/python_introduction/README.md
@@ -214,9 +214,9 @@ Now, try writing the following command:
 
     >>> django_dolls = {'Dottie' : 15, 'Lottie' : 305, 'EmmyLou' : 17}
 
-Don't be surprised with the weird names. Go to the link: http://hubpages.com/hub/50-Doll-Names to look for more cute doll names. :P Just Kidding (You should do this if and only if you have a lot of time). 
+Don't be surprised with the weird names. Go to the link: http://hubpages.com/hub/50-Doll-Names to look for more cute doll names. :P Just Kidding (You should do this if and only if you have a lot of time).
 
-Above, you just created a variable named django_dolls with three key-value pairs. The key Dottie points to the value 15, Lottie points to the value 305, EmmyLou points to the value 17. 
+Above, you just created a variable named django_dolls with three key-value pairs. The key Dottie points to the value 15, Lottie points to the value 305, EmmyLou points to the value 17.
 
 When to use a dictionary or a list? Well, a good point to ponder on. Just have a soltuion in mind before looking at the answer in the next line.
 
@@ -232,7 +232,7 @@ Like the lists, using len() method on the dictionaries, returns the number of ke
     >>> len(django_dolls)
     4
 
-I hope it makes sense uptil now. :) Ready for some more fun with Dictionaries? Hop on the next line for some amazing things. 
+I hope it makes sense uptil now. :) Ready for some more fun with Dictionaries? Hop on the next line for some amazing things.
 
 You can use del() command to delete an item in the dictionary which has particular. Say, if you want to delete the entry corresponding to the key Dottie, just type in the following command:
 
@@ -248,7 +248,7 @@ Apart from this, you can also change a value associated with an already created
     >>> django_dolls
     {'Jilly': 100, 'EmmyLou': 17, 'Lottie': 305}
 
-As you can see, the value of the key 'Jilly' has been altered from 67 to 100. :) Exciting? Hurrah! You just learnt another amazing thing. 
+As you can see, the value of the key 'Jilly' has been altered from 67 to 100. :) Exciting? Hurrah! You just learnt another amazing thing.
 
 ### Summary
 
@@ -520,6 +520,10 @@ You can also use `for` on numbers using the `range` method:
 
 Note that the second of these two numbers is not included in the list that is output by Python (meaning `range(1, 6)` counts from 1 to 5, but does not include the number 6).
 
+## Exiting Python
+
+You can exit Python and return to the command line using `exit()`.
+
 ## Summary
 
 That's it. __You totally rock!__ This really wasn't so easy, so you should feel proud of yourself. We're definitely proud of you for making it to here!
