Skip to content

Commit

Permalink
auto merge of rust-lang#12747 : huonw/rust/rustdoc-markdown, r=alexcr…
Browse files Browse the repository at this point in the history
…ichton

This gives Rustdoc the ability to render our guides, tutorial and manual and modifies the those documents (minor modifications) and makefiles to achieve this.

See commits for more details (especially the makefile rewrite).
  • Loading branch information
bors committed Mar 9, 2014
2 parents e959c87 + b4815ad commit 62f1d68
Show file tree
Hide file tree
Showing 22 changed files with 1,035 additions and 679 deletions.
1 change: 0 additions & 1 deletion mk/clean.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ clean-misc:
@$(call E, cleaning)
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)
$(Q)rm -f $(RUSTLLVM_LIB_OBJS) $(RUSTLLVM_OBJS_OBJS) $(RUSTLLVM_DEF)
$(Q)rm -Rf $(DOCS)
$(Q)rm -Rf $(GENERATED)
$(Q)rm -Rf tmp/*
$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz $(PKG_NAME)-*.exe dist
Expand Down
1 change: 1 addition & 0 deletions mk/crates.mk
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
################################################################################

DOC_CRATES := $(filter-out rustc, $(filter-out syntax, $(CRATES)))
COMPILER_DOC_CRATES := rustc syntax

# This macro creates some simple definitions for each crate being built, just
# some munging of all of the parameters above.
Expand Down
Loading

0 comments on commit 62f1d68

Please sign in to comment.