Typo at perlfaq8 #78

joaquinferrero · 2019-02-26T15:19:52Z

No description provided.

I propose: "no files..." => "with files..."

Typo: from => From

<.> => C<.>

Lost the 'C' pod mark

karenetheridge · 2019-02-26T17:26:13Z

Please could you rebase that to remove the merge commits, and collapse like changes together?

joaquinferrero · 2019-02-26T20:32:05Z

Sorry, Karen, but... I don't know how I can to rebase this mess. Any tip?

karenetheridge · 2019-02-26T22:31:06Z

Make sure you've got the updated master pulled down, then check out your branch and git rebase master. Then force-push back up to github and the pull request will automatically update. If you're not used to rebasing, I suggest checking out some tutorials - interactive rebasing in particular is really awesome, and I rely on it heavily when developing in multiple branches at once.

This reverts commit 7b2480c.

This reverts commit 9f41196.

This reverts commit bb8f5ce.

This reverts commit 4e5f86f.

This reverts commit fe1bb56.

This reverts commit ea03a80.

This reverts commit 2b82980.

karenetheridge

It looks like most of the other changes in this pull request are now reversions of previous fixes, so I won't comment on each one. Could you please fix, and rebase?

Please look up how to do an interactive rebase, and squash all the similar commits together, on top of the upstream master branch. It should be a lot more clear then what changes you intend to make now, and the inadvertent reversions should disappear.

karenetheridge · 2019-02-27T17:18:17Z

lib/perlfaq6.pod

@@ -114,7 +114,7 @@ be mangled by many mailers):
    $/ = '';          # read in whole paragraph, not just one line
    while ( <> ) {
        while ( /^From /gm ) { # /m makes ^ match next to \n
-        print "leading From in paragraph $.\n";
+        print "leading from in paragraph $.\n";


The text being matched is "From", so it was correct before.

karenetheridge · 2019-02-27T17:18:41Z

lib/perlfaq5.pod

@@ -1539,7 +1539,7 @@ a similar interface, but does the traversal for you too:
 (contributed by brian d foy)

 If you have an empty directory, you can use Perl's built-in C<rmdir>.
-If the directory is not empty (so, with files or subdirectories), you
+If the directory is not empty (so, no files or subdirectories), you


This was just corrected (by you) in commit 9f41196. Why is it being reverted again?

Sorry, Karen. I mess all this pull.. Sorry. I will try to repair it.

Karen, Can you remove all these commits/branch? Next, I can to resend all the changes into a new pull request.

No, you can fix it all yourself in this branch. https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History This is a very important skill to learn.

Maybe the problem that I edited & pulled the changes with github only. I don't have a cloned git repository of perlfaq at my computer. I use the option of github of "edit this file" (in other words, fork the perlfaq repository, edit file(s), create pull request, all within github web pages).

This reverts commit 9a02069.

This reverts commit 6760535.

This reverts commit e91649c.

This reverts commit d277b89.

This reverts commit 365be0d.

This reverts commit 82bb5d0.

karenetheridge · 2019-02-28T17:25:37Z

To rebase, this is what I would do:

start in the master branch. git checkout master
you made your changes right in master (not a good idea); let's move them to their own branch. git checkout -b jf/typos
make sure that the latest changes from upstream are pulled down (you should have this remote already, but probably named something else.) git checkout master; git remote add upstream [email protected]:perl-doc-cats/perlfaq.git; git reset --hard upstream/master
go into your pull request branch and bring the commits from master into it, and clean them up. git checkout jf/typos; git rebase -i master
this is where the tutorial comes in. you are now in an editor and you can move around your commits, squash them together, etc. I suspect that they should all be collapsed together into one commit, but I haven't looked closely. To do that, change all lines but the first from pick to squash, and save/exit the editor. Now you're in the editor for the commit message - edit all the text down to something short and descriptive, like 'fix typos'. Save/quit.
use git log --oneline --graph --decorate and git log -p to confirm that you are up-to-date with master, there are no merge commits remaining, and your desired changes are still there.
when ready, git push -u origin jf/typos, and come to this pull request and edit the branch that the pull request comes from. Never use master for pull requests - it makes it harder to manage multiple changes at once!

karenetheridge · 2019-03-07T00:01:32Z

Ok. I rebased it locally and then merged it. thanks!

* fix bad pod markup in perlfaq8 (PR #78; thanks, Joaquín Ferrero!) * remove stale section about lib.pm (PR #82, Dan Book) * update perlfaq9 to reference Email::Stuffer (PR #79, Dan Book) * update perlfaq9 to reference URL::Search (PR #80, Dan Book) * update perlfaq9 to use HTTP::Tiny (PR #81, Dan Book) * fix some broken links (issue #71, dctabuyz)

joaquinferrero added 10 commits October 18, 2018 15:46

Typo perlfaq5

4e219ca

I propose: "no files..." => "with files..."

Merge branch 'master' into master

c847dcd

Update perlfaq6

2b8087b

Typo: from => From

Typo tag in perfaq6.pod

168f7dc

<.> => C<.>

Quote chars in examples

a70cd06

C<> tag, and flag => modifier

b59182b

More flag => modifier

583aef9

Typos

bf0d5c2

Typo at perlfaq8

57ff22a

Lost the 'C' pod mark

Merge branch 'master' into master

99911b7

joaquinferrero added 7 commits February 27, 2019 15:30

Revert "Typos"

82bb5d0

This reverts commit 7b2480c.

Revert "Typo perlfaq5"

365be0d

This reverts commit 9f41196.

Revert "Update perlfaq6"

d277b89

This reverts commit bb8f5ce.

Revert "Quote chars in examples"

e91649c

This reverts commit 4e5f86f.

Revert "Typo tag in perfaq6.pod"

6760535

This reverts commit fe1bb56.

Revert "C<> tag, and flag => modifier"

9a02069

This reverts commit ea03a80.

Revert "More flag => modifier"

a1e6ba9

This reverts commit 2b82980.

karenetheridge requested changes Feb 27, 2019

View reviewed changes

joaquinferrero added 6 commits February 28, 2019 15:10

Revert "Revert "C<> tag, and flag => modifier""

20a4a6a

This reverts commit 9a02069.

Revert "Revert "Typo tag in perfaq6.pod""

be3ee52

This reverts commit 6760535.

Revert "Revert "Quote chars in examples""

67398fb

This reverts commit e91649c.

Revert "Revert "Update perlfaq6""

c808ed7

This reverts commit d277b89.

Revert "Revert "Typo perlfaq5""

f517f20

This reverts commit 365be0d.

Revert "Revert "Typos""

a9e2b0e

This reverts commit 82bb5d0.

karenetheridge closed this Mar 7, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Typo at perlfaq8 #78

Typo at perlfaq8 #78

joaquinferrero commented Feb 26, 2019

karenetheridge commented Feb 26, 2019

joaquinferrero commented Feb 26, 2019

karenetheridge commented Feb 26, 2019

karenetheridge left a comment

karenetheridge Feb 27, 2019

joaquinferrero Feb 28, 2019

karenetheridge Feb 27, 2019

joaquinferrero Feb 28, 2019

joaquinferrero Feb 28, 2019 •

edited

Loading

karenetheridge Feb 28, 2019

joaquinferrero Feb 28, 2019 •

edited

Loading

karenetheridge commented Feb 28, 2019

karenetheridge commented Mar 7, 2019

Typo at perlfaq8 #78

Typo at perlfaq8 #78

Conversation

joaquinferrero commented Feb 26, 2019

karenetheridge commented Feb 26, 2019

joaquinferrero commented Feb 26, 2019

karenetheridge commented Feb 26, 2019

karenetheridge left a comment

Choose a reason for hiding this comment

karenetheridge Feb 27, 2019

Choose a reason for hiding this comment

joaquinferrero Feb 28, 2019

Choose a reason for hiding this comment

karenetheridge Feb 27, 2019

Choose a reason for hiding this comment

joaquinferrero Feb 28, 2019

Choose a reason for hiding this comment

joaquinferrero Feb 28, 2019 • edited Loading

Choose a reason for hiding this comment

karenetheridge Feb 28, 2019

Choose a reason for hiding this comment

joaquinferrero Feb 28, 2019 • edited Loading

Choose a reason for hiding this comment

karenetheridge commented Feb 28, 2019

karenetheridge commented Mar 7, 2019

joaquinferrero Feb 28, 2019 •

edited

Loading

joaquinferrero Feb 28, 2019 •

edited

Loading