---

yaml
---
r: 42746
b: refs/heads/try
c: 6cabe2b
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 88bec09e6345d64d334c6dc1ef4947b35c467373
+refs/heads/try: 6cabe2b90226e2262c8c1937b604d9f2c6f14059
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/doc/tutorial-borrowed-ptr.md

@@ -302,7 +302,7 @@ rejected by the compiler):
 fn example3() -> int {
     let mut x = ~X {f: 3};
     let y = &x.f;
-    x = ~{f: 4};  // Error reported here.
+    x = ~X {f: 4};  // Error reported here.
     *y
 }
 ~~~
@@ -369,9 +369,11 @@ box's owner. Consider a program like this:
 ~~~
 struct R { g: int }
 struct S { mut f: ~R }
-fn example5a(x: @S ...) -> int {
+fn example5a(x: @S, callback: @fn()) -> int {
     let y = &x.f.g;   // Error reported here.
     ...
+    callback();
+    ...
 #   return 0;
 }
 ~~~