Skip to content

First phase of migrating the wiki to the internal docs #11078 #11123

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

Merged
merged 2 commits into from
Jan 6, 2014

Conversation

alan-andrade
Copy link
Contributor

This is not done yet but I'm posting it to get feedback.

The wiki has a ton of different tutorials/manuals/faq and so forth. Instead of migrating all of them right now, I just migrated the following:

  • The general main wiki page
  • Language FAQ
  • Project FAQ

If this feels reasonable, please comment so that I can continue with confidence.

@emberian
Copy link
Member

I'm quite OK with this.

cc @alexcrichton @brson @steveklabnik @chris-morgan

@asb
Copy link

asb commented Dec 23, 2013

Issue #5831 is relevant to this PR (and probably means it can not be blindly merged).

@emberian
Copy link
Member

Yikes, that's a pain.

@alan-andrade
Copy link
Contributor Author

Every internal Manual, Guide (Tutorial) or other Documentation, could contain the License at the bottom declaring the double license as per COPYRIGHT.txt

How does that sound ?

After approved we could deprecate the wiki ?

@emberian
Copy link
Member

@alanandrade that isn't the problem, the problem is that the wiki basically has no license at all. Everything is copyrighted by the author.

@alan-andrade
Copy link
Contributor Author

I'll ask every author for the copyright transfer. The official permission would be a comment on this pull request.

This won't be merged until we get every author grant and we all agree the terms.

@alan-andrade
Copy link
Contributor Author

According to last commit.

Assumptions:

  • author = Contributor that either started or edited a wiki page.
  • license. every page will contain the double license notice at the bottom.

That means we need the permission of 11 contributors according to this page: https://github.com/mozilla/rust/wiki/Doc-language-FAQ/_history if we want to merge the Language FAQ page transcription.

Do we need the permission of contributors that only changed small portions ?
In the case we don't, then @brson is the real author of both FAQs (Lang and Project). How should we proceed with your copyrighted material ?

About the plan

It feels sloppy :( but I don't know what to do to solve it faster and effectively.

@steveklabnik
Copy link
Member

I like this idea.

The license issue is tricky. Theoretically you need every contributor to sign off...

@adrientetar
Copy link
Contributor

The file that lists users groups and so forth sounds wiki-ish to me.

@brson
Copy link
Contributor

brson commented Jan 2, 2014

I want to get this merged for 0.9.

Let's move forward with the transfer and ignore the licensing issues for now. I'll talk to the lawyers about what we should do with the documentation licensing.

I'd like to make some changes though:

  • Get rid of license.md until we know the right thing to do
  • Move other.md to index.md to make it the landing page for all documentation.
  • Add links to all the documentation from index.md
  • Remove blogs from index.md
  • Add a link to the wiki to index.md

I'm not sure about the community stuff, but I'm inclined to leave it there so people can find it easily.

Sorry I took so long to look at this.

@alan-andrade
Copy link
Contributor Author

All right, we have the most important wikis here.
@brson suggestions were applied.

Ready for review or +r stuff ;)

@adrientetar
Copy link
Contributor

@alan-andrade You still have license.md in here.

@alan-andrade
Copy link
Contributor Author

@adridu59 My bad, I believe its ready now.

#TOC ul ul {
display: none;
Copy link
Contributor

Choose a reason for hiding this comment

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

This should definitely stay. manual.inc is here to overwrite this rule for select files.

However tutorial + guides should keep this rule, at least this is the current policy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought this could be better done by passing --toc-depth=1 to pandoc by default.
Also, I'm interested in using a depth of 2 for FAQs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, I see the connection of what you're saying.

Of course I want to go with the current policy, but my gut is telling me that overriding CSS just to hide ul's is not very clean. If we have an option to not even display the uls that we don't want, then why not use it ?

Copy link
Contributor

Choose a reason for hiding this comment

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

For the record, display: none doesn't hide, it just doesn't display; hiding would be visibility: hidden.

@alan-andrade
Copy link
Contributor Author

@adridu59 ok, hopefully this is the last time I bother you 👍

doc/rust.css: rust.css
@$(call E, cp: $@)
$(Q)cp -a $< $@ 2> /dev/null

doc/manual.inc: manual.inc
HTML_DEPS += doc/full-toc.inc
Copy link
Contributor

Choose a reason for hiding this comment

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

We should only want this for rust.md (Manual) and not for Tutorial/Guides, or are you willing to use it elsewhere?

My understanding is that only the reference manual should have that heavyweight full toc (tutorials are more meant to be followed at least by-section).

@brson
Copy link
Contributor

brson commented Jan 6, 2014

I agree that all the docs should depend on version_info.html and include --include-before-body=doc/version_info.html in their pandoc command.

@alan-andrade
Copy link
Contributor Author

oh, and every html will include version_info just as HTML_OPTS describes.

@brson
Copy link
Contributor

brson commented Jan 6, 2014

Thanks @alan-andrade

bors added a commit that referenced this pull request Jan 6, 2014
…r=brson

This is not done yet but I'm posting it to get feedback.

The wiki has a ton of different tutorials/manuals/faq and so forth. Instead of migrating all of them right now, I just migrated the following:

* The general main wiki page
* Language FAQ
* Project FAQ

If this feels reasonable, please comment so that I can continue with confidence.
@brson
Copy link
Contributor

brson commented Jan 6, 2014

I think this will fail because tests.mk hasn't been updated to extract tests from the renamed files. Also, @alan-andrade can you update the names of the guides to 'guide' instead of 'tutorial', and update the final section of 'tutorial.md' to refer to additional guides, not 'tutorials'?

@bors bors closed this Jan 6, 2014
@bors bors merged commit 7de2379 into rust-lang:master Jan 6, 2014
@adrientetar
Copy link
Contributor

@brson Wasn't all that done in eeafee4?

@alan-andrade
Copy link
Contributor Author

@brson @adridu59 rust-lang/prev.rust-lang.org#19

alan-andrade added a commit to alan-andrade/rust-www that referenced this pull request Jan 7, 2014
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 14, 2023
[`panic_in_result_fn`] remove `todo!`, `unimplemented!`, `unreachable!`

This commit fixes rust-lang#11025 by removing checks for `todo!`, `unimplemented!` and `unreachable!`.

changelog: [`panic_in_result_fn`] remove `todo!`, `unimplemented!`, `unreachable!`
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