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

new doc city #11906

Merged
merged 4 commits into from
Jun 28, 2015
Merged

new doc city #11906

merged 4 commits into from
Jun 28, 2015

Conversation

StefanKarpinski
Copy link
Member

The epic transition from old doc system to new.

Current doc generation process generates a ReStructured text format
helpdb.jl file that is loaded when building Julia. The new doc system
will grab docstrings while building Julia and use those to generate
parts of the manual -- currently in ReStructured text, but in the
future in Markdown format.

As a step towards that, this script generates the new Markdown index
from the old ReStructured text index. You can run it as:

    julia doc/newdoc.jl
    julia doc/markdown.jl
    mv base/docs/helpdb{2,}.jl
    julia doc/coalesce.jl
The next piece of the doc up date is a script that uses help info
picked up from base/docs/helpdb.jl while building julia, to make a
new standard library. Currently, we merge the docs for all methods
into a single blob which gets included at every point where *any*
method of the function was documented previously. This is a bit
confusing but isn't the end of the world while we migrate to a new
way of generating our manual. The script can be run as:

    julia doc/genstdlib.jl

From this, you can do

	make -C doc helpdb.jl

This regenerates the old help index from the new generated manual,
allowing you to compare them. The diff is essentially all additions
so we didn't delete any essential documentation.
StefanKarpinski added a commit that referenced this pull request Jun 28, 2015
@StefanKarpinski StefanKarpinski merged commit bebae84 into master Jun 28, 2015
@StefanKarpinski StefanKarpinski deleted the sk/new-doc-city branch June 28, 2015 05:38
@tkelman
Copy link
Contributor

tkelman commented Jun 28, 2015

broken on windows, will see if I can fix it before it claims too many pr's

issig(md) = isa(md, Markdown.Code) && length(split(md.code, "\n")) == 1

function splitsig(md)
md = flatten(md)
Copy link
Contributor

Choose a reason for hiding this comment

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

still nonstandard formatting on this file

@tkelman
Copy link
Contributor

tkelman commented Jun 28, 2015

temporary fix for windows in fb10927

This broke inline code quoting, cross-references, and tables. And there was some major data loss in math.rst. The citations in linalg.rst may also be a little off now.

@tkelman tkelman added the docs This change adds or pertains to documentation label Jun 28, 2015
@StefanKarpinski StefanKarpinski added docsystem The documentation building system and removed docs This change adds or pertains to documentation labels Jun 28, 2015
@StefanKarpinski
Copy link
Member Author

@tkelman, thanks for the careful review of this ridiculously large patch. What's the nature of the breakage on Windows? Maybe @one-more-minute or I can help fix it.

@tkelman
Copy link
Contributor

tkelman commented Jun 28, 2015

MS_ASYNC was set inside a @unix_only block, so the documentation for it failed with an undefined variable error. fb10927 is my workaround.

@StefanKarpinski
Copy link
Member Author

Ah, got it. That actually seems like a fine fix to me. No harm having the constants defined on all platforms.

@hayd
Copy link
Member

hayd commented Jun 28, 2015

Are you using " rather than ```` throughout here? Doesn't that mean we can no parse these as code??

@MikeInnes
Copy link
Member

Unfortunately that was due to the help system which produced the original helpdb.jl. There's not much we can do about this automatically, I don't think, but it won't be any worse than it was before at least.

@hayd
Copy link
Member

hayd commented Jun 28, 2015

@one-more-minute Before I was able to convert from rst to markdown and these code blocks parsed perfectly (using pypandoc). Does this mean that's no longer possible? or is this only in the generated rsts? (I'm a little confused at what's now generated tbh).

@MichaelHatherly
Copy link
Member

The " quoting of code spans isn't too bad and are still readable. From a brief scan of the standard library the worst hit are probably Linear Algebra and Dates. Pkg is already converted in #11912. With a couple of people getting the rest moved shouldn't take too long :)

@hayd
Copy link
Member

hayd commented Jun 28, 2015

My question is not so much about readability, but later converting to markdown ```... I'd already done some work doing this automatically so I confused why this bit's an issue (rst -> markdown).

The other question is what (else) has been lost in this... though it's already merged :/

@tkelman
Copy link
Contributor

tkelman commented Jun 28, 2015

Skim through and see if you can catch anything I missed. I think linalg was the only doc file that github wouldn't show the diff on, I had to look at that locally.

.. function:: eye(A)
::

eye(A)
Copy link
Member

Choose a reason for hiding this comment

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

These eye's are repeated.

@jiahao
Copy link
Member

jiahao commented Jun 29, 2015

I'm really displeased that this was merged so soon without the opportunity of proper reviewing. We would never have merged a PR that touched so much code without scrutiny, and the fact that this was merged with so many formatting issues speaks volumes about the second-class nature of documentation in this project.

@MikeInnes
Copy link
Member

Once I've fixed this stuff tomorrow I'll put up the diff from the original docs and make sure everyone's happy with the overall changes.

@jiahao
Copy link
Member

jiahao commented Jun 29, 2015

The documentation for eigs and svds is also all fucked up. The *-delimited lists of parameters are now a giant mess. 👎

@jiahao
Copy link
Member

jiahao commented Jun 29, 2015

Honestly I feel that the hasty merger of this PR is a giant slap in the face for all the people who have put effort into writing the docs.

MikeInnes added a commit that referenced this pull request Jun 29, 2015
This reverts commit bebae84, reversing
changes made to 070d356.
@ViralBShah
Copy link
Member

I don't think the choice of language is appropriate, however upset you may be. Also, it is just git and everything can be reverted or regenerated.

@jiahao
Copy link
Member

jiahao commented Jun 29, 2015

I stand by my comments, no matter what tone you choose to read from them. I put in a lot of the information that was broken or lost. I warned people that it was easy to lose this information. Then it all happened anyway. But now that the bulk of this PR has been reverted, I shan't say any more.

@hayd
Copy link
Member

hayd commented Jun 29, 2015

It's also worth mentioning that this PR was a rebase (?) of #11828, which still had some unaddressed comments on the diff (e.g. eye being repeated) that remained unaddressed here.

KristofferC pushed a commit to KristofferC/julia that referenced this pull request Jun 30, 2015
…city"

This reverts commit bebae84, reversing
changes made to 070d356.
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.

8 participants