diff options
-rw-r--r-- | .github/workflows/deploy.yml | 6 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | guide/book.toml (renamed from book-example/book.toml) | 0 | ||||
-rw-r--r-- | guide/src/404.md (renamed from book-example/src/404.md) | 0 | ||||
-rw-r--r-- | guide/src/README.md (renamed from book-example/src/README.md) | 0 | ||||
-rw-r--r-- | guide/src/SUMMARY.md (renamed from book-example/src/SUMMARY.md) | 0 | ||||
-rw-r--r-- | guide/src/cli/README.md (renamed from book-example/src/cli/README.md) | 0 | ||||
-rw-r--r-- | guide/src/cli/build.md (renamed from book-example/src/cli/build.md) | 0 | ||||
-rw-r--r-- | guide/src/cli/clean.md (renamed from book-example/src/cli/clean.md) | 0 | ||||
-rw-r--r-- | guide/src/cli/init.md (renamed from book-example/src/cli/init.md) | 0 | ||||
-rw-r--r-- | guide/src/cli/serve.md (renamed from book-example/src/cli/serve.md) | 0 | ||||
-rw-r--r-- | guide/src/cli/test.md (renamed from book-example/src/cli/test.md) | 0 | ||||
-rw-r--r-- | guide/src/cli/watch.md (renamed from book-example/src/cli/watch.md) | 0 | ||||
-rw-r--r-- | guide/src/continuous-integration.md (renamed from book-example/src/continuous-integration.md) | 0 | ||||
-rw-r--r-- | guide/src/for_developers/README.md (renamed from book-example/src/for_developers/README.md) | 0 | ||||
-rw-r--r-- | guide/src/for_developers/backends.md (renamed from book-example/src/for_developers/backends.md) | 0 | ||||
-rw-r--r-- | guide/src/for_developers/mdbook-wordcount/Cargo.toml (renamed from book-example/src/for_developers/mdbook-wordcount/Cargo.toml) | 0 | ||||
-rw-r--r-- | guide/src/for_developers/mdbook-wordcount/src/main.rs (renamed from book-example/src/for_developers/mdbook-wordcount/src/main.rs) | 0 | ||||
-rw-r--r-- | guide/src/for_developers/preprocessors.md (renamed from book-example/src/for_developers/preprocessors.md) | 0 | ||||
-rw-r--r-- | guide/src/format/README.md (renamed from book-example/src/format/README.md) | 0 | ||||
-rw-r--r-- | guide/src/format/config.md (renamed from book-example/src/format/config.md) | 0 | ||||
-rw-r--r-- | guide/src/format/example.rs (renamed from book-example/src/format/example.rs) | 0 | ||||
-rw-r--r-- | guide/src/format/mathjax.md (renamed from book-example/src/format/mathjax.md) | 0 | ||||
-rw-r--r-- | guide/src/format/mdbook.md (renamed from book-example/src/format/mdbook.md) | 0 | ||||
-rw-r--r-- | guide/src/format/summary.md (renamed from book-example/src/format/summary.md) | 0 | ||||
-rw-r--r-- | guide/src/format/theme/README.md (renamed from book-example/src/format/theme/README.md) | 0 | ||||
-rw-r--r-- | guide/src/format/theme/editor.md (renamed from book-example/src/format/theme/editor.md) | 0 | ||||
-rw-r--r-- | guide/src/format/theme/index-hbs.md (renamed from book-example/src/format/theme/index-hbs.md) | 0 | ||||
-rw-r--r-- | guide/src/format/theme/syntax-highlighting.md (renamed from book-example/src/format/theme/syntax-highlighting.md) | 0 | ||||
-rw-r--r-- | guide/src/misc/contributors.md (renamed from book-example/src/misc/contributors.md) | 0 | ||||
-rw-r--r-- | guide/src/misc/introduction.md (renamed from book-example/src/misc/introduction.md) | 0 | ||||
-rw-r--r-- | src/preprocess/cmd.rs | 6 | ||||
-rw-r--r-- | tests/dummy_book/mod.rs | 6 | ||||
-rw-r--r-- | tests/rendered_output.rs | 2 |
35 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a3f6b700..cc01f5b5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,12 +31,12 @@ jobs: - name: Install Rust (rustup) run: rustup update stable --no-self-update && rustup default stable - name: Build book - run: cargo run -- build book-example + run: cargo run -- build guide - name: Deploy to GitHub env: GITHUB_DEPLOY_KEY: ${{ secrets.GITHUB_DEPLOY_KEY }} run: | - touch book-example/book/.nojekyll + touch guide/book/.nojekyll curl -LsSf https://raw.githubusercontent.com/rust-lang/simpleinfra/master/setup-deploy-keys/src/deploy.rs | rustc - -o /tmp/deploy - cd book-example/book + cd guide/book /tmp/deploy @@ -4,7 +4,7 @@ target .DS_Store book-test -book-example/book +guide/book .vscode tests/dummy_book/book/ @@ -8,7 +8,7 @@ authors = [ ] documentation = "http://rust-lang.github.io/mdBook/index.html" edition = "2018" -exclude = ["/book-example/*"] +exclude = ["/guide/*"] keywords = ["book", "gitbook", "rustbook", "markdown"] license = "MPL-2.0" readme = "README.md" diff --git a/book-example/book.toml b/guide/book.toml index 96dcf312..96dcf312 100644 --- a/book-example/book.toml +++ b/guide/book.toml diff --git a/book-example/src/404.md b/guide/src/404.md index a55db44e..a55db44e 100644 --- a/book-example/src/404.md +++ b/guide/src/404.md diff --git a/book-example/src/README.md b/guide/src/README.md index 99e55bce..99e55bce 100644 --- a/book-example/src/README.md +++ b/guide/src/README.md diff --git a/book-example/src/SUMMARY.md b/guide/src/SUMMARY.md index 3ae143fb..3ae143fb 100644 --- a/book-example/src/SUMMARY.md +++ b/guide/src/SUMMARY.md diff --git a/book-example/src/cli/README.md b/guide/src/cli/README.md index 080804ff..080804ff 100644 --- a/book-example/src/cli/README.md +++ b/guide/src/cli/README.md diff --git a/book-example/src/cli/build.md b/guide/src/cli/build.md index 2521a640..2521a640 100644 --- a/book-example/src/cli/build.md +++ b/guide/src/cli/build.md diff --git a/book-example/src/cli/clean.md b/guide/src/cli/clean.md index 23efc450..23efc450 100644 --- a/book-example/src/cli/clean.md +++ b/guide/src/cli/clean.md diff --git a/book-example/src/cli/init.md b/guide/src/cli/init.md index 23d55164..23d55164 100644 --- a/book-example/src/cli/init.md +++ b/guide/src/cli/init.md diff --git a/book-example/src/cli/serve.md b/guide/src/cli/serve.md index 3bd6dd93..3bd6dd93 100644 --- a/book-example/src/cli/serve.md +++ b/guide/src/cli/serve.md diff --git a/book-example/src/cli/test.md b/guide/src/cli/test.md index c13e8809..c13e8809 100644 --- a/book-example/src/cli/test.md +++ b/guide/src/cli/test.md diff --git a/book-example/src/cli/watch.md b/guide/src/cli/watch.md index bc8c3821..bc8c3821 100644 --- a/book-example/src/cli/watch.md +++ b/guide/src/cli/watch.md diff --git a/book-example/src/continuous-integration.md b/guide/src/continuous-integration.md index 50a92af0..50a92af0 100644 --- a/book-example/src/continuous-integration.md +++ b/guide/src/continuous-integration.md diff --git a/book-example/src/for_developers/README.md b/guide/src/for_developers/README.md index 14a56d55..14a56d55 100644 --- a/book-example/src/for_developers/README.md +++ b/guide/src/for_developers/README.md diff --git a/book-example/src/for_developers/backends.md b/guide/src/for_developers/backends.md index 5b958067..5b958067 100644 --- a/book-example/src/for_developers/backends.md +++ b/guide/src/for_developers/backends.md diff --git a/book-example/src/for_developers/mdbook-wordcount/Cargo.toml b/guide/src/for_developers/mdbook-wordcount/Cargo.toml index e58e73b6..e58e73b6 100644 --- a/book-example/src/for_developers/mdbook-wordcount/Cargo.toml +++ b/guide/src/for_developers/mdbook-wordcount/Cargo.toml diff --git a/book-example/src/for_developers/mdbook-wordcount/src/main.rs b/guide/src/for_developers/mdbook-wordcount/src/main.rs index 607338dd..607338dd 100644 --- a/book-example/src/for_developers/mdbook-wordcount/src/main.rs +++ b/guide/src/for_developers/mdbook-wordcount/src/main.rs diff --git a/book-example/src/for_developers/preprocessors.md b/guide/src/for_developers/preprocessors.md index c8086298..c8086298 100644 --- a/book-example/src/for_developers/preprocessors.md +++ b/guide/src/for_developers/preprocessors.md diff --git a/book-example/src/format/README.md b/guide/src/format/README.md index 35757252..35757252 100644 --- a/book-example/src/format/README.md +++ b/guide/src/format/README.md diff --git a/book-example/src/format/config.md b/guide/src/format/config.md index d9c77e66..d9c77e66 100644 --- a/book-example/src/format/config.md +++ b/guide/src/format/config.md diff --git a/book-example/src/format/example.rs b/guide/src/format/example.rs index 6b49705c..6b49705c 100644 --- a/book-example/src/format/example.rs +++ b/guide/src/format/example.rs diff --git a/book-example/src/format/mathjax.md b/guide/src/format/mathjax.md index 3dd79215..3dd79215 100644 --- a/book-example/src/format/mathjax.md +++ b/guide/src/format/mathjax.md diff --git a/book-example/src/format/mdbook.md b/guide/src/format/mdbook.md index 223ba215..223ba215 100644 --- a/book-example/src/format/mdbook.md +++ b/guide/src/format/mdbook.md diff --git a/book-example/src/format/summary.md b/guide/src/format/summary.md index 7b2d5d8d..7b2d5d8d 100644 --- a/book-example/src/format/summary.md +++ b/guide/src/format/summary.md diff --git a/book-example/src/format/theme/README.md b/guide/src/format/theme/README.md index d27a1fc7..d27a1fc7 100644 --- a/book-example/src/format/theme/README.md +++ b/guide/src/format/theme/README.md diff --git a/book-example/src/format/theme/editor.md b/guide/src/format/theme/editor.md index e39032f5..e39032f5 100644 --- a/book-example/src/format/theme/editor.md +++ b/guide/src/format/theme/editor.md diff --git a/book-example/src/format/theme/index-hbs.md b/guide/src/format/theme/index-hbs.md index 34904559..34904559 100644 --- a/book-example/src/format/theme/index-hbs.md +++ b/guide/src/format/theme/index-hbs.md diff --git a/book-example/src/format/theme/syntax-highlighting.md b/guide/src/format/theme/syntax-highlighting.md index 42039cdd..42039cdd 100644 --- a/book-example/src/format/theme/syntax-highlighting.md +++ b/guide/src/format/theme/syntax-highlighting.md diff --git a/book-example/src/misc/contributors.md b/guide/src/misc/contributors.md index 8d1a30ff..8d1a30ff 100644 --- a/book-example/src/misc/contributors.md +++ b/guide/src/misc/contributors.md diff --git a/book-example/src/misc/introduction.md b/guide/src/misc/introduction.md index 36495382..36495382 100644 --- a/book-example/src/misc/introduction.md +++ b/guide/src/misc/introduction.md diff --git a/src/preprocess/cmd.rs b/src/preprocess/cmd.rs index 625c143b..f9c64e28 100644 --- a/src/preprocess/cmd.rs +++ b/src/preprocess/cmd.rs @@ -171,15 +171,15 @@ mod tests { use crate::MDBook; use std::path::Path; - fn book_example() -> MDBook { - let example = Path::new(env!("CARGO_MANIFEST_DIR")).join("book-example"); + fn guide() -> MDBook { + let example = Path::new(env!("CARGO_MANIFEST_DIR")).join("guide"); MDBook::load(example).unwrap() } #[test] fn round_trip_write_and_parse_input() { let cmd = CmdPreprocessor::new("test".to_string(), "test".to_string()); - let md = book_example(); + let md = guide(); let ctx = PreprocessorContext::new( md.root.clone(), md.config.clone(), diff --git a/tests/dummy_book/mod.rs b/tests/dummy_book/mod.rs index a395c2df..d9d9a068 100644 --- a/tests/dummy_book/mod.rs +++ b/tests/dummy_book/mod.rs @@ -135,11 +135,11 @@ fn recursive_copy<A: AsRef<Path>, B: AsRef<Path>>(from: A, to: B) -> Result<()> } pub fn new_copy_of_example_book() -> Result<TempDir> { - let temp = TempFileBuilder::new().prefix("book-example").tempdir()?; + let temp = TempFileBuilder::new().prefix("guide").tempdir()?; - let book_example = Path::new(env!("CARGO_MANIFEST_DIR")).join("book-example"); + let guide = Path::new(env!("CARGO_MANIFEST_DIR")).join("guide"); - recursive_copy(book_example, temp.path())?; + recursive_copy(guide, temp.path())?; Ok(temp) } diff --git a/tests/rendered_output.rs b/tests/rendered_output.rs index 4f0568dc..6234c29b 100644 --- a/tests/rendered_output.rs +++ b/tests/rendered_output.rs @@ -345,7 +345,7 @@ fn create_missing_file_with_config() { } /// This makes sure you can include a Rust file with `{{#playground example.rs}}`. -/// Specification is in `book-example/src/format/rust.md` +/// Specification is in `guide/src/format/rust.md` #[test] fn able_to_include_playground_files_in_chapters() { let temp = DummyBook::new().build().unwrap(); |