Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a559452

Browse files
committedMar 17, 2017
Auto merge of #40598 - frewsxcv:rollup, r=frewsxcv
Rollup of 23 pull requests - Successful merges: #40387, #40433, #40452, #40456, #40457, #40458, #40463, #40466, #40467, #40495, #40496, #40497, #40499, #40500, #40503, #40505, #40512, #40514, #40517, #40520, #40536, #40545, #40586 - Failed merges:
2 parents 9fae040 + 3bec563 commit a559452

File tree

122 files changed

+1008
-705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+1008
-705
lines changed
 

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
url = https://github.com/rust-lang/libc.git
2121
[submodule "src/doc/nomicon"]
2222
path = src/doc/nomicon
23-
url = https://github.com/rust-lang-nursery/nomicon
23+
url = https://github.com/rust-lang-nursery/nomicon.git
2424
[submodule "src/tools/cargo"]
2525
path = cargo
26-
url = https://github.com/rust-lang/cargo
26+
url = https://github.com/rust-lang/cargo.git
2727
[submodule "reference"]
2828
path = src/doc/reference
2929
url = https://github.com/rust-lang-nursery/reference.git

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ If you’d like to build the documentation, it’s almost the same:
161161
$ ./x.py doc
162162
```
163163

164-
The generated documentation will appear in a top-level `doc` directory,
165-
created by the `make` rule.
164+
The generated documentation will appear under `doc` in the `build` directory for
165+
the ABI used. I.e., if the ABI was `x86_64-pc-windows-msvc`, the directory will be
166+
`build\x86_64-pc-windows-msvc\doc`.
166167

167168
## Notes
168169

0 commit comments

Comments
 (0)
Please sign in to comment.