about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorMark Mansi <markm@cs.wisc.edu>2018-03-15 09:38:50 -0500
committerWho? Me?! <mark-i-m@users.noreply.github.com>2018-03-15 15:00:10 -0500
commit821fb082902cc1dcde4e7fb8a066bcefe825bf9a (patch)
treeefa8855d07741a93b69fc20b7cb20090342ed0c0 /src/doc/rustc-dev-guide
parentd9bbf17bba4778a7eb19219dc5d9a531e2897334 (diff)
downloadrust-821fb082902cc1dcde4e7fb8a066bcefe825bf9a.tar.gz
rust-821fb082902cc1dcde4e7fb8a066bcefe825bf9a.zip
address review comments
Diffstat (limited to 'src/doc/rustc-dev-guide')
-rw-r--r--src/doc/rustc-dev-guide/src/appendix-code-index.md1
-rw-r--r--src/doc/rustc-dev-guide/src/rustdoc.md17
2 files changed, 12 insertions, 6 deletions
diff --git a/src/doc/rustc-dev-guide/src/appendix-code-index.md b/src/doc/rustc-dev-guide/src/appendix-code-index.md
index c5be7e336e7..49fe08ee301 100644
--- a/src/doc/rustc-dev-guide/src/appendix-code-index.md
+++ b/src/doc/rustc-dev-guide/src/appendix-code-index.md
@@ -23,3 +23,4 @@ Item            |  Kind    | Short description           | Chapter            |
 [The Rustc Driver]: rustc-driver.html
 [Type checking]: type-checking.html
 [The `ty` modules]: ty.html
+[Rustdoc]: rustdoc.html
diff --git a/src/doc/rustc-dev-guide/src/rustdoc.md b/src/doc/rustc-dev-guide/src/rustdoc.md
index 2cacc80fda8..bb4122e8dfc 100644
--- a/src/doc/rustc-dev-guide/src/rustdoc.md
+++ b/src/doc/rustc-dev-guide/src/rustdoc.md
@@ -87,7 +87,7 @@ The other major thing that happens in `clean/mod.rs` is the collection of doc co
 `#[doc=""]` attributes into a separate field of the Attributes struct, present on anything that gets
 hand-written documentation. This makes it easier to collect this documentation later in the process.
 
-The primary output of this process is a clean::Crate with a tree of Items which describe the
+The primary output of this process is a `clean::Crate` with a tree of Items which describe the
 publicly-documentable items in the target crate.
 
 ### Hot potato
@@ -107,21 +107,26 @@ deprecate that][44136]. If you need finer-grain control over these passes, pleas
 
 Here is current (as of this writing) list of passes:
 
-- `collapse-docs` is necessary because each line of a doc comment is given as a
+- `propagate-doc-cfg` - propagates `#[doc(cfg(...))]` to child items.
+- `collapse-docs` concatenates all document attributes into one document
+  attribute. This is necessary because each line of a doc comment is given as a
   separate doc attribute, and this will combine them into a single string with
   line breaks between each attribute.
-- `unindent-comments` is necessary because the convention for writing
+- `unindent-comments` removes excess indentation on comments in order for
+  markdown to like it. This is necessary because the convention for writing
   documentation is to provide a space between the `///` or `//!` marker and the
   text, and stripping that leading space will make the text easier to parse by
   the Markdown parser. (In my experience it's less necessary now that we have a
   Commonmark-compliant parser, since it doesn't have a problem with headers
   that have a space before the `##` that marks the heading.)
-- `strip-priv-imports` is necessary because rustdoc will handle *public*
+- `strip-priv-imports` strips all private import statements (`use`, `extern
+  crate`) from a crate. This is necessary because rustdoc will handle *public*
   imports by either inlining the item's documentation to the module or creating
   a "Reexports" section with the import in it. The pass ensures that all of
   these imports are actually relevant to documentation.
-- `strip-hidden` and `strip-private` also remove items that are not relevant
-  for public documentation.
+- `strip-hidden` and `strip-private` strip all `doc(hidden)` and private items
+  from the output. `strip-private` implies `strip-priv-imports`. Basically, the
+  goal is to remove items that are not relevant for public documentation.
 
 ## From clean to crate