diff --git a/.travis.yml b/.travis.yml index 404d3280458..b925208bc51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ matrix: - env: TARGET=x86_64-unknown-linux-gnu ALT=i686-unknown-linux-gnu rust: nightly + install: + - cargo install mdbook script: - cargo test - cargo doc --no-deps @@ -31,7 +33,7 @@ matrix: [ $(uname -s) = Linux ] && pip install ghp-import --user && $HOME/.local/bin/ghp-import -n target/doc && - git push -qf https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages 2>&1 > /dev/null + git push -qf https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages 2>&1 >/dev/null exclude: - rust: stable diff --git a/src/ci/dox.sh b/src/ci/dox.sh index 5f65a31ad7e..c9417044fd1 100644 --- a/src/ci/dox.sh +++ b/src/ci/dox.sh @@ -26,3 +26,8 @@ for doc in $DOCS; do -o target/doc \ src/doc/$doc.md done + +# Temporary preview for mdBook docs +cd src/doc/book +$HOME/.cargo/bin/mdbook build --no-create --dest-dir ../../../target/doc/book +cd ../../../ diff --git a/src/doc/MIGRATION_MAP b/src/doc/MIGRATION_MAP index bbcdcf28697..ce8d7918341 100644 --- a/src/doc/MIGRATION_MAP +++ b/src/doc/MIGRATION_MAP @@ -2,7 +2,7 @@ index.md book/src/SUMMARY.md book/src/getting-started.md book/src/getting-starte guide.md book/src/guide.md book/src/guide/*.md build-script.md book/src/reference/build-scripts.md config.md book/src/reference/config.md -crates-io.md book/src/reference/crates-io.md +crates-io.md book/src/reference/publishing.md environment-variables.md book/src/reference/environment-variables.md external-tools.md book/src/reference/external-tools.md manifest.md book/src/reference/manifest.md diff --git a/src/doc/book/src/SUMMARY.md b/src/doc/book/src/SUMMARY.md index 74e7aae5510..858c64b449f 100644 --- a/src/doc/book/src/SUMMARY.md +++ b/src/doc/book/src/SUMMARY.md @@ -22,7 +22,7 @@ * [Configuration](reference/config.md) * [Environment Variables](reference/environment-variables.md) * [Build Scripts](reference/build-scripts.md) - * [Publishing on crates.io](reference/crates-io.md) + * [Publishing on crates.io](reference/publishing.md) * [Package ID Specifications](reference/pkgid-spec.md) * [Source Replacement](reference/source-replacement.md) * [External Tools](reference/external-tools.md) diff --git a/src/doc/book/src/reference.md b/src/doc/book/src/reference.md index dd3f724cb5f..df73b7ae054 100644 --- a/src/doc/book/src/reference.md +++ b/src/doc/book/src/reference.md @@ -10,7 +10,7 @@ The reference covers the details of various areas of Cargo. * [Configuration](reference/config.html) * [Environment Variables](reference/environment-variables.html) * [Build Scripts](reference/build-scripts.html) -* [Publishing on crates.io](reference/crates-io.html) +* [Publishing on crates.io](reference/publishing.html) * [Package ID Specifications](reference/pkgid-spec.html) * [Source Replacement](reference/source-replacement.html) * [External Tools](reference/external-tools.html) diff --git a/src/doc/book/src/reference/crates-io.md b/src/doc/book/src/reference/publishing.md similarity index 100% rename from src/doc/book/src/reference/crates-io.md rename to src/doc/book/src/reference/publishing.md diff --git a/src/doc/index.md b/src/doc/index.md index cf3f36b585e..c85a6e33b85 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -1,5 +1,7 @@ % Cargo, Rust’s Package Manager +# Installing + ### Install Stable Rust and Cargo The easiest way to get Cargo is to get the current stable release of [Rust] by