From 5eb6c6f0bdc535b94aa4570d87a94c11c91a2392 Mon Sep 17 00:00:00 2001
From: Guanqun Lu <guanqun.lu@gmail.com>
Date: Fri, 23 Aug 2019 00:54:29 +0800
Subject: [PATCH] some random typo fixes

---
 FAQ.md                       | 6 +++---
 book/src/about_salsa.md      | 5 ++---
 examples/hello_world/main.rs | 2 +-
 src/derived/slot.rs          | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 9937d9de..8f58bb8d 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -18,15 +18,15 @@ revision counters from Glimmer, instead), I still like the name.
 
 You may have noticed that Salsa "feels" a lot like an ECS in some
 ways. That's true -- Salsa's queries are a bit like *components* (and
-the keys to the queries are a bit like *entitites*). But there is one
+the keys to the queries are a bit like *entities*). But there is one
 big difference: **ECS is -- at its heart -- a mutable system**. You
 can get or set a component of some entity whenever you like. In
-contrast, salsa's queries define **define "derived values" via pure
+contrast, salsa's queries **define "derived values" via pure
 computations**.
 
 Partly as a consequence, ECS doesn't handle incremental updates for
 you. When you update some component of some entity, you have to ensure
-that other entities' components are upated appropriately.
+that other entities' components are updated appropriately.
 
 Finally, ECS offers interesting metadata and "aspect-like" facilities,
 such as iterating over all entities that share certain components.
diff --git a/book/src/about_salsa.md b/book/src/about_salsa.md
index f5b4fb0f..0f66b6fd 100644
--- a/book/src/about_salsa.md
+++ b/book/src/about_salsa.md
@@ -7,9 +7,8 @@ on the the incremental recompilation techniques that we built for
 rustc, and many (but not all) of its users are building compilers or
 other similar tooling.
 
-If you'd like to learn more about Salsa, you can check out [the [Hello
-World
-example](https://github.com/salsa-rs/salsa/blob/master/examples/hello_world/main.rs)
+If you'd like to learn more about Salsa, you can check out the
+[Hello World example](https://github.com/salsa-rs/salsa/blob/master/examples/hello_world/main.rs)
 in the repository, or watch some of our [YouTube videos](./videos.md).
 
 If you'd like to chat about Salsa, or you think you might like to
diff --git a/examples/hello_world/main.rs b/examples/hello_world/main.rs
index bfc1ab89..32f0e9b0 100644
--- a/examples/hello_world/main.rs
+++ b/examples/hello_world/main.rs
@@ -7,7 +7,7 @@ use std::sync::Arc;
 // functions) that are defined in one particular spot. Each query
 // group is defined by a trait decorated with the
 // `#[salsa::query_group]` attribute. The trait defines one method per
-// query, with the argments to the method being the query **keys** and
+// query, with the arguments to the method being the query **keys** and
 // the return value being the query's **value**.
 //
 // Along with the trait, each query group has an associated
diff --git a/src/derived/slot.rs b/src/derived/slot.rs
index 65926a58..76d2d553 100644
--- a/src/derived/slot.rs
+++ b/src/derived/slot.rs
@@ -417,7 +417,7 @@ where
                 debug!("sweep({:?}): in-progress", self);
             }
 
-            // Otherwise, drop only value or the whole memo accoring to the
+            // Otherwise, drop only value or the whole memo according to the
             // strategy.
             QueryState::Memoized(memo) => {
                 debug!(