Skip to content

Conversation

rpjday
Copy link

@rpjday rpjday commented Jun 6, 2018

Stylistic/aesthetic adjustments, including:

  • use "--" for em-style dashes, not special characters
  • remove superfluous Oxford comma
  • add some commas where they're warranted
  • expand on the "git config" options

Signed-off-by: Robert P. J. Day rpjday@crashcourse.ca

Stylistic/aesthetic adjustments, including:

 - use "--" for em-style dashes, not special characters
 - remove superfluous Oxford comma
 - add some commas where they're warranted
 - expand on the "git config" options

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
@lazarljubenovic
Copy link
Contributor

remove superfluous Oxford comma

Do we have a standard for this in the book? This is a change which could be ping-ponged between two groups of users until the end of time.

@rpjday
Copy link
Author

rpjday commented Jun 6, 2018

I typically wouldn't submit a pull request for just that, but since there was other stuff being changed, I snuck it in. The standard I've seen (and used) for a while is that the Oxford comma is not used unless it actually clarifies the expression, which would be ambiguous otherwise. I like this explanation. But if Ben wants to toss it, he has my blessing.

@nobozo
Copy link
Contributor

nobozo commented Jun 6, 2018 via email

The next major issue that people encounter is that they need to collaborate with developers on other systems.
To deal with this problem, Centralized Version Control Systems (CVCSs) were developed.
These systems, such as CVS, Subversion, and Perforce, have a single server that contains all the versioned files, and a number of clients that check out files from that central place. (((CVS)))(((Subversion)))(((Perforce)))
These systems, such as CVS, Subversion and Perforce, have a single server that contains all the versioned files, and a number of clients that check out files from that central place. (((CVS)))(((Subversion)))(((Perforce)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, it seems like the liberal sprinkling of commas is doing us all a disservice. What if we repunctuate to something like this:

These systems (such as CVS, Subversion, and Perforce) have a single server that contains all the versioned files, and a number of clients that check out files from that central place.

That way it gets more readable AND I get to keep my Oxford comma. 😁

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with whatever you decide. Tweak the pull request, I'm in the middle of more wide-sweeping changes. :-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly I cannot push to your fork. :(

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I'll resubmit with that change. (I thought I checked the box that lets you edit my pull requests, is that not what that means?)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, I was making that way harder than I needed to. 😊

@ben ben merged commit 72d3d52 into progit:master Jun 7, 2018
@rpjday rpjday deleted the intro branch June 7, 2018 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants