Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy-editing of the English version #797

Merged
merged 16 commits into from
Aug 23, 2016
Merged

Copy-editing of the English version #797

merged 16 commits into from
Aug 23, 2016

Conversation

logological
Copy link
Contributor

@logological logological commented Jun 21, 2016

This pull request includes copy-editing for English language issues (fixing grammar, punctuation, unidiomatic language, etc.). This includes instances of Issue DjangoGirls/tutorial/#793.

@logological logological changed the title Copy-editing up to and including "Your first Django project!" Copy-editing up to and including "Django models" Jun 21, 2016
@logological logological changed the title Copy-editing up to and including "Django models" Copy-editing up to and including "Deploy!" Jun 21, 2016
@aniav
Copy link
Member

aniav commented Jun 21, 2016

Just a note for future, if you happen to change code in some way it would be nice if you could also change its formatting from indentation to fencing. Gitbook prefers this type of markdown code embeding ;)

@logological
Copy link
Contributor Author

OK, I can do that!

@logological
Copy link
Contributor Author

Anna, since I'm going through the entire tutorial, are there any other wide-ranging issues you'd like me to keep an eye out for? Might as well fix them all at once than make several passes. :)

@aniav
Copy link
Member

aniav commented Jun 22, 2016

@logological I recall only #375 as a wider thing, but I am not on top of all the issues currently open. Some discussions also appear on our slack, maybe you would like me to invite you there? :)

@logological
Copy link
Contributor Author

Sure, that would be fine. I expect you still have my e-mail address…?

@aniav
Copy link
Member

aniav commented Jun 22, 2016

Of course, invitation sent :D

@logological logological changed the title Copy-editing up to and including "Deploy!" Copy-editing of the English version Jun 24, 2016
@aniav
Copy link
Member

aniav commented Jul 4, 2016

@logological give us a sign when you will want this to be merged :)

@logological
Copy link
Contributor Author

I think we can do the merge as soon as I've finished copy-editing all the files. Once I've done that, should I merge changes from master into this branch and resolve the conflicts myself? I'm not sure what the etiquette is for this sort of thing, and of course don't want to cause you any extra work.

@aniav
Copy link
Member

aniav commented Jul 6, 2016

I think until now we asked to resolve the conflicts, but if the PR was hanging for too long afterwards we were resolving them on our side just to keep things clean. So please do resolve the conflicts if that's no problem :)

@logological
Copy link
Contributor Author

OK, finished copy-editing and have resolved conflicts with the current master. @aniav, please take a look at the pull request and, if you're satisfied with the changes, feel free to merge it into your master branch.

Sorry for taking so long; I had a lot of holidays and business trips the last few weeks so I got distracted. :)

@aniav aniav merged commit 1ac6ba2 into DjangoGirls:master Aug 23, 2016
@aniav
Copy link
Member

aniav commented Aug 23, 2016

Whooow this was a lot of reading and updating. This is awesome! 🎉 🍰 👍

@logological logological deleted the copyediting branch August 23, 2016 19:41
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.

None yet

2 participants