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

More doc fixes #3521

Merged
merged 2 commits into from Sep 16, 2014
Merged

More doc fixes #3521

merged 2 commits into from Sep 16, 2014

Conversation

jenshnielsen
Copy link
Member

Fix a couple of more Sphinx errors in the doc build

@@ -1014,12 +1014,12 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,

Keyword arguments may include the following (with defaults):

location : [`None`|'left'|'right'|'top'|'bottom']
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is being interpreted as a link to no where.

@tacaswell
Copy link
Member

Great, I will merge this as soon as travis comes back.

@tacaswell tacaswell added this to the v1.4.1 milestone Sep 16, 2014
@jenshnielsen
Copy link
Member Author

@tacaswell thanks. This as well as the last one is against the 1.4 doc branch since is fixes docs issues but doesn't change anything. Are you planing to merge the doc branch into 1.4.x or should this be cherrypicked onto 1.4.x?

@tacaswell
Copy link
Member

Every so often I do a cascading merge (1.4.0-doc -> 1.4.x -> master) and use cherry-picking to pull commits the other way.

tacaswell added a commit that referenced this pull request Sep 16, 2014
@tacaswell tacaswell merged commit 592ac13 into matplotlib:v1.4.0-doc Sep 16, 2014
@jenshnielsen
Copy link
Member Author

Great. I was just unsure since there are some workaround notes on the doc branch which I guess should not go forward since they will not be relevant for the next release.

@tacaswell
Copy link
Member

One of the times I did the cascade merge I edited those on 1.4.x before merging to master (I think).

@jenshnielsen jenshnielsen deleted the more_doc_fixes branch September 19, 2014 09:08
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.

None yet

2 participants