Skip to content

Commit 6e30edf

Browse files
committed
---
yaml --- r: 92260 b: refs/heads/auto c: f0867e0 h: refs/heads/master v: v3
1 parent dca9090 commit 6e30edf

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: e08c9361207b083af091badbfe860d7bcf739157
16+
refs/heads/auto: f0867e0ba2b91f31004167499cb10985f8362d36
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/doc/rustdoc.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,21 @@ pub fn recalibrate() {
3838
}
3939
~~~
4040

41-
Then, one can run `rustdoc universe.rs`. By default, it generates a directory
42-
called `doc`, with the documentation for `universe` being in
41+
Doc comments are markdown, and are currently parsed with the
42+
[sundown][sundown] library. rustdoc does not yet do any fanciness such as
43+
referencing other items inline, like javadoc's `@see`. One exception to this
44+
is that the first paragrah will be used as the "summary" of an item in the
45+
generated documentation:
46+
47+
~~~
48+
/// A whizbang. Does stuff. (this line is the summary)
49+
///
50+
/// Whizbangs are ...
51+
struct Whizbang;
52+
~~~
53+
54+
To generate the docs, run `rustdoc universe.rs`. By default, it generates a
55+
directory called `doc`, with the documentation for `universe` being in
4356
`doc/universe/index.html`. If you are using other crates with `extern mod`,
4457
rustdoc will even link to them when you use their types, as long as their
4558
documentation has already been generated by a previous run of rustdoc, or the
@@ -70,3 +83,5 @@ color, and one can always click on a colored type to jump to its
7083
documentation. There is a search bar at the top, which is powered by some
7184
javascript and a statically-generated search index. No special web server is
7285
required for the search.
86+
87+
[sundown]: https://github.com/vmg/sundown/

branches/auto/doc/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3235,7 +3235,7 @@ more out of date than this document.
32353235
[container]: tutorial-container.html
32363236
[conditions]: tutorial-conditions.html
32373237
[rustpkg]: tutorial-rustpkg.html
3238-
[rustdoc]: tutorial-rustdoc.html
3238+
[rustdoc]: rustdoc.html
32393239

32403240
[wiki]: https://github.com/mozilla/rust/wiki/Docs
32413241
[wiki-packages]: https://github.com/mozilla/rust/wiki/Doc-packages,-editors,-and-other-tools

0 commit comments

Comments
 (0)