Skip to content

fixed wrong rendered changelog entry and contributor name [skip ci] - #4683

Merged
pllim merged 2 commits into
astropy:masterfrom
MSeifert04:small_docfixes
Apr 14, 2016
Merged

pllim merged 2 commits into
astropy:masterfrom
MSeifert04:small_docfixes

Conversation

@MSeifert04

Copy link
Copy Markdown
Contributor

And I also added myself as contributor. I hope that's okay.

And I really hope J. Xavier Prochaska is really Jason Xavier Prochaska. Is there any way to find out for sure? I googled for a while and found no GitHub name but some homepages (probably) about him calling him "Jason"

Also added myself as contributor [skip ci]
@pllim pllim added the Docs label Mar 11, 2016
@MSeifert04

Copy link
Copy Markdown
Contributor Author

Should I remove the change regarding J. Xavier Prochaska so this PR can be merged? Or is there anything controversial?

@pllim

pllim commented Apr 13, 2016

Copy link
Copy Markdown
Member

IMHO, if there is no way to verify for sure that J stands for Jason, it is best to keep it as-is.

@MSeifert04

Copy link
Copy Markdown
Contributor Author

@pllim Ok I've reverted that change. Should I add an issue about it or is there another way to keep sphinx from rendering his initial J. as the start of a list?

@pllim

pllim commented Apr 13, 2016

Copy link
Copy Markdown
Member

Ah, I see the problem now. I fixed it in #4777.

@pllim

pllim commented Apr 13, 2016

Copy link
Copy Markdown
Member

Thanks, @MSeifert04 . I think this is okay to merge, but I am not sure how to milestone it (1.0.10 or 1.1.3), so I am leaving this open until someone can comment on the correct milestone to use.

@MSeifert04

Copy link
Copy Markdown
Contributor Author

@pllim You could have just told me how to fix it. 😄 This won't cause merge conflicts?

@bsipocz

bsipocz commented Apr 13, 2016

Copy link
Copy Markdown
Member

@MSeifert04 - You can see if it conflicts here: the green check above the comment box changes to a grey one. (But it didn't, so there isn't any conflict.)

@MSeifert04

Copy link
Copy Markdown
Contributor Author

@bsipocz Thank you. I always had the impression this just determines if there are conflicts with the current master not with other (unmerged) PRs. Thank you for the clarification.

@bsipocz

bsipocz commented Apr 13, 2016

Copy link
Copy Markdown
Member

Ohh, sorry you're right. I somehow assumed that the other PR is already merged...

@pllim

pllim commented Apr 13, 2016

Copy link
Copy Markdown
Member

We can always merge this one first and I'll resolve any conflict on the other one. ;)

@pllim

pllim commented Apr 14, 2016

Copy link
Copy Markdown
Member

That PR was just me being lazy. I was experimenting with a fix, found it, and just pushed it out as PR. If you use that fix here, I'll just close mine. I apologize for any inconvenience caused.

@MSeifert04

Copy link
Copy Markdown
Contributor Author

@pllim No problem. I was just surprised.

@pllim pllim added this to the v1.1.3 milestone Apr 14, 2016
@pllim

pllim commented Apr 14, 2016

Copy link
Copy Markdown
Member

This looks uncontroversial enough, especially given that you're listed as contributor No. 24 in ranking as of this morning. I'm just going to merge this. If someone thinks I tagged the wrong milestone, feel free to change it.

@pllim
pllim merged commit b7989c7 into astropy:master Apr 14, 2016
@MSeifert04
MSeifert04 deleted the small_docfixes branch April 18, 2016 20:38
@astrofrog astrofrog mentioned this pull request May 17, 2016
2 tasks done
@astrofrog astrofrog modified the milestones: v1.2.0, v1.1.3 May 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants