summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Danford <jordandanford@gmail.com>2017-07-05 23:28:46 -0700
committerAndrew Gallant <jamslam@gmail.com>2017-07-06 06:58:14 -0400
commitc8a5a7a3f432df7a21edfe027107e63d1b67cd23 (patch)
tree10e621bc57998c01e441e703bbf5d96bbd937311
parentdd3df0ded784a859ebecdb65f154f380f9d176c1 (diff)
Fix minor grammar issues in docs for `ignore::Walk`
-rw-r--r--ignore/src/walk.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/ignore/src/walk.rs b/ignore/src/walk.rs
index a5989d14..fdb12832 100644
--- a/ignore/src/walk.rs
+++ b/ignore/src/walk.rs
@@ -380,16 +380,16 @@ impl DirEntryRaw {
/// is: `.ignore`, `.gitignore`, `.git/info/exclude`, global gitignore and
/// finally explicitly added ignore files. Note that precedence between
/// different types of ignore files is not impacted by the directory hierarchy;
-/// any `.ignore` file overrides all `.gitignore` files. Within each
-/// precedence level, more nested ignore files have a higher precedence over
-/// less nested ignore files.
-/// * Third, if the previous step yields an ignore match, than all matching
-/// is stopped and the path is skipped.. If it yields a whitelist match, then
-/// process continues. A whitelist match can be overridden by a later matcher.
+/// any `.ignore` file overrides all `.gitignore` files. Within each precedence
+/// level, more nested ignore files have a higher precedence than less nested
+/// ignore files.
+/// * Third, if the previous step yields an ignore match, then all matching
+/// is stopped and the path is skipped. If it yields a whitelist match, then
+/// matching continues. A whitelist match can be overridden by a later matcher.
/// * Fourth, unless the path is a directory, the file type matcher is run on
-/// the path. As above, if it's an ignore match, then all matching is stopped
-/// and the path is skipped. If it's a whitelist match, then matching
-/// continues.
+/// the path. As above, if it yields an ignore match, then all matching is
+/// stopped and the path is skipped. If it yields a whitelist match, then
+/// matching continues.
/// * Fifth, if the path hasn't been whitelisted and it is hidden, then the
/// path is skipped.
/// * Sixth, unless the path is a directory, the size of the file is compared