fixing oopsies and improving things

Akuli · Akuli · commit 2f429af1ad7e · 2017-02-01T15:28:38.000+02:00
diff --git a/advanced/iters.md b/advanced/iters.md
@@ -105,9 +105,8 @@ this:
 
 ## Iterating manually
 
-Iterators have a magic method called `__next__`, and there's a built-in
-function called `next()` for calling that. Calling `next()` on an
-iterator gets the next value and moves it forward. Like this:
+Iterators have a magic method called `__next__` that gets next value and
+moves the iterator forward.
 
 ```python
 >>> e = enumerate('abc')
@@ -146,9 +145,11 @@ StopIteration
 ```
 
 There is usually not a good way to check if the iterator is at the end,
-and it's best to just try to get a value from it and catch
-StopIteration. That's actually what for looping over an iterator does.
-For example, this code...
+and it's best to just try to get a value from it and
+[catch](../basics/exceptions.md#catching-exceptions) StopIteration.
+
+That's actually what for loops do. For example,
+this code...
 
 ```python
 for pair in enumerate('hello'):
@@ -170,7 +171,7 @@ while True:
 ```
 
 The for loop version is much simpler to write and I wrote the while loop
-version just to explain what the for loop does.
+version just to show how the for loop works.
 
 ## Converting to iterators
 
@@ -282,13 +283,15 @@ Let's try out our thingy function and see how it works.
 ```
 
 What the heck? We don't return anything from the function, but it still
-doesn't return None! Putting a `yield` anywhere in a function makes it
-return **generators** instead of returning anything. **Generators are
-iterators** with some more features that we don't need to care about.
+doesn't return None!
+
+Putting a `yield` anywhere in a function makes it return **generators**.
+**Generators are iterators** with some more features that we don't need
+to care about.
 
 ![Generators.](../images/generators.png)
 
-The generator we got works just like other iterators:
+The generators that thingy gives us work just like other iterators:
 
 ```python
 >>> t = thingy()
@@ -373,10 +376,10 @@ Here's a drawing of what's going on:
 
 ![A picture of printygen.](../images/freeze-melt.png)
 
-The good news is that **usually we don't need to worry about when the
-parts between the yields run**. Actually we don't even need to use
-`iter()` or `next()` most of the time, but I think it's nice to know how
-for loops work.
+The good news is that **usually we don't need to worry about when
+exactly the parts between the yields run**. Actually we don't even need
+to use `iter()` and `next()` most of the time, but I think it's nice to
+know how for loops work.
 
 `yield` is useful when we want the function to output so many things
 that making a list of them would be too slow or the list wouldn't fit in
@@ -426,20 +429,19 @@ number of things:
 ```
 
 [The itertools module](https://docs.python.org/3/library/itertools.html)
-contains many useful functions like this. For example,
-`itertools.count(1)` does the same thing as our `count()`.
+contains many useful things like this. For example, `itertools.count(1)`
+does the same thing as our `count()`.
 
 ## Summary
 
 - An iterable is something that we can for loop over.
 - An iterator is an iterable that remembers its position.
 - For loops create an iterator of the iterable and call its `__next__`
     method until it raises a StopIteration.
-- Functions that contain yields return generators. Iterating the
-    generator runs the function bit by bit and gives us the values it
-    yields.
-- The itertools module contains many useful functions that return
-    iterators.
+- Functions that contain yields return generators. Calling `next()` on a
+  generator runs it to the next yield and gives us the value it yielded.
+- [The itertools module](https://docs.python.org/3/library/itertools.html)
+  contains many useful iterator-related things.
 
 ***
 
diff --git a/basics/exceptions.md b/basics/exceptions.md
@@ -214,7 +214,7 @@ TypeError("unsupported operand type(s) for +: 'int' and 'str'",)
 
 ## When should we catch exceptions?
 
-Never do things like this:
+Do **not** do things like this:
 
 ```python
 try:
@@ -225,9 +225,9 @@ except Exception:
 
 There's many things that can go wrong in the `try` block. If something
 goes wrong all we have is an oops message that doesn't tell us which
-line caused the problem. This makes fixing problems a lot harder. If we
-want to catch exceptions we need to be specific about what exactly we
-want to catch and where instead of catching everything we can in the
+line caused the problem. This makes fixing the program really annoying.
+If we want to catch exceptions we need to be specific about what exactly
+we want to catch and where instead of catching everything we can in the
 whole program.
 
 There's nothing wrong with doing things like this:
@@ -311,16 +311,16 @@ Back in [the module chapter](modules.md) we learned to display error
 messages by printing to `sys.stderr` and then calling `sys.exit(1)`, so
 when should we use that and when should we raise an exception?
 
-Exceptions are meant for **programmers**, so if we are writing a module
-that other people will import we should probably use exceptions. For
-other errors (for example, if the **user** of the program has done
-something wrong) it's usually better to use `sys.stderr` and `sys.exit`.
+Exceptions are meant for **programmers**, so if we are writing something
+that other people will import we should use exceptions. If our program
+is working like it should be and the **user** has done something wrong,
+it's usually better to use `sys.stderr` and `sys.exit`.
 
 ## Exception hierarchy
 
-Exceptions are organized like this. I made this tree diagram with
-[this program](https://github.com/Akuli/classtree/) on Python 3.4. You
-may have more or less exceptions than I have if your Python is newer or
+Exceptions are organized like this. I made this tree with [this
+program](https://github.com/Akuli/classtree/) on Python 3.4. You may
+have more or less exceptions than I have if your Python is newer or
 older than mine, but they should be mostly similar.
 
     Exception
@@ -387,9 +387,9 @@ get when [processing files](files.md), and catching Exception catches
 all of these errors. You don't need to remember this tree, running
 `help('builtins')` should display a larger tree that this is a part of.
 
-There's also a few exceptions that are not in this tree like SystemExit
-and KeyboardInterrupt, but most of the time we shouldn't catch them.
-Catching Exception doesn't catch them either.
+There are also a few exceptions that are not in this tree like
+SystemExit and KeyboardInterrupt, but most of the time we shouldn't
+catch them. Catching Exception doesn't catch them either.
 
 ## Summary
 
