Added example multi-line indented block

[wltrimbl]

Additionally, added sentences introducing the loops through zip() and iter()

This responds to student confusion about where the if statement ends.

[ahmadia]

is not equal to 0, 1, or 2?

Since we're being very careful here :)

[rgaiacs]

@wltrimbl Nice PR. After you take a look in the comments I will review it again.

[wltrimbl]

I addressed all the minor points except the spelling of the plural of index and line wrapping convention, and have revised the line that implied that indented blocks were only for conditionals. Thanks all for the editing comments.

[rgaiacs]

Did you forget something in "there maybe as many elif statements"?

[rgaiacs]

@wltrimbl Good work based in the previous review. I add some minor comments but want to see others comment about the paragraph about indentation (line 336) before approve this PR.

[ahmadia]

@wltrimbl - apologies, but this needs to be rebased :(

[wltrimbl]

Rebase attempted:
git checkout gh-pages
git pull upstream gh-pages
git checkout thw-indentedcblock
git rebase gh-pages
#resolved conflicts
git push wltrimbl +thw-indentedcblock # force update of rebased branch
This branch is 3 commits ahead and 0 commits behind gh-pages.

[gvwilson]

I vote for merging this, then incorporating it into python/intermediate (if @ethanwhite agrees). Any votes again?

[ahmadia]

I'd suggest we review the rebased material before merging.

[wltrimbl]

Scrutinzing this line-by-line, I find that I have spell-corrected (which is to say, corrupted) one of the instructor's names.

There are also one or a few instances of function() and .method() , which violate @gwilson's style guide. I half-heartedly intend to remove the empty parentheses from the functions but not the methods.

[ahmadia]

Errr, we have a style guide?

[wltrimbl]

To summarize:
This PR

• adds an explicit example of an if statement with more than one print statement in its block
• adds line describing the data type returned by range
• adds lines describing the data types returned by zip and items
• clarifies text defining behavior of break and continue
• spelling and minor orthographic tweaks

This PR does not introduce new content (TM)

[wltrimbl]

By style guide I mean style guidance: the notes in PR #71 on consistency between using function(3) and not calling it function() in the text.

Any objections to merging?

[ahmadia]

This can't be merged automatically, I'm bringing it in by hand.