Merge branch 'master' of https://github.com/Akuli/python-tutorial

Akuli · Akuli · commit 1dc9bd00067a · 2016-12-07T17:45:10.000+02:00
diff --git a/lists-and-tuples.md b/lists-and-tuples.md
@@ -53,7 +53,7 @@ There's many things [we can do with strings](handy-stuff-strings.md),
 and some of these things also work with lists.
 
 ```py
->>> len(names)   # we have 5 names
+>>> len(names)   # len is short for length, we have 5 names
 5
 >>> names + ['Akuli']   # create a new list with me in it
 ['wub_wub', 'theelous3', 'RubyPinch', 'go|dfish', 'Nitori', 'Akuli']
diff --git a/loops.md b/loops.md
@@ -5,7 +5,7 @@ There are different kinds of loops:
 
 - [While loops](#while-loops) repeat something while a condition is true.
 - [Until loops](#until-loops) repeat something while a condition is false.
-- [For loops](#for-loops) repeat something for each element of a list.
+- [For loops](#for-loops) repeat something for each element of something.
 
 We'll talk about all of these in this tutorial.
 
@@ -149,8 +149,8 @@ print("It's raining!")
 
 ## For loops
 
-Let's say we have a list of things we want to print. To print each item
-in stuff, we could just do a bunch of prints:
+Let's say we have [a list](lists-and-tuples.md) of things we want to
+print. To print each item in it, we could just do a bunch of prints:
 
 ```py
 stuff = ['hello', 'hi', 'how are you doing', 'im fine', 'how about you']
@@ -178,7 +178,7 @@ We could also create an index variable, and use a while loop:
 
 ```py
 >>> stuff = ['hello', 'hi', 'how are you doing', 'im fine', 'how about you']
->>> length_of_stuff = len(stuff)  # len(stuff) is 5
+>>> length_of_stuff = len(stuff)
 >>> index = 0
 >>> while index < length_of_stuff:
 ...     print(stuff[index])
@@ -230,16 +230,7 @@ how about you
 Note that `for thing in stuff:` is not same as `for (thing in stuff):`.
 Here the `in` keyword is just a part of the for loop and it has a
 different meaning than it would have if we had `thing in stuff` without
-a `for`. Trying to do `for (thing in stuff):` creates an error:
-
-```py
->>> for (thing in stuff):
-  File "<stdin>", line 1
-    for (thing in stuff):
-                        ^
-SyntaxError: invalid syntax
->>> 
-```
+a `for`. Trying to do `for (thing in stuff):` creates an error.
 
 Right now the while loop version might seem easier to understand for
 you, but later you'll realize that for loops are much easier to work
diff --git a/using-functions.md b/using-functions.md
@@ -54,7 +54,7 @@ text appears on the screen right away when we run `print(something)`.
 ## Return values
 
 If we do `thingy = print('hello')`, what does the `thingy` variable end
-up [pointing to](variables.md)?
+up [pointing to](variables.md#variables)?
 
 ```py
 >>> thingy = print('hello')

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ There's many things [we can do with strings](handy-stuff-strings.md),`
`53`	`53`	`and some of these things also work with lists.`
`54`	`54`
`55`	`55`	```py
`56`		`->>> len(names) # we have 5 names`
	`56`	`+>>> len(names) # len is short for length, we have 5 names`
`57`	`57`	`5`
`58`	`58`	`>>> names + ['Akuli'] # create a new list with me in it`
`59`	`59`	`['wub_wub', 'theelous3', 'RubyPinch', 'go\|dfish', 'Nitori', 'Akuli']`