Closed ctjacobs closed 10 years ago
Partially addresses issue #555.
@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.
No problem. I'll take a look at this next week.
@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.
Could you replace the two images at the begin of the lesson with "raw text"?
@ctjacobs Thanks very much for your contribution. Just a few more things that I want to be change before we merge your PR.
##
with ###
?novice/shell/01-filedir.md
)?novice/shell/01-filedir.md
)?Please let me know when you make the changes.
@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.
@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.
@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.
Great - thanks. I have squashed the commits.
Improvements to the Introduction and Simple Patterns sections of intermediate/regex.
Main changes: