---

yaml
---
r: 136631
b: refs/heads/dist-snap
c: fdd511d
h: refs/heads/master
i:
  136629: 0544f27
  136627: 61a1595
  136623: d85ed6e
v: v3

Author: steveklabnik

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 189b7332968972f34cdbbbd9b62d97ababf53059
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 72c27aba9ca429d7c0a1741a8b63bbc1c8050faf
+refs/heads/dist-snap: fdd511d124523707b20227a7497aced1540add7e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/doc/reference.md

@@ -3950,16 +3950,16 @@ to each function as the task executes. A stack allocation is reclaimed when
 control leaves the frame containing it.
 
 The _heap_ is a general term that describes two separate sets of boxes: managed
-boxes — which may be subject to garbage collection — and owned
-boxes. The lifetime of an allocation in the heap depends on the lifetime of
-the box values pointing to it. Since box values may themselves be passed in and
-out of frames, or stored in the heap, heap allocations may outlive the frame
-they are allocated within.
+boxes — which may be subject to garbage collection — and boxes. The
+lifetime of an allocation in the heap depends on the lifetime of the box values
+pointing to it. Since box values may themselves be passed in and out of frames,
+or stored in the heap, heap allocations may outlive the frame they are
+allocated within.
 
 ### Memory ownership
 
 A task owns all memory it can *safely* reach through local variables, as well
-as managed, owned boxes and references.
+as managed, boxes and references.
 
 When a task sends a value that has the `Send` trait to another task, it loses
 ownership of the value sent and can no longer refer to it. This is statically
@@ -4013,23 +4013,22 @@ state. Subsequent statements within a function may or may not initialize the
 local variables. Local variables can be used only after they have been
 initialized; this is enforced by the compiler.
 
-### Owned boxes
+### Boxes
 
-An  _owned box_ is a reference to a heap allocation holding another value,
-which is constructed by the prefix operator `box`. When the standard library is
-in use, the type of an owned box is `std::owned::Box<T>`.
+An  _box_ is a reference to a heap allocation holding another value, which is
+constructed by the prefix operator `box`. When the standard library is in use,
+the type of an box is `std::owned::Box<T>`.
 
-An example of an owned box type and value:
+An example of an box type and value:
 
 ```
 let x: Box<int> = box 10;
 ```
 
-Owned box values exist in 1:1 correspondence with their heap allocation,
-copying an owned box value makes a shallow copy of the pointer. Rust will
-consider a shallow copy of an owned box to move ownership of the value. After a
-value has been moved, the source location cannot be used unless it is
-reinitialized.
+Box values exist in 1:1 correspondence with their heap allocation, copying an
+box value makes a shallow copy of the pointer. Rust will consider a shallow
+copy of an box to move ownership of the value. After a value has been moved,
+the source location cannot be used unless it is reinitialized.
 
 ```
 let x: Box<int> = box 10;