Merge pull request #253 from Geekfish/term-change/neutral-postman

Change "Postman" to gender-neutral "Mail Carrier".
DjangoGirls · Feb 6, 2015 · 271a032 · 271a032
2 parents 5ea7985 + 239b9bc
commit 271a032
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/en/django/README.md b/en/django/README.md
@@ -18,7 +18,7 @@ Imagine a mailbox (port) which is monitored for incoming letters (requests). Thi
 
 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 a 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. She is walking down the street and checks each house number against the one on the letter. If it matches, she puts the letter there. This is how the urlresolver works!
+Imagine a mail carrier with a letter. She is walking down the street and checks each house number against the one on the letter. If it matches, she puts the letter there. This is how the urlresolver works!
 
 In the *view* function all the 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.
 

diff --git a/en/django_start_project/README.md b/en/django_start_project/README.md
@@ -36,7 +36,7 @@ In console you should run (remember that you don't type `(myvenv) ~/djangogirls$
 
 The `settings.py` file contains the configuration of your website.
 
-Remember when we talked about a postman checking where to deliver a letter? `urls.py` file contains a list of patterns used by `urlresolver`.
+Remember when we talked about a mail carrier checking where to deliver a letter? `urls.py` file contains a list of patterns used by `urlresolver`.
 
 Let's ignore the other files for now - we won't change them. The only thing to remember is not to delete them by accident!