diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2014-10-23 04:35:35 -0400 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2014-10-23 07:40:29 -0400 |
| commit | 0c3ad8be5bae6d3df6044a07171a9938cb700009 (patch) | |
| tree | a75c2fd5560b074b0b3264cae1517f1fed5cb57c | |
| parent | 8a4085466021c534427c544b860eabcdf4ed85df (diff) | |
| download | rust-0c3ad8be5bae6d3df6044a07171a9938cb700009.tar.gz rust-0c3ad8be5bae6d3df6044a07171a9938cb700009.zip | |
build the crates guide
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mk/docs.mk | 2 | ||||
| -rw-r--r-- | src/doc/guide-crates.md | 2 | ||||
| -rw-r--r-- | src/doc/index.md | 1 | ||||
| -rw-r--r-- | src/doc/po4a.conf | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure index 05bfdb3e9fd..ff1c1f4db01 100755 --- a/configure +++ b/configure @@ -928,6 +928,7 @@ do make_dir $h/test/doc-guide-container make_dir $h/test/doc-guide-tasks make_dir $h/test/doc-guide-plugin + make_dir $h/test/doc-guide-crates make_dir $h/test/doc-rust done diff --git a/mk/docs.mk b/mk/docs.mk index ab73a72f00a..9dbcb2c9bbc 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -27,7 +27,7 @@ ###################################################################### DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \ guide-tasks guide-container guide-pointers guide-testing \ - guide-plugin complement-bugreport \ + guide-plugin guide-crates complement-bugreport \ complement-lang-faq complement-design-faq complement-project-faq rust \ rustdoc guide-unsafe guide-strings reference diff --git a/src/doc/guide-crates.md b/src/doc/guide-crates.md index 8705bdd278e..50d76371cc5 100644 --- a/src/doc/guide-crates.md +++ b/src/doc/guide-crates.md @@ -452,7 +452,7 @@ fn main() { Rust will give us a compile-time error: -```{rust,ignore} +```{notrust,ignore} Compiling phrases v0.0.1 (file:///home/you/projects/phrases) /home/you/projects/phrases/src/main.rs:4:5: 4:40 error: a value named `hello` has already been imported in this module /home/you/projects/phrases/src/main.rs:4 use phrases::japanese::greetings::hello; diff --git a/src/doc/index.md b/src/doc/index.md index ad548d3a8f9..8d54550a9f9 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -57,6 +57,7 @@ a guide that can help you out: * [Strings](guide-strings.html) * [Pointers](guide-pointers.html) * [References and Lifetimes](guide-lifetimes.html) +* [Crates and modules](guide-crates.html) * [Tasks and Communication](guide-tasks.html) * [Foreign Function Interface](guide-ffi.html) * [Writing Unsafe and Low-Level Code](guide-unsafe.html) diff --git a/src/doc/po4a.conf b/src/doc/po4a.conf index 6fd4c95794e..25f1a5fd3e2 100644 --- a/src/doc/po4a.conf +++ b/src/doc/po4a.conf @@ -19,6 +19,7 @@ [type: text] src/doc/guide-tasks.md $lang:doc/l10n/$lang/guide-tasks.md [type: text] src/doc/guide-testing.md $lang:doc/l10n/$lang/guide-testing.md [type: text] src/doc/guide-unsafe.md $lang:doc/l10n/$lang/guide-unsafe.md +[type: text] src/doc/guide-unsafe.md $lang:doc/l10n/$lang/guide-crates.md [type: text] src/doc/guide.md $lang:doc/l10n/$lang/guide.md [type: text] src/doc/index.md $lang:doc/l10n/$lang/index.md [type: text] src/doc/intro.md $lang:doc/l10n/$lang/intro.md |