---

bblum · bblum · commit a481148dfe68 · 2012-07-30T18:51:12.000-04:00
yaml --- r: 20730 b: refs/heads/snap-stage3 c: 78dbf7e h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 50f2db4a0e57a03a799a93f95dfd8ce10ffa21dc
+refs/heads/snap-stage3: 78dbf7e22ea639b7022bd5eac20cf1bf96d84360
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/rustdoc/demo.rs b/branches/snap-stage3/src/rustdoc/demo.rs
@@ -14,7 +14,7 @@
 /// The base price of a muffin on a non-holiday
 const price_of_a_muffin: float = 70f;
 
-type waitress = {
+type waitperson = {
     hair_color: ~str
 };
 
@@ -27,7 +27,7 @@ enum omnomnomy {
 }
 
 fn take_my_order_please(
-    _waitress: waitress,
+    _waitperson: waitperson,
     _order: ~[omnomnomy]
 ) -> uint {
 
@@ -36,7 +36,7 @@ fn take_my_order_please(
      *
      * # Arguments
      *
-     * * _waitress - The waitress that you want to bother
+     * * _waitperson - The waitperson that you want to bother
      * * _order - The order vector. It should be filled with food
      *
      * # Return
@@ -183,4 +183,4 @@ impl of the_shunned_house for omnomnomy {
     fn construct() -> bool {
         fail;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/// The base price of a muffin on a non-holiday`
`15`	`15`	`const price_of_a_muffin: float = 70f;`
`16`	`16`
`17`		`-type waitress = {`
	`17`	`+type waitperson = {`
`18`	`18`	`hair_color: ~str`
`19`	`19`	`};`
`20`	`20`
`@@ -27,7 +27,7 @@ enum omnomnomy {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`fn take_my_order_please(`
`30`		`- _waitress: waitress,`
	`30`	`+ _waitperson: waitperson,`
`31`	`31`	`_order: ~[omnomnomy]`
`32`	`32`	`) -> uint {`
`33`	`33`
`@@ -36,7 +36,7 @@ fn take_my_order_please(`
`36`	`36`	`*`
`37`	`37`	`* # Arguments`
`38`	`38`	`*`
`39`		`- * * _waitress - The waitress that you want to bother`
	`39`	`+ * * _waitperson - The waitperson that you want to bother`
`40`	`40`	`* * _order - The order vector. It should be filled with food`
`41`	`41`	`*`
`42`	`42`	`* # Return`
`@@ -183,4 +183,4 @@ impl of the_shunned_house for omnomnomy {`
`183`	`183`	`fn construct() -> bool {`
`184`	`184`	`fail;`
`185`	`185`	`}`
`186`		`-}`
	`186`	`+}`