diff --git a/Cargo.toml b/Cargo.toml
index eb8cc4c5..8924668a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,9 +16,11 @@ lock_api = "0.1.4"
 indexmap = "1.0.1"
 log = "0.4.5"
 smallvec = "0.6.5"
-salsa_macros = { version = "0.9", path = "components/salsa_macros" }
+salsa-macros = { version = "0.9", path = "components/salsa-macros" }
 
 [dev-dependencies]
 diff = "0.1.0"
 env_logger = "0.5.13"
 rand = "0.5.5"
+
+[workspace]
\ No newline at end of file
diff --git a/components/salsa_macros/Cargo.toml b/components/salsa-macros/Cargo.toml
similarity index 94%
rename from components/salsa_macros/Cargo.toml
rename to components/salsa-macros/Cargo.toml
index 8879d648..51b0350e 100644
--- a/components/salsa_macros/Cargo.toml
+++ b/components/salsa-macros/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "salsa_macros"
+name = "salsa-macros"
 version = "0.9.1"
 authors = ["Niko Matsakis <niko@alum.mit.edu>"]
 edition = "2018"
diff --git a/components/salsa_macros/LICENSE-APACHE b/components/salsa-macros/LICENSE-APACHE
similarity index 100%
rename from components/salsa_macros/LICENSE-APACHE
rename to components/salsa-macros/LICENSE-APACHE
diff --git a/components/salsa_macros/LICENSE-MIT b/components/salsa-macros/LICENSE-MIT
similarity index 100%
rename from components/salsa_macros/LICENSE-MIT
rename to components/salsa-macros/LICENSE-MIT
diff --git a/components/salsa_macros/README.md b/components/salsa-macros/README.md
similarity index 100%
rename from components/salsa_macros/README.md
rename to components/salsa-macros/README.md
diff --git a/components/salsa_macros/src/lib.rs b/components/salsa-macros/src/lib.rs
similarity index 98%
rename from components/salsa_macros/src/lib.rs
rename to components/salsa-macros/src/lib.rs
index c660e3dc..78d31099 100644
--- a/components/salsa_macros/src/lib.rs
+++ b/components/salsa-macros/src/lib.rs
@@ -34,13 +34,13 @@ use syn::{parse_macro_input, AttributeArgs, FnArg, Ident, ItemTrait, ReturnType,
 /// ```ignore
 /// #[salsa::query_group]
 /// trait TypeckDatabase {
-///     #[salsa::XXX] // see below for legal attributes
+///     #[salsa::input] // see below for other legal attributes
 ///     fn my_query(&self, input: u32) -> u64;
 ///
 ///     /// Queries can have any number of inputs (including zero); if there
 ///     /// is not exactly one input, then the key type will be
 ///     /// a tuple of the input types, so in this case `(u32, f32)`.
-///     fn other_query(input1: u32, input2: f32) -> u64;
+///     fn other_query(&self, input1: u32, input2: f32) -> u64;
 /// }
 /// ```
 ///
@@ -100,7 +100,8 @@ use syn::{parse_macro_input, AttributeArgs, FnArg, Ident, ItemTrait, ReturnType,
 /// Some attributes are mutually exclusive. For example, it is an error to add
 /// multiple storage specifiers:
 ///
-/// ```ignore
+/// ```compile_fail
+/// # use salsa_macros as salsa;
 /// #[salsa::query_group]
 /// trait CodegenDatabase {
 ///     #[salsa::input]
@@ -111,7 +112,8 @@ use syn::{parse_macro_input, AttributeArgs, FnArg, Ident, ItemTrait, ReturnType,
 ///
 /// It is also an error to annotate a function to `invoke` on an `input` query:
 ///
-/// ```compile-fail
+/// ```compile_fail
+/// # use salsa_macros as salsa;
 /// #[salsa::query_group]
 /// trait CodegenDatabase {
 ///     #[salsa::input]