Improvements to intermediate/regex

swcarpentry / DEPRECATED-bc

DEPRECATED: This repository is now frozen - please see individual lesson repositories.

Other

299 stars 383 forks source link

Improvements to intermediate/regex #569

Closed ctjacobs closed 10 years ago

ctjacobs commented 10 years ago

Improvements to the Introduction and Simple Patterns sections of intermediate/regex.

Main changes:

Fixed the links to other sections and the Glossary.
Added files containing the 'evil' data to data/evil.
Created some exercises for the Simple Patterns section.
Corrected a few typos and made some paragraphs clearer.
Split up the Simple Patterns section into subsections.
Headers have been added to each Markdown file, and the intermediate/regex section has been added to the Makefile.
Added an index page.

ctjacobs commented 10 years ago

Partially addresses issue #555.

rgaiacs commented 10 years ago

@ctjacobs I'm very sorry that I duplicated some of the changes you address in this PR at #618. Please rebase this PR and leave me a note to review this PR.

ctjacobs commented 10 years ago

No problem. I'll take a look at this next week.

ctjacobs commented 10 years ago

@r-gaia-cs: I've now rebased this pull request.

@danmaclean: Thanks for your comments. For some reason they are no longer being displayed, but I think I have addressed them all now.

Please take a look at the diff and let me know if you're happy with the changes.

rgaiacs commented 10 years ago

Could you replace the two images at the begin of the lesson with "raw text"?

rgaiacs commented 10 years ago

@ctjacobs Thanks very much for your contribution. Just a few more things that I want to be change before we merge your PR.

Could you replace ## with ###?
Could you replace the "Summary" section with the "Key Points" block (for one example see the end of novice/shell/01-filedir.md)?
Could you replace the "Exercises" section with "Challenge" blocks (for examples see the end of novice/shell/01-filedir.md)?

Please let me know when you make the changes.

danmaclean commented 10 years ago

@r-gaia-cs Are you sure about switching the images back to "raw text"? The original had them as text, but a TODO at the start of the branch wanted them as images. Not sure I should undo that TODO.

rgaiacs commented 10 years ago

@r-gaia-cs Are you sure about switching the images back to "raw text"? The original had them as text, but a TODO at the start of the branch wanted them as images. Not sure I should undo that TODO.

OK. Ignore this.

rgaiacs commented 10 years ago

@ctjacobs This looks good to me and ready to be merge. If you allow me one last request before merge, could you squash this commits?

$ cd bc
$ git checkout creating-lesson-on-regular-expressions
$ git rebase -i swc/master
$ git push -f origin creating-lesson-on-regular-expressions

swc is the nickname that I use for https://github.com/swcarpentry/bc.git in my machine.

After the rebase command, git will open your test editor with all your commit that are going to me merge in this PR. Except for the first line you can replace pick with squash, save the file, close your editor, save the new commit message and close your editor again. Here you will find a nice explanation about rebase and if you need any help just send me a email.

ctjacobs commented 10 years ago

Great - thanks. I have squashed the commits.