Skip to content

Commit dbe36c7

Browse files
committed
Minor grammar and typo fixes.
1 parent 17cdf7f commit dbe36c7

21 files changed

Lines changed: 155 additions & 155 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## Introduction
44

5-
Have you ever felt that world is more and more about technology and you are somehow left behind? Have you ever wondered how to create a website but have never had enough motivation to start? Have you ever thought that software world is too complicated for you to even try doing something on your own?
5+
Have you ever felt that the world is more and more about technology and you are somehow left behind? Have you ever wondered how to create a website but have never had enough motivation to start? Have you ever thought that the software world is too complicated for you to even try doing something on your own?
66

77
Well, we have good news for you! Programming is not as hard as it seems and we want to show you how fun it could be.
88

9-
The tutorial will not magically turn you into programmer. If you want to be good at it, you need months or even years of learning and practice. But we want to show you that programming or creating website is not as complicated as it seems. We will try to explain different bits and pieces as good as we can, so you will not feel intimidated by technology.
9+
The tutorial will not magically turn you into programmer. If you want to be good at it, you need months or even years of learning and practice. But we want to show you that programming or creating websites is not as complicated as it seems. We will try to explain different bits and pieces as well as we can, so you will not feel intimidated by technology.
1010

1111
We hope that we'll be able to make you love technology as much as we do!
1212

css/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CSS - make it pretty!
22

3-
Our blog looks still pretty ugly, right? Time to make it nice! We will use CSS for that.
3+
Our blog still looks pretty ugly, right? Time to make it nice! We will use CSS for that.
44

55
## What is CSS?
66

@@ -32,13 +32,13 @@ Looking nicer already!
3232

3333
Another thing you will learn about today is called __static files__. Static files are all your CSS and images -- files that are not dynamic, so their content don't depend on request context and will be the same for every user.
3434

35-
CSS is a static file, so in order to customize CSS, we need to first configure static files in Django. You'll only do it once for all. Let's start:
35+
CSS is a static file, so in order to customize CSS, we need to first configure static files in Django. You'll only do it once and for all. Let's start:
3636

3737
### Configure static files in Django
3838

3939
First, we need to create a folder to store our static files in. Go ahead and create folder called `static` inside your `mysite` folder.
4040

41-
Now we need to tell Django how it can find it. Open up a `mysite/mysite/settings.py` file, scroll to the bottom of it and add following lines:
41+
Now we need to tell Django how it can find it. Open up the `mysite/mysite/settings.py` file, scroll to the bottom of it and add the following lines:
4242

