Merge branch 'master' of github.com:apple/swift-evolution

Author: tkremenek

proposals/0104-improved-integers.md

@@ -298,8 +298,8 @@ public protocol Numeric : Equatable, ExpressibleByIntegerLiteral {
   /// For example:
   ///
   ///     var x = 15
-  ///     y += 7
-  ///     // y == 22
+  ///     x += 7
+  ///     // x == 22
   static func +=(_ lhs: inout Self, rhs: Self)
 
   /// Returns the difference of the two given values.
@@ -319,8 +319,8 @@ public protocol Numeric : Equatable, ExpressibleByIntegerLiteral {
   /// For example:
   ///
   ///     var x = 15
-  ///     y -= 7
-  ///     // y == 8
+  ///     x -= 7
+  ///     // x == 8
   static func -=(_ lhs: inout Self, rhs: Self)
 
   /// Returns the product of the two given values.
@@ -340,8 +340,8 @@ public protocol Numeric : Equatable, ExpressibleByIntegerLiteral {
   /// For example:
   ///
   ///     var x = 15
-  ///     y *= 7
-  ///     // y == 105
+  ///     x *= 7
+  ///     // x == 105
   static func *=(_ lhs: inout Self, rhs: Self)
 }
 
@@ -573,8 +573,8 @@ public protocol BinaryInteger :
   /// For example:
   ///
   ///     var x = 15
-  ///     y /= 7
-  ///     // y == 2
+  ///     x /= 7
+  ///     // x == 2
   static func /=(_ lhs: inout Self, rhs: Self)
 
   /// Returns the remainder of dividing the first value by the second.

proposals/0173-swap-indices.md

@@ -11,7 +11,7 @@ As part of the introduction of the Law of Exclusivity, the current `swap(_:_:)`
 function must be addressed, as this most common uses of `swap` directly violate
 the law. This proposal introduces an alternative: a method on
 `MutableCollection` that takes two indices for swapping two elements in the
-same collection,.
+same collection.
 
 ## Motivation
 
@@ -25,11 +25,11 @@ some typical usage from that file:
     swap(&elements[lo], &elements[hi])
 ```
 
-Under changes proposed as part of the ownership manfifesto, this will no longer
+Under changes proposed as part of the ownership manifesto, this will no longer
 be legal Swift: a single variable (in this case, `elements`) cannot be passed
 as two different `inout` arguments to the same function.
 
-For more background on exclusivity and ownership, see the [manfiesto](https://github.com/apple/swift/blob/master/docs/OwnershipManifesto.md)
+For more background on exclusivity and ownership, see the [manifesto](https://github.com/apple/swift/blob/master/docs/OwnershipManifesto.md)
 
 ## Proposed solution