about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Howell <howellnick@gmail.com>2015-09-24 22:34:01 -0400
committerNick Howell <howellnick@gmail.com>2015-09-24 22:34:01 -0400
commitc8f5f6f70f81a53d708af06b3b96902590e6322c (patch)
tree609e4138740586ef581c48de4e051eaa8ae01a2d
parent5ac899c8c274619895b7595245862cfa5b9c5dd9 (diff)
downloadrust-c8f5f6f70f81a53d708af06b3b96902590e6322c.tar.gz
rust-c8f5f6f70f81a53d708af06b3b96902590e6322c.zip
Replace occurrences of "rust-book" with "rustbook"
-rw-r--r--src/rustbook/build.rs8
-rw-r--r--src/rustbook/help.rs2
-rw-r--r--src/rustbook/javascript.rs2
-rw-r--r--src/rustbook/subcommand.rs2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/rustbook/build.rs b/src/rustbook/build.rs
index aca0db4e1ad..88b9af2a363 100644
--- a/src/rustbook/build.rs
+++ b/src/rustbook/build.rs
@@ -82,7 +82,7 @@ fn write_toc(book: &Book, current_page: &BookItem, out: &mut Write) -> io::Resul
 }
 
 fn render(book: &Book, tgt: &Path) -> CliResult<()> {
-    let tmp = try!(TempDir::new("rust-book"));
+    let tmp = try!(TempDir::new("rustbook"));
 
     for (_section, item) in book.iter() {
         let out_path = match item.path.parent() {
@@ -144,7 +144,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
             format!("--html-before-content={}", prelude.display()),
             format!("--html-after-content={}", postlude.display()),
             format!("--markdown-playground-url=https://play.rust-lang.org"),
-            format!("--markdown-css={}", item.path_to_root.join("rust-book.css").display()),
+            format!("--markdown-css={}", item.path_to_root.join("rustbook.css").display()),
             "--markdown-no-toc".to_string(),
         ];
         let output_result = rustdoc::main_args(rustdoc_args);
@@ -199,10 +199,10 @@ impl Subcommand for Build {
         let css = include_bytes!("static/rustbook.css");
         let js = include_bytes!("static/rustbook.js");
 
-        let mut css_file = try!(File::create(tgt.join("rust-book.css")));
+        let mut css_file = try!(File::create(tgt.join("rustbook.css")));
         try!(css_file.write_all(css));
 
-        let mut js_file = try!(File::create(tgt.join("rust-book.js")));
+        let mut js_file = try!(File::create(tgt.join("rustbook.js")));
         try!(js_file.write_all(js));
 
 
diff --git a/src/rustbook/help.rs b/src/rustbook/help.rs
index 995d2f2494a..c90c2b93609 100644
--- a/src/rustbook/help.rs
+++ b/src/rustbook/help.rs
@@ -36,7 +36,7 @@ impl Subcommand for Help {
 }
 
 pub fn usage() {
-    println!("Usage: rust-book <command> [<args>]");
+    println!("Usage: rustbook <command> [<args>]");
     println!("");
     println!("The <command> must be one of:");
     println!("  help    Print this message.");
diff --git a/src/rustbook/javascript.rs b/src/rustbook/javascript.rs
index beddc23fe2b..88f17414e55 100644
--- a/src/rustbook/javascript.rs
+++ b/src/rustbook/javascript.rs
@@ -11,6 +11,6 @@
 // The rust-book JavaScript in string form.
 
 pub static JAVASCRIPT: &'static str = r#"
-<script type="text/javascript" src="rust-book.js"></script>
+<script type="text/javascript" src="rustbook.js"></script>
 <script type="text/javascript" src="playpen.js"></script>
 "#;
diff --git a/src/rustbook/subcommand.rs b/src/rustbook/subcommand.rs
index 5a8e1f695ae..a66c2b4f302 100644
--- a/src/rustbook/subcommand.rs
+++ b/src/rustbook/subcommand.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Common API for all rust-book subcommands.
+//! Common API for all rustbook subcommands.
 
 use error::CliResult;
 use error::CommandResult;