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

Delete the old docs, lift up the new #4904

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Conversation

alexcrichton
Copy link
Member

This commit deletes the old documentation now that the "official source" is the
main book. The book is now lifted up directly into src/doc instead of
src/doc/book.

The CI no longer builds documentation and has been updated to just run mdbook to
make sure there's no errors. The documentation will actually get published in
the rust-lang/rust repo

This commit deletes the old documentation now that the "official source" is the
main book. The book is now lifted up directly into `src/doc` instead of
`src/doc/book`.

The CI no longer builds documentation and has been updated to just run mdbook to
make sure there's no errors. The documentation will actually get published in
the rust-lang/rust repo
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 5, 2018

📌 Commit 1271bb4 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jan 5, 2018

⌛ Testing commit 1271bb4 with merge a44612f...

bors added a commit that referenced this pull request Jan 5, 2018
Delete the old docs, lift up the new

This commit deletes the old documentation now that the "official source" is the
main book. The book is now lifted up directly into `src/doc` instead of
`src/doc/book`.

The CI no longer builds documentation and has been updated to just run mdbook to
make sure there's no errors. The documentation will actually get published in
the rust-lang/rust repo
@bors
Copy link
Collaborator

bors commented Jan 5, 2018

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

@bors bors merged commit 1271bb4 into rust-lang:master Jan 5, 2018
@bors bors mentioned this pull request Jan 5, 2018
bors added a commit that referenced this pull request Jan 8, 2018
@wking
Copy link
Contributor

wking commented Jan 8, 2018

This PR seems to have dropped changes which had only been made to the old docs.

For example, 45cc30b (#4817) added incremental to src/doc/manifest.md but not src/doc/book/src/reference/manifest.md. After this PR, incremental no longer shows up under src/doc:

$ git grep incremental a44612f2 -- src/doc/
…no hits…

I think we need to audit the renames here to see what was dropped, and file cherry-picks (or something) to recover the lost updates.

@alexcrichton
Copy link
Member Author

Good catch @wking! Mind double checking #4906 to make sure it didn't miss anything?

@alexcrichton alexcrichton deleted the clean-docs branch January 8, 2018 21:15
@wking
Copy link
Contributor

wking commented Jan 8, 2018

Ah, sorry. I hadn't noticed #4906 fixing these.

bors added a commit that referenced this pull request Jan 9, 2018
doc/guide/dependencies: Add a 'rust' language marker

This had been added to the non-book docs in 2ad45a5 (#4455), despite the fact that the book didn't actually have that marker:

    $ git cat-file -p 2ad45a5:src/doc/book/src/guide/dependencies.md | grep -A2 'You can now use the'
    You can now use the `regex` library using `extern crate` in `main.rs`.

    ```

This is (along with the already-landed #4916), part of recovering from #4904.
@ehuss ehuss added this to the 1.25.0 milestone Feb 6, 2022
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.

4 participants