about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-06-10 18:41:42 +0000
committerbors <bors@rust-lang.org>2015-06-10 18:41:42 +0000
commitae8a3c92a77e9295a764fc98998245aa1e0336b1 (patch)
treebfd4ea2a05ff2b50273142c85cf301efc39af78d /src/liballoc
parentd8a9570154dfbc4032cb3a6ba8b51c6256518dcd (diff)
parentc8519c9793128cb15b91498cda9a90d948d53da3 (diff)
downloadrust-ae8a3c92a77e9295a764fc98998245aa1e0336b1.tar.gz
rust-ae8a3c92a77e9295a764fc98998245aa1e0336b1.zip
Auto merge of #26182 - Manishearth:rollup, r=Manishearth
- Successful merges: #26142, #26143, #26145, #26146, #26164, #26174
- Failed merges: 
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index ac5a5d60cbd..5541a5f34c4 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -22,9 +22,9 @@
 //!
 //! ## Boxed values
 //!
-//! The [`Box`](boxed/index.html) type is the core owned pointer type in Rust.
-//! There can only be one owner of a `Box`, and the owner can decide to mutate
-//! the contents, which live on the heap.
+//! The [`Box`](boxed/index.html) type is a smart pointer type. There can
+//! only be one owner of a `Box`, and the owner can decide to mutate the
+//! contents, which live on the heap.
 //!
 //! This type can be sent among threads efficiently as the size of a `Box` value
 //! is the same as that of a pointer. Tree-like data structures are often built