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

Avoid redefining documented definitions #14765

Merged
merged 1 commit into from
Jan 23, 2016

Conversation

MichaelHatherly
Copy link
Member

Fixes issue mentioned in #14759. Both multidoc and __doc__! did not take into account the define flag which results in them overwriting definitions during base image generation.

(@JeffBezanson, just noticed after pushing that you've already pushed a fix for this. Feel free to close this / pull this into your branch / merge separately.)

Fixes issue mentioned in JuliaLang#14759. Both `multidoc` and `__doc__!` did
not take into account the `define` flag which results in them overwriting
definitions during base image generation.
@MichaelHatherly MichaelHatherly added the docsystem The documentation building system label Jan 22, 2016
@JeffBezanson
Copy link
Member

Thanks. I didn't handle the multidoc case, so we should probably go with this.

@MichaelHatherly
Copy link
Member Author

Ok, sure. Would you like me to open a pr against jb/overwritten or just merge as is once green?

@JeffBezanson
Copy link
Member

Let's just merge this when green.

JeffBezanson added a commit that referenced this pull request Jan 23, 2016
@JeffBezanson JeffBezanson merged commit e40b66c into JuliaLang:master Jan 23, 2016
@MichaelHatherly MichaelHatherly deleted the mh/docs-avoid-redefs branch January 23, 2016 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docsystem The documentation building system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants