search

swcarpentry / DEPRECATED-bc

DEPRECATED: This repository is now frozen - please see individual lesson repositories.
Other
299 stars 383 forks source link

Change to more inclusive language & clarify. #911

Closed collingsr closed 9 years ago

collingsr commented 9 years ago

It could be argued I'm being oversensitive, but "the right solution" strikes me as unnecessarily judgmental, given the discussions happening in the mailing lists lately.

Second change is just to make the sentence more clear. This is my commit for the Instructor Training final assignment.

jiffyclub commented 9 years ago

@drio: Since you're doing the history extraction for Git would you like this PR opened against your branch?

drio commented 9 years ago

Hi @jiffyclub. Yes please, send it to my repo/master please.

drio commented 9 years ago

BTW, what is the next step here? Presumably we are going to move my repo with the git materials to the swcarpentry user? I can do that as soon as I merge your PR so new changes can be done directly against the new repo in the swcarpentry user.

gvwilson commented 9 years ago

As soon as it's ready, I'll create a fresh repo owned by swcarpentry, merge your stuff into that, and publicize - thanks.

drio commented 9 years ago

Ok @gvwilson. Once I get the PR from @jiffyclub I will merge it and let you know.

jiffyclub commented 9 years ago

@collingsr, can you open this PR again on @drio's fork? You can also wait until the repo has re-joined the Software Carpentry organization and make the change again then. But at the moment we're reorganizing where content lives and changes made to the Git material need to be coordinated with @drio's extraction.

collingsr commented 9 years ago

Made the PR on @drio's repo just now.

jiffyclub commented 9 years ago

Thanks!

drio commented 9 years ago

Thank you @collingsr and @jiffyclub. I merged your PR. @gvwilson, the repo is ready.

gvwilson commented 9 years ago

Thank you all - I've merged @drio's repo with the lesson template to create http://github.com/swcarpentry/git-novice --- can you please check the files (in the 'pages' sub-directory) and the history to make sure everything is there? @drio, do you believe this is everything now? cc @wking @r-gaia-cs

drio commented 9 years ago

On Fri, Dec 05, 2014 at 05:44:51AM -0800, Greg Wilson wrote:

@drio, do you believe this is everything now?

I just saw this post from @wking: https://github.com/swcarpentry/bc/issues/876#issuecomment-65517969. The reference and instructor-guide information are missing.

@wking, could you please send a PR to my fork with those?

rgaiacs commented 9 years ago

@gvwilson about http://github.com/swcarpentry/git-novice the history looks OK. About the files at pages directory they still in the old format that is "incompatible" with Pandoc.

gvwilson commented 9 years ago

Yup - looking for a volunteer to update the format.

wking commented 9 years ago

On Fri, Dec 05, 2014 at 06:43:16AM -0800, David Rio Deiros wrote:

I just saw this post from @wking: https://github.com/swcarpentry/bc/issues/876#issuecomment-65517969. The reference and instructor-guide information are missing.

@wking, could you please send a PR to my fork with those?

With which? I'm just extracting the shell versions of the reference and instructor guide in wking/swc-modular-shell#27. It's not particularly complicated, but figuring out where the missing commits all fit in to the extracted history taes some time. I can work on the Git reference and guide after I get done with the shell repo, but it might be faster for you to just follow my approach on the novice-git repository yourself ;). I'm happy to help if you get stuck.

drio commented 9 years ago

Sure, I'll give it a try. Unfortunately I won't be able to spend more time on this until after the holidays.