Skip to content

updated links from azerupi to rust-lang-nursery #489

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 3 commits into from
Nov 22, 2017
Merged

updated links from azerupi to rust-lang-nursery #489

merged 3 commits into from
Nov 22, 2017

Conversation

anna-liao
Copy link
Contributor

@anna-liao anna-liao commented Nov 17, 2017

fixes #485 . The only link I didn't change was for appveyor.

$ rg azerupi
README.md
13:            <a href="https://ci.appveyor.com/project/azerupi/mdbook/"><img src="https://ci.appveyor.com/api/projects/status/o38racsnbcospyc8/branch/master?svg=true"></a>

I also clicked through the links on the updated documents to make sure there are no dead links.

Copy link
Contributor

@budziq budziq left a comment

Choose a reason for hiding this comment

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

The PR is almost perfect @anna-liao!

Just some suggestions below

CONTRIBUTING.md Outdated
Use the [issue tracker](https://github.com/azerupi/mdBook/issues), no question is too simple.
If we don't respond in a couple of days, ping us @azerupi, @steveklabnik, @frewsxcv it might just be that we forgot. :wink:
Use the [issue tracker](https://github.com/rust-lang-nursery/mdBook/issues), no question is too simple.
If we don't respond in a couple of days, ping us @rust-lang-nursery, @steveklabnik, @frewsxcv it might just be that we forgot. :wink:
Copy link
Contributor

Choose a reason for hiding this comment

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

Im not sure that pinging rust-lang-nursery will work as expected but you can add me and Michael-F-Bryan

Copy link
Contributor

Choose a reason for hiding this comment

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

Feel free to chuck me at the start of the list so people will ping me first, I think I've got a bit more spare time than the other guys.

README.md Outdated
@@ -113,13 +113,13 @@ Here are the main commands you will want to run. For a more exhaustive explanati

Aside from the command line interface, this crate can also be used as a library. This means that you could integrate it in an existing project, like a web-app for example. Since the command line interface is just a wrapper around the library functionality, when you use this crate as a library you have full access to all the functionality of the command line interface with an easy to use API and more!

See the [Documentation](http://azerupi.github.io/mdBook/lib/lib.html) and the [API docs](http://azerupi.github.io/mdBook/mdbook/index.html) for more information.
See the [Documentation](http://rust-lang-nursery.github.io/mdBook/lib/lib.html) and the [API docs](https://docs.rs/mdbook/0.0.26/mdbook/) for more information.
Copy link
Contributor

Choose a reason for hiding this comment

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

the api docs are still available under http://rust-lang-nursery.github.io/mdBook/mdbook/index.html

if you really like to point to docs.rs then I'd suggest pointing to wildcard version

https://docs.rs/mdbook/*/mdbook
which will always point to the newest version

Copy link
Contributor

Choose a reason for hiding this comment

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

I'd prefer to point at docs.rs here, that way it's showing the docs for the latest release and not whatever happens to be in master. Later on if necessary, we can always add something to the README which gives links to both.

Documentation:

- [master](http://rust-lang-nursery.github.io/mdBook/lib/lib.html)
- [Latest Release](https://docs.rs/mdbook/*/mdbook/)

Also, what about instead of using the word "Documentation" for the first link we say "User Guide"? That helps to differentiate between the API docs (used by people hacking on mdbook) and the user guide.

Copy link
Contributor Author

@anna-liao anna-liao Nov 20, 2017

Choose a reason for hiding this comment

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

Thanks @budziq and @Michael-F-Bryan for the review. So just checking:

[User Guide](http://rust-lang-nursery.github.io/mdBook/)
[API docs](https://docs.rs/mdbook/*/mdbook/)

Is that right?


## API docs

Alongside this book you can also read the [API docs](mdbook/index.html) generated by Rustdoc if you would like
Alongside this book you can also read the [API docs](https://docs.rs/mdbook/0.0.26/mdbook/) generated by Rustdoc if you would like
Copy link
Contributor

Choose a reason for hiding this comment

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

please see my comment above about the api docs link

@anna-liao
Copy link
Contributor Author

@budziq Thanks for the review :). I have revised as suggested.

@Michael-F-Bryan
Copy link
Contributor

Thanks @anna-liao, I was going to work on this over the weekend but it looks like you beat me to it! 😁

It looks like while you were updating links rustfmt ran and added a bunch of noise to the PR. Is there any chance you can remove the *.rs.bk files and revert the styling related changes?

Copy link
Contributor

@budziq budziq left a comment

Choose a reason for hiding this comment

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

@anna-liao

The changes regarding links look very well but
there are still quite a lot of rustfmt changes.
Could you go over the changes again?

  1. Squash the commits into one
  2. remove all files that did not require link change (or stage only the lines related to link change)
  3. git push to your PR branch with --force

If you'll have any problems we'll help out!

@anna-liao
Copy link
Contributor Author

okie doke, reverted all rustfmt changes and squashed the commits.

@Michael-F-Bryan
Copy link
Contributor

Michael-F-Bryan commented Nov 22, 2017

Aww, I tried the "Resolve Conflicts" button from GitHub but it doesn't seem to have fixed the merge conflict 😞

This is good to merge @anna-liao! We just need to fix that last merge conflict (presumably someone also edited the README in a PR which was recently merged).

EDIT: looks like it was c51e080.

@budziq budziq merged commit 5ce05a7 into rust-lang:master Nov 22, 2017
@budziq
Copy link
Contributor

budziq commented Nov 22, 2017

Merged. Thanks @anna-liao ! Nicely done!

@anna-liao anna-liao deleted the issue485-updating-links branch November 22, 2017 15:10
Ruin0x11 pushed a commit to Ruin0x11/mdBook that referenced this pull request Aug 30, 2020
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.

Updating Links
3 participants