Skip to content

Rollup of 5 pull requests #40302

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

Closed
wants to merge 11 commits into from
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
[submodule "src/liblibc"]
path = src/liblibc
url = https://github.com/rust-lang/libc.git
[submodule "src/doc/nomicon"]
path = src/doc/nomicon
url = https://github.com/rust-lang-nursery/nomicon
[submodule "src/tools/cargo"]
path = src/tools/cargo
url = https://github.com/rust-lang/cargo
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ $ ./configure
$ make && sudo make install
```

When using the configure script, the generated config.mk` file may override the
When using the configure script, the generated `config.mk` file may override the
`config.toml` file. To go back to the `config.toml` file, delete the generated
`config.mk` file.

Expand Down
1 change: 1 addition & 0 deletions src/doc/nomicon
Submodule nomicon added at d08fe9
38 changes: 0 additions & 38 deletions src/doc/nomicon/src/README.md

This file was deleted.

55 changes: 0 additions & 55 deletions src/doc/nomicon/src/SUMMARY.md

This file was deleted.

7 changes: 0 additions & 7 deletions src/doc/nomicon/src/arc-and-mutex.md

This file was deleted.

255 changes: 0 additions & 255 deletions src/doc/nomicon/src/atomics.md

This file was deleted.

Loading