Note that I could still use some help with this. The longer it takes for me to get these doc fixes into a pull request, the more merge problems we’ll have (unless doc changes aren’t happening very often).
To summarize, I have all of these changes not yet checked in, on my “docfixes” branch. I obviously have to check in the changes to my branch. I assume I do NOT have to push those changes to github at this point. When I look at the “rebase” option in the Egit Eclipse plugin, there are top-level choices of “Local” and “Remote Tracking”. In the “Local” list is my “docfixes” branch, along with “master”. The “Remote Tracking” list has many “origin/...” branches, but one of the ones in the list is “origin/master”. I imagine I have to select either the “Local master” or the “origin/master”, but I’m not sure which. At that point I believe that I will have a set of changes that I should push to my github repo, and then I can create a PR from that. From: KARR, DAVID Sent: Friday, July 25, 2014 10:53 AM To: dev@gradle.codehaus.org Subject: RE: [gradle-dev] Question about phrase in userguide doc From: Daz DeBoer [mailto:darrell.deb...@gradleware.com] Sent: Friday, July 25, 2014 10:34 AM To: dev@gradle.codehaus.org<mailto:dev@gradle.codehaus.org> Subject: Re: [gradle-dev] Question about phrase in userguide doc On Thu, Jul 24, 2014 at 5:36 PM, KARR, DAVID <dk0...@att.com<mailto:dk0...@att.com>> wrote: I finally finished the complete proofreading run through of the user guide. This is a summary of what I fixed: • Minor typos, wordos, and small display problems in almost every chapter. • Too long lines in many code samples. • Some incorrect double quotes (changed from the plain one to the left and right quotes). • There were only a few places that I changed real content, either adding more explicit statements or rewording phrases. • Because of formatting problems with things like “literal” (not respecting display line length) I ended up rephrasing many statements, hopefully more clearly, but towards the goal of repositioning the “literal” strings so they didn’t wrap off the end of the line. I gave up on many of these if I found it would be too much reformatting to get a good result. You might have noticed the several questions I posted on the forum, those were the real content-related issues. The question is, what should I do now? Normally I would just check all of this in and submit a pull request. I just did a count, and there are 130 files modified. Is that going to be a problem? Yes, a pull request is the correct way to provide these changes. Please ensure that you rebase against the latest version before submitting. Ok. As I haven’t yet been GSL (Git as a second language) certified, I could use more explicit steps. Should I first commit the changes to my local repo and then push upstream (still on my branch)? I’m currently working on my “docfixes” branch. Would I rebase it to the “master” branch? I would assume I would then build the doc and view the result for any obvious issues. I can run the “integTest”, but as that’s currently failing for unknown reasons (another thread talking about this), I can really only verify that it’s failing in apparently the same way it was before. From: Szczepan Faber [mailto:szczepan.fa...@gradleware.com<mailto:szczepan.fa...@gradleware.com>] Sent: Thursday, July 03, 2014 3:14 PM To: dev@gradle.codehaus.org<mailto:dev@gradle.codehaus.org> Subject: Re: [gradle-dev] Question about phrase in userguide doc I think only 3 words are really important in this sentence: "groovy", "productivity" and "fun". Hope that helps :) Thanks for helping out with the user guide! On Thu, Jul 3, 2014 at 11:52 PM, KARR, DAVID <dk0...@att.com<mailto:dk0...@att.com>> wrote: I'm planning on reading and proofreading the user guide, and submitting the changes in a PR. I've found a few typos and wordos in just the first few pages. Usually, I find it obvious what the person meant, and can suggest a better wording. However, sometimes I just can't parse what they were trying to say. I found one of those ungrokable statements in the "overview" section, which says: "Only by that using Groovy is the fun and productivity gain it can be." If I'm reading the history correctly, it looks like Hans wrote this more than 4 years ago. If Hans isn't around, can someone interpret what he was trying to say here? --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email -- Szczepan Faber Principal engineer@gradle; Founder@mockito -- Darrell (Daz) DeBoer http://www.gradleware.com<http://www.gradleware.com/>