4343
STATICFILES_DIRS = (
4444
os.path.join(BASE_DIR, "static"),
@@ -52,9 +52,9 @@ That's it! Time to see if it works :)
5252

5353
First things first: let's create a CSS file now. Create a new folder called `css` inside your `static` folder. Then create a new file called `blog.css` inside this `css` directory. Ready?
5454

55-
Time to write some CSS! Open up your `blog.css` file in code editor.
55+
Time to write some CSS! Open up the `blog.css` file in your code editor.
5656

57-
We won't be going to deep into customizing and learning about CSS here, because it's pretty easy and you can learn it on your own after this workshop. We really recommend doing this [Codeacademy HTML & CSS course](http://www.codecademy.com/tracks/web) to learn everything you need to know about making your websites more pretty with CSS.
57+
We won't be going too deep into customizing and learning about CSS here, because it's pretty easy and you can learn it on your own after this workshop. We really recommend doing this [Codeacademy HTML & CSS course](http://www.codecademy.com/tracks/web) to learn everything you need to know about making your websites more pretty with CSS.
5858

5959
But let's do at least a little. Maybe we could change the color of our header? To understand colors, computer use special codes. They start with `#` and are followed by 6 letters and numbers. You can find color codes for example here: http://www.colorpicker.com/
6060

@@ -74,7 +74,7 @@ We're just loading static files here :) Then, in the `<head>` section, add this
7474

7575
<link rel="stylesheet" href="{% static 'css/blog.css' %}">
7676

77-
We just told our template where our CSS file is located. Ok, save a file and refresh the site!
77+
We just told our template where our CSS file is located. Ok, save the file and refresh the site!
7878

7979
![Figure 14.2](images/color2.png)
8080

@@ -84,11 +84,11 @@ Nice work! Maybe we would also like to give our website a little air and increas
8484
margin-left: 15px;
8585
}
8686

87-
Add this to your CSS, save a file and see how it works!
87+
Add this to your CSS, save the file and see how it works!
8888

8989
![Figure 14.3](images/margin2.png)
9090

91-
Maybe we can customize a font in our header? Paste this into your `<head>` in `post_list.html` file:
91+
Maybe we can customize the font in our header? Paste this into your `<head>` in `post_list.html` file:
9292

9393
<link href="http://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext" rel="stylesheet" type="text/css">
9494

@@ -181,7 +181,7 @@ Then also replace this:
181181
</div>
182182
{% endfor %}
183183

184-
in a `<body>` of your `post_list.html` with this:
184+
in the `<body>` of your `post_list.html` with this:
185185

186186
<div class="content">
187187
<div class="row">

deploy/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
Until now your website was only available on your computer, now we will learn how to deploy it! Deploying is a process of publishing your application on the Internet so people can finally go and see your app :)
44

5-
As you learned, website has to be located on the server. There is a lot of providers, but we will use the one with simplest deployment process: [Heroku](http://heroku.com/). Heroku is free for small applications that don't have too much visitors, it'll be definitely enough for you too.
5+
As you learned, a website has to be located on a server. There are a lot of providers, but we will use the one with the simplest deployment process: [Heroku](http://heroku.com/). Heroku is free for small applications that don't have too many visitors, it'll definitely be enough for you too.
66

77
We will be following this tutorial: https://devcenter.heroku.com/articles/getting-started-with-django, but we pasted it here so it's easier for you.
88

99
## Requirements.txt
1010

11-
We need to create a `requirements.txt` file to tell Heroku what Python packages needs to be installed on our server.
11+
We need to create a `requirements.txt` file to tell Heroku what Python packages need to be installed on our server.
1212

13-
But first, Heroku needs us to install `django-toolbelt` package. Go to your console with `virtualenv` activated and type this:
13+
But first, Heroku needs us to install the `django-toolbelt` package. Go to your console with `virtualenv` activated and type this:
1414

1515
$ pip install django-toolbelt
1616

@@ -22,15 +22,15 @@ This will create a file called `requirements.txt` with a list of your installed
2222

2323
## Procfile
2424

25-
Another thing we need to create is a Profile. Open up your code editor, create a file called `Procfile` in `mysite` directory and add this line:
25+
Another thing we need to create is a Procfile. Open up your code editor, create a file called `Procfile` in `mysite` directory and add this line:
2626

2727
web: gunicorn mysite.wsgi
2828

2929
Then save it. Done!
3030

3131
## mysite/settings.py
3232

33-
Another thing we need to modify is our website `settings.py` file. Open `mysite/settings.py` in your editor and add following lines:
33+
Another thing we need to do is modify our website's `settings.py` file. Open `mysite/settings.py` in your editor and add the following lines:
3434

3535
import dj_database_url
3636
DATABASES['default'] = dj_database_url.config()
@@ -41,11 +41,11 @@ Another thing we need to modify is our website `settings.py` file. Open `mysite/
4141

4242
STATIC_ROOT = 'staticfiles'
4343

44-
Then save a file.
44+
Then save the file.
4545

4646
## mysite/urls.py
4747

48-
Open `mysite/urls.py` file and add this two line in the begining of the file:
48+
Open `mysite/urls.py` file and add these two line in the begining of the file:
4949

5050
from django.conf.urls.static import static
5151
from django.conf import settings
@@ -63,7 +63,7 @@ The whole thing should look like this:
6363

6464
## mysite/wsgi.py
6565

66-
Open `mysite/wsgi.py` file and replace this line:
66+
Open the `mysite/wsgi.py` file and replace this line:
6767

6868
application = get_wsgi_application()
6969

django_-_why_you_need_a_webframework/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
Django (_/ˈdʒæŋɡoʊ/ jang-goh_) is a free and open source web application framework, written in Python. It's a web framework - a set of components that helps you to develop websites faster and easier.
44

5-
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, etc.
5+
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.
66

7-
Luckily for you other people long ago noticed that web developers face similar problems when building a new site, so they teamed up and create frameworks (Django is one of them) that gives you ready components you can use.
7+
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 givs you ready components you can use.
88

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

1111
## Why do you need a framework?
1212

13-
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.
13+
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.
1414

15-
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 webpage. But when you want something to send, you need to have some content. And Django is something that helps you create the content.
15+
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.
1616

1717
## What happen when someone request a website from your server?
1818

19-
When request comes to a web server it passes it to Django. Django tries to figure out what actually is requested. It takes a webpage address used and tries to figure out what to. 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.
19+
When a request comes to a web server it passes it to Django. Django 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.
2020

2121
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.
2222

23-
In 'view' all interesting things are done: we can look at the database to look for some information to return it to user. Maybe user asked to change something in the data? Like a letter saying "Please change description of my job title." - view can check if you are allowed to do that, then update the job title for you and send back a message: "Done!". Then view is generating a response and Django can send it to user's web browser.
23+
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.
2424

2525
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.
2626

27-
So instead of diving too much into details, we will simply start creating something with Django and we will learn all important parts on the way!
27+
So instead of diving too much into details, we will simply start creating something with Django and we will learn all the important parts along the way!
2828

2929

django_admin/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Django admin
22

3-
To add, edit and delete posts we have just modeled, we will use Django admin.
3+
To add, edit and delete posts we have just modeled, we will use the Django admin.
44

5-
Let's open `blog/admin.py` file and replace it's content with this:
5+
Let's open `blog/admin.py` file and replace its content with this:
66

77
from django.contrib import admin
88
from .models import Post
99

1010
admin.site.register(Post)
1111

12-
As you can see, we import (include) Post model defined in the previous chapter.
12+
As you can see, we import (include) the Post model defined in the previous chapter.
1313

1414
Ok, time to look at our Post model. Go to the browser and type an address:
1515

@@ -19,7 +19,7 @@ You will see a login page like this:
1919

2020
![Login page](images/login_page.png)
2121

22-
You should use username and password you chose when you were creating a database (in "Starting Django project" chapter). After login in, you should see Django admin dashboard.
22+
You should use the username and password you chose when you were creating a database (in "Starting Django project" chapter). After login in, you should see the Django admin dashboard.
2323

2424
![Django admin](images/django_admin.png)
2525

@@ -29,8 +29,8 @@ Make sure that at least two or three (but not all) have publish date set. It wil
2929

3030
![Django admin](images/edit_post.png)
3131

32-
If you want to know more about Django admin, you should check Django documentation: https://docs.djangoproject.com/en/dev/ref/contrib/admin/
32+
If you want to know more about the Django admin, you should check Django's documentation: https://docs.djangoproject.com/en/dev/ref/contrib/admin/
3333

34-
It is probably the good moment to grab a coffee (or tea) and eat something sweet. You created your first Django model - you deserve a little treat!
34+
It is probably a good moment to grab a coffee (or tea) and eat something sweet. You created your first Django model - you deserve a little treat!
3535

3636

0 commit comments

Comments
 (0)