Commit 7532ccaa authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'book_link_fixes' into 'master'

Book link fixes

See merge request redox-os/book!144
parents adf87cc4 5d5f0ba0
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* `qemu-system-x86_64 -version` or your actual hardware specs, if applicable * `qemu-system-x86_64 -version` or your actual hardware specs, if applicable
* The operating system you used to build Redox * The operating system you used to build Redox
* `uname -a` or an alternative format * `uname -a` or an alternative format
4. Make sure that your bug doesn't already have an issue on GitLab. If you submit a duplicate, you should accept that you may be ridiculed for it, though you'll still be helped. Feel free to ask in the Redox [chat](./contributing/communication/chat.html) if you're uncertain as to whether your issue is new 4. Make sure that your bug doesn't already have an issue on GitLab. If you submit a duplicate, you should accept that you may be ridiculed for it, though you'll still be helped. Feel free to ask in the Redox [chat](../communication/chat.html) if you're uncertain as to whether your issue is new
5. Create a GitLab issue following the template 5. Create a GitLab issue following the template
* Non-bug report issues may ignore this template * Non-bug report issues may ignore this template
6. Watch the issue and be available for questions 6. Watch the issue and be available for questions
......
...@@ -21,7 +21,7 @@ The steps given below are for the main Redox project - submodules and other proj ...@@ -21,7 +21,7 @@ The steps given below are for the main Redox project - submodules and other proj
8. Commit (`git add . --all; git commit -m "my commit"`) 8. Commit (`git add . --all; git commit -m "my commit"`)
9. Optionally run [rustfmt](https://gitlab.redox-os.org/rust-lang-nursery/rustfmt) on the files you changed and commit again if it did anything (check with `git diff` first) 9. Optionally run [rustfmt](https://gitlab.redox-os.org/rust-lang-nursery/rustfmt) on the files you changed and commit again if it did anything (check with `git diff` first)
10. Test your changes with `make qemu` or `make virtualbox` (you might have to use `make qemu kvm=no`, formerly `make qemu_no_kvm`) 10. Test your changes with `make qemu` or `make virtualbox` (you might have to use `make qemu kvm=no`, formerly `make qemu_no_kvm`)
(see [Best Practices and Guidelines](./contributing/best_practices/overview.html)) (see [Best Practices and Guidelines](../best_practices/overview.html))
11. Pull from upstream (`git fetch upstream; git rebase upstream/master`) (Note: try not to use `git pull`, it is equivalent to doing `git fetch upstream; git merge master upstream/master`, which is not usually preferred for local/fork repositories, although it is fine in some cases.) 11. Pull from upstream (`git fetch upstream; git rebase upstream/master`) (Note: try not to use `git pull`, it is equivalent to doing `git fetch upstream; git merge master upstream/master`, which is not usually preferred for local/fork repositories, although it is fine in some cases.)
12. Repeat step 9 to make sure the rebase still builds and starts 12. Repeat step 9 to make sure the rebase still builds and starts
13. Push to your fork (`git push origin my-branch`) 13. Push to your fork (`git push origin my-branch`)
......
# Pull Requests # Pull Requests
It's completely fine to just submit a small pull request without first making an issue, but if it's a big change that will require a lot of planning and reviewing, it's best you start with writing an issue first. Also see the [git guidelines](./contributing/best_practices/git.html). It's completely fine to just submit a small pull request without first making an issue, but if it's a big change that will require a lot of planning and reviewing, it's best you start with writing an issue first. Also see the [git guidelines](../best_practices/git.html).
...@@ -29,4 +29,4 @@ The path argument of `OPEN` does not have to be a URL. For compatibility reasons ...@@ -29,4 +29,4 @@ The path argument of `OPEN` does not have to be a URL. For compatibility reasons
> TODO > TODO
[The root scheme]: design/scheme/the_root_scheme.html [The root scheme]: ../scheme/the_root_scheme.html
...@@ -84,7 +84,7 @@ The login program accepts a username, currently any username may be used, prints ...@@ -84,7 +84,7 @@ The login program accepts a username, currently any username may be used, prints
############################ ############################
``` ```
At this point, the user will now be able to access the [Shell](./explore/shell.html) At this point, the user will now be able to access the [Shell](./shell.html)
## Graphical overview ## Graphical overview
......
...@@ -6,7 +6,6 @@ We will start with the boot system, continuing to the shell and command-line uti ...@@ -6,7 +6,6 @@ We will start with the boot system, continuing to the shell and command-line uti
Redox is meant to be an *insanely* customizable system, allowing a user to tear it down to a very small command-line distro, or build it up to a full desktop environment with ease. Redox is meant to be an *insanely* customizable system, allowing a user to tear it down to a very small command-line distro, or build it up to a full desktop environment with ease.
- [Boot Process](./explore/boot_process.html) - [Boot Process](./boot_process.html)
- [Shell](./explore/shell.html) - [Shell](./shell.html)
- [Utilities](./explore/utilities.html) - [GUI](./gui.html)
- [GUI](./explore/gui.html)
...@@ -40,4 +40,4 @@ The main idea is to have components and drivers that would be inside a monolithi ...@@ -40,4 +40,4 @@ The main idea is to have components and drivers that would be inside a monolithi
All of this increases the reliability of the system significantly. This would be useful for mission-critical applications and for users that want minimal issues with their computer systems. All of this increases the reliability of the system significantly. This would be useful for mission-critical applications and for users that want minimal issues with their computer systems.
[URLs, schemes, and resources]: ./design/urls_schemes_resources.html [URLs, schemes, and resources]: ../design/urls_schemes_resources.html
...@@ -23,5 +23,5 @@ This means that a large number of standard programs and libraries will be compat ...@@ -23,5 +23,5 @@ This means that a large number of standard programs and libraries will be compat
The key here is the trade off between correctness and compatibility. Ideally, you should be able achieve both, but unfortunately, you can't always do so. The key here is the trade off between correctness and compatibility. Ideally, you should be able achieve both, but unfortunately, you can't always do so.
[Why Free Software]: ./introduction/why_free_software.html [Why Free Software]: ./why_free_software.html
[Why Rust]: ./introduction/why_rust.html [Why Rust]: ./why_rust.html
...@@ -48,7 +48,7 @@ We have to admit, that we do like the idea of writing something that is our own ...@@ -48,7 +48,7 @@ We have to admit, that we do like the idea of writing something that is our own
- User space written mostly in Rust - User space written mostly in Rust
- Orbital, a new GUI - Orbital, a new GUI
[Why Free Software]: ./introduction/why_free_software.html [Why Free Software]: ./why_free_software.html
[jails]: https://www.freebsd.org/doc/handbook/jails.html [jails]: https://www.freebsd.org/doc/handbook/jails.html
[ZFS]: https://www.freebsd.org/doc/handbook/zfs.html [ZFS]: https://www.freebsd.org/doc/handbook/zfs.html
[reliability]: http://wiki.minix3.org/doku.php?id=www:documentation:reliability [reliability]: http://wiki.minix3.org/doku.php?id=www:documentation:reliability
......
...@@ -58,7 +58,7 @@ But [don't]. [forget]. [all]. [the]. [other]. [awesome]. [contributors]. ...@@ -58,7 +58,7 @@ But [don't]. [forget]. [all]. [the]. [other]. [awesome]. [contributors].
[stratact]: https://gitlab.redox-os.org/stratact [stratact]: https://gitlab.redox-os.org/stratact
[ticki]: https://github.com/ticki [ticki]: https://github.com/ticki
[this list]: ./overview/maintainers.html [this list]: ./maintainers.html
[don't]: https://gitlab.redox-os.org/redox-os/redox/graphs/master [don't]: https://gitlab.redox-os.org/redox-os/redox/graphs/master
[forget]: https://gitlab.redox-os.org/redox-os/coreutils/graphs/master [forget]: https://gitlab.redox-os.org/redox-os/coreutils/graphs/master
......
...@@ -59,4 +59,4 @@ It is important to note we seek to avoid non-Rust tools, for safety and consiste ...@@ -59,4 +59,4 @@ It is important to note we seek to avoid non-Rust tools, for safety and consiste
[uutils/coreutils]: https://github.com/uutils/coreutils [uutils/coreutils]: https://github.com/uutils/coreutils
[m-labs/smoltcp]: https://github.com/m-labs/smoltcp [m-labs/smoltcp]: https://github.com/m-labs/smoltcp
[Why Rust]: ./introduction/why_rust.html [Why Rust]: ../introduction/why_rust.html
...@@ -7,4 +7,4 @@ Please notice that this book is currently being written. ...@@ -7,4 +7,4 @@ Please notice that this book is currently being written.
This book was written by Ticki with the help of LazyOxen, Steve Klabnik, ElijahCaine, and Jackpot51. This book was written by Ticki with the help of LazyOxen, Steve Klabnik, ElijahCaine, and Jackpot51.
If you want to skip straight to trying out Redox, see [getting started](getting_started/getting_started.html). If you want to skip straight to trying out Redox, see [getting started](../getting_started/getting_started.html).
...@@ -37,9 +37,9 @@ It is written such that you do not need any prior knowledge in Rust and/or OS de ...@@ -37,9 +37,9 @@ It is written such that you do not need any prior knowledge in Rust and/or OS de
[Linux]: https://en.wikipedia.org/wiki/Linux [Linux]: https://en.wikipedia.org/wiki/Linux
[BSD]: http://www.bsd.org/ [BSD]: http://www.bsd.org/
[Design]: ./design/design.html [Design]: ../design/design.html
[Overview]: ./overview/welcome.html [Overview]: ./welcome.html
[Introduction]: ./introduction/why_redox.html [Introduction]: ../introduction/why_redox.html
[Getting started]: ./getting_started/preparing_the_build.html [Getting started]: ../getting_started/preparing_the_build.html
[The design]: ./design/design.html [The design]: ../design/design.html
[Contributing]: ./contributing/chat.html [Contributing]: ../contributing/chat.html
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment