Skip to content

Bowling: wrap paragraphs and fix some minor grammar#909

Merged
Insti merged 1 commit intoexercism:masterfrom
shaleh:bowling-text
Oct 1, 2017
Merged

Bowling: wrap paragraphs and fix some minor grammar#909
Insti merged 1 commit intoexercism:masterfrom
shaleh:bowling-text

Conversation

@shaleh
Copy link
Copy Markdown

@shaleh shaleh commented Sep 21, 2017

The paragraphs rambled without newlines. They are now line wrapped to match
the other exercises.

There was a missing article 'a' in the beginning. The phrasing "after the
throw" is a little confusing. Does this mean either the 2nd or 3rd throws?
No, it means they are knocked down by THIS throw. Update accordingly.

The paragraphs rambled without newlines. They are now line wrapped to match
the other exercises.

There was a missing article 'a' in the beginning. The phrasing "after the
throw" is a little confusing. Does this mean either the 2nd or 3rd throws?
No, it means they are knocked down by THIS throw. Update accordingly.
@Insti
Copy link
Copy Markdown
Contributor

Insti commented Sep 21, 2017

Looks good.

Another minor git commit tip; when you are changing content and formatting try and do each step as a separate commit, so that is easier for the reviewer to see the changes in the diff. It was difficult for me to find the 'after the throw' change as it was hidden among the line reformatting. If they were more commits it would be hopefully easier to find the important differences.

@shaleh
Copy link
Copy Markdown
Author

shaleh commented Sep 21, 2017

Will do. Thanks.

@Insti Insti merged commit 45f9fb3 into exercism:master Oct 1, 2017
@Insti
Copy link
Copy Markdown
Contributor

Insti commented Oct 1, 2017

Thanks @shaleh ❤️

@petertseng
Copy link
Copy Markdown
Member

I must import this as two commits, not one. The grammar change must go as its separate commit. Here is --word-diff of the changes without the wrapping:

diff --git a/exercises/bowling/description.md b/exercises/bowling/description.md
index 450844e..d619f8e 100644
--- a/exercises/bowling/description.md
+++ b/exercises/bowling/description.md
@@ -1,6 +1,6 @@
Score a bowling game.

Bowling is {+a+} game where players roll a heavy ball to knock down pins
arranged in a triangle. Write code to keep track of the score
of a game of bowling.

@@ -10,9 +10,9 @@ The game consists of 10 frames. A frame is composed of one or two ball throws wi

* An open frame is where a score of less than 10 is recorded for the frame. In this case the score for the frame is the number of pins knocked down.

* A spare is where all ten pins are knocked down [-after-]{+by+} the second throw. The total value of a spare is 10 plus the number of pins knocked down in their next throw.

* A strike is where all ten pins are knocked down [-after-]{+by+} the first throw. The total value of a strike is 10 plus the number of pins knocked down in [-their-]{+the+} next two throws. If a strike is immediately followed by a second strike, then[-we can not total-] the value of {+the+} first strike {+cannot be determined+} until[-they throw-] the ball {+is thrown+} one more time.

Here is a three frame example:

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.

4 participants