summary refs log tree commit diff
path: root/src/libstd/path.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-15 16:06:04 +0000
committerbors <bors@rust-lang.org>2015-03-15 16:06:04 +0000
commitb4f5e78b467fff62bcb5287f34940fd0037f2216 (patch)
treea91e930a9aca1a86adfb130b82779b9c78a2cb40 /src/libstd/path.rs
parent95018eec69679681acdfae8608779c1e2674322d (diff)
parent9f1240b665f2157bc2c74701761131ce6e288002 (diff)
downloadrust-b4f5e78b467fff62bcb5287f34940fd0037f2216.tar.gz
rust-b4f5e78b467fff62bcb5287f34940fd0037f2216.zip
Auto merge of #23387 - Manishearth:rollup, r=Manishearth
- Successful merges: #23375, #23379, #23382, #23384
- Failed merges: 
Diffstat (limited to 'src/libstd/path.rs')
-rw-r--r--src/libstd/path.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index 3082e63b818..2159e300744 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -86,8 +86,8 @@
 //!
 //! * Occurrences of `.` are normalized away, *except* if they are at
 //! the beginning of the path (in which case they are often meaningful
-//! in terms of path searching). So, fore xample, `a/./b`, `a/b/`,
-//! `/a/b/.` and `a/b` all ahve components `a` and `b`, but `./a/b`
+//! in terms of path searching). So, for example, `a/./b`, `a/b/`,
+//! `/a/b/.` and `a/b` all have components `a` and `b`, but `./a/b`
 //! has a leading current directory component.
 //!
 //! No other normalization takes place by default. In particular,