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

Port the reference to mdbook #39855

Merged
merged 25 commits into from
Feb 22, 2017
Merged

Conversation

steveklabnik
Copy link
Member

@steveklabnik steveklabnik commented Feb 15, 2017

Part of #39588.

This is only a work in progress. Still left to do:

  • double check contents weren't duplicated/lost with the move to individual pages (I'm going to do this)
  • fix up links and footnotes (@frewsxcv has volunteered to help with this)
  • change src/doc/reference.md to redirect to the book
  • move the reference on the doc index to be part of the bookshelf

@rust-highfive
Copy link
Collaborator

@steveklabnik: no appropriate reviewer found, use r? to override

@petrochenkov
Copy link
Contributor

Will it still be available as a single Ctrl+F-able page?

@steveklabnik
Copy link
Member Author

@petrochenkov IIRC the "print" view gives you that.

And, if for some reason it doesn't, fixing it in mdbook is quite possible. There's already a ticket open for actual search, for example.

@petrochenkov
Copy link
Contributor

the "print" view gives you that.

Ha, indeed. I never noticed this little icon.
Can it get a huge label "click here for a single page view"?

The reference is mostly useless in multi-page format since it's primarily used for looking up stuff by keyword. I'd really like to see it single-page by default.

There's already a ticket open for actual search, for example.

If this search is going to remind the Discource search in any way, then that ticked would better stay open.
I think, I have a better ticket to solve - actual single-page representation.

@steveklabnik
Copy link
Member Author

One wrinkle I noticed while doing this; mdbook doesn't support rustdoc's footnote syntax, which is really only used in the reference, if I recall. We'll have to handle those too.

@steveklabnik
Copy link
Member Author

@frewsxcv given https://github.com/azerupi/mdBook/issues/204 you might not want to mess with the links yet; if they change the way they're generated, you'd have to do a second pass...

@bors
Copy link
Contributor

bors commented Feb 16, 2017

☔ The latest upstream changes (presumably #39761) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabnik
Copy link
Member Author

Hm, mdbook should support footnotes, given that pulldown-cmark does: https://github.com/google/pulldown-cmark/blob/master/tests/footnotes.rs

@steveklabnik
Copy link
Member Author

I've sent in https://github.com/azerupi/mdBook/pull/207; let's see.

@steveklabnik
Copy link
Member Author

I've built this off of my PR now; we'll see what's up.

@frewsxcv if you want to work on the links, fixing these ones should be fine; they'll be much more similar and less of them will be broken.

@alexcrichton I don't know how okay we are with working with forks of projects; I know @azerupi is busy at the moment, and it's been less than a day, so I don't want to rush him; I also don't know how long we want to block on upstream issues.

@steveklabnik
Copy link
Member Author

Update, /cc @alexcrichton it looks like this is landing upstream soon, so I'll fix this up after it lands and we don't need to use my fork 😄

@alexcrichton
Copy link
Member

👍

@alexcrichton
Copy link
Member

Oh but yeah for now let's avoid github forks, let's stick to crates.io where we can

@steveklabnik
Copy link
Member Author

Status: upstream is merged but needs a crates.io release.

@steveklabnik
Copy link
Member Author

Updated mdbook PR made separately: #39966

@bors
Copy link
Contributor

bors commented Feb 20, 2017

☔ The latest upstream changes (presumably #39966) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabnik
Copy link
Member Author

Blocked on #39976

@bors
Copy link
Contributor

bors commented Feb 20, 2017

☔ The latest upstream changes (presumably #39981) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabnik
Copy link
Member Author

This is now ready to go; all we need are fixing up the links. @frewsxcv is on it! ❤️

@steveklabnik
Copy link
Member Author

I've pushed a commit to deal with the footnotes, and opened https://github.com/azerupi/mdBook/issues/210 so we can address it upstream as well.

@steveklabnik
Copy link
Member Author

At this point, all of the links in the reference itself are updated. Still gotta do the standard library and the book...

steveklabnik and others added 3 commits February 21, 2017 14:00
This only really moves the files, there's a lot more work coming
in the next commits.

Part of rust-lang#39588.
I double checked that everything is here and in the correct order; this fixes things up
@steveklabnik
Copy link
Member Author

This should now be good to go! 😄

/cc @rust-lang/docs

@steveklabnik
Copy link
Member Author

Given that both @frewsxcv and I worked on this, I guess

r? @GuillaumeGomez ❤️

@GuillaumeGomez
Copy link
Member

Seems all good to me (that was quite the review...). Thanks to both of you!

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 21, 2017

📌 Commit 55c02f6 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Feb 21, 2017

⌛ Testing commit 55c02f6 with merge fc6f092...

bors added a commit that referenced this pull request Feb 21, 2017
Port the reference to mdbook

Part of #39588.

This is only a work in progress. Still left to do:

- [x] double check contents weren't duplicated/lost with the move to individual pages (I'm going to do this)
- [x] fix up links [and footnotes](#39855 (comment)) (@frewsxcv has volunteered to help with this)
- [x] change `src/doc/reference.md` to redirect to the book
- [x] move the reference on the doc index to be part of the bookshelf
@bors
Copy link
Contributor

bors commented Feb 22, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing fc6f092 to master...

@bors bors merged commit 55c02f6 into rust-lang:master Feb 22, 2017
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants