Merge branch 'master' of https://github.com/trans4fun/The-Swift-Programming-Language

Author: 兰梦

README.md

@@ -12,12 +12,12 @@ The Swift Programming Language 中文化项目
    * Swift 初见  [认领 by 容隽] [review by 闻西]
 * Swift 教程
    * 基础部分 [已完成 by 琼雪] [review by 栖邀]
-   * 基本操作符 [认领 by 冰浠]
+   * 基本操作符 [认领 by 冰浠] [review by 姜天意]
    * 字符串和字符 [已完成 by 筱谷] [review by 尘境]
-   * 集合类型 [认领 by 尘境]
+   * 集合类型 [已完成 by 尘境]
    * 控制流 [认领 by 墨昕]
    * 函数 [已完成 by 紫溪] [review by 飞长]
-   * 闭包 [认领 by 闻西]
+   * 闭包 [认领 by 闻西] [review by 米尔]
    * 枚举 [已完成 by 灵吾] [review by 筱谷]
    * 类和结构体 [已完成 by 晓毒]
    * 属性 [认领 by 周源] [review by 林晚]
@@ -27,24 +27,24 @@ The Swift Programming Language 中文化项目
    * 构造过程 [认领 by 刘康] [review by 晓毒]
    * 析构过程 [认领 by 许诺] [review by 祁涛]
    * 自动引用计数 [认领 by 韩国兴/MK] [review by 孟志昂]
-   * 可选链 [认领 by 重鱼]
-   * 类型转换 [认领 by 孟志昂]
-   * 嵌套类型 [认领 by 祁涛]
-   * 扩展 [已完成 by 袁鹏]
-   * 协议 [认领 by 姜天意][review by 重鱼]
-   * 泛型 [已完成 by 晴时]
-   * 高级操作符 [认领 by 林晚]
+   * 可选链 [认领 by 重鱼] [review by 玩家]
+   * 类型转换 [认领 by 孟志昂] [review by 耿霄]
+   * 嵌套类型 [认领 by 祁涛] [review by 袁鹏]
+   * 扩展 [已完成 by 袁鹏] [review by 姜天意]
+   * 协议 [认领 by 姜天意] [review by 重鱼]
+   * 泛型 [已完成 by 晴时] [review by 隐若]
+   * 高级操作符 [认领 by 林晚] [review by 周源]
 * 语言参考
    * 关于语言参考 [认领 by 筱强] [review by 懂象]
-   * 词法结构 [认领 by 筱强][review by 懂象]
-   * 类型 [认领 by 兰梦][review by 筱强]
-   * 表达式 [认领 by 懂象][review by 兰梦]
-   * 语句 [认领 by 玩家] [review by 隐若]
-   * 声明 [认领 by 墨峰]
-   * 属性 [认领 by 隐若]
+   * 词法结构 [认领 by 筱强] [review by 懂象]
+   * 类型 [认领 by 兰梦] [review by 筱强]
+   * 表达式 [认领 by 懂象] [review by 兰梦]
+   * 语句 [认领 by 玩家] 
+   * 声明 [认领 by 墨峰] [review by 龙刚]
+   * 属性 [认领 by 隐若] [review by 姜天意]
    * 模式 [已完成 by 栖邀] [review by 紫溪]
    * 泛型参数 [认领 by 龙刚] [review by 墨峰]
-   * 语法总结 [认领 by 无独]
+   * 语法总结 [认领 by 无独] [review by 晗光]
 
 # 分工
 * 西溪分会 10人 第一部分1-2章 第二部分1-8章

SUMMARY.md

@@ -0,0 +1,41 @@
+# Summary
+
+* 欢迎使用 Swift
+   * [Swift 介绍](src/chapter1/01_About_Swift.md)
+   * [Swift 初见](src/chapter1/02_A_Swift_Tour.md)
+* Swift 教程
+   * [基础部分](src/chapter2/01_The_Basics.md)
+   * [基本操作符](src/chapter2/02_Basic_Operators.md)
+   * [字符串和字符](src/chapter2/03_Strings_and_Characters.md)
+   * [集合类型](src/chapter2/04_Collection_Types.md)
+   * [控制流](src/chapter2/05_Control_Flow.md)
+   * [函数](src/chapter2/06_Functions.md)
+   * [闭包](src/chapter2/07_Closures.md)
+   * [枚举](src/chapter2/08_Enumerations.md)
+   * [类和结构体](src/chapter2/09_Classes_and_Structures.md)
+   * [属性](src/chapter2/10_Properties.md)
+   * [方法](src/chapter2/11_Methods.md)
+   * [下标](src/chapter2/12_Subscripts.md)
+   * [继承](src/chapter2/13_Inheritance.md)
+   * [构造过程](src/chapter2/14_Initialization.md)
+   * [析构过程](src/chapter2/15_Deinitialization.md)
+   * [自动引用计数](src/chapter2/16_Automatic_Reference_Counting.md)
+   * [可选链](src/chapter2/17_Optional_Chaining.md)
+   * [类型转换](src/chapter2/18_Type_Casting.md)
+   * [嵌套类型](src/chapter2/19_Nested_Types.md)
+   * [扩展](src/chapter2/20_Extensions.md)
+   * [协议](src/chapter2/21_Protocols.md)
+   * [泛型](src/chapter2/22_Generics.md)
+   * [高级操作符](src/chapter2/23_Advanced_Operators.md)
+* 语言参考
+   * [关于语言参考](src/chapter3/01_About_the_Language_Reference.md)
+   * [词法结构](src/chapter3/02_Lexical_Structure.md)
+   * [类型](src/chapter3/03_Types.md)
+   * [表达式](src/chapter3/04_Expressions.md)
+   * [语句](src/chapter3/05_Statements.md)
+   * [声明](src/chapter3/06_Declarations.md)
+   * [属性](src/chapter3/07_Attributes.md)
+   * [模式](src/chapter3/08_Patterns.md)
+   * [泛型参数](src/chapter3/09_Generic_Parameters_and_Arguments.md)
+   * [语法总结](src/chapter3/10_Summary_of_the_Grammar.md)
+

src/chapter2/01_The_Basics.md

@@ -7,7 +7,7 @@ Swift是一个用于iOS和OS X平台开发的新的编程语言。尽管如此
 
 Swift provides its own versions of all fundamental C and Objective-C types, including Int for integers; Double and Float for floating-point values; Bool for Boolean values; and String for textual data. Swift also provides powerful versions of the two primary collection types, Array and Dictionary, as described in Collection Types.
 
-Swift为所有C和Objective-C的基础类型提供了自己的版本，包括整数值Int，浮点值Double和Float，布尔值Bool，以及文本值String。Swift还提供了两个强大的常见集合类型，数组和字典，见[集合类型](link to 集合类型)。
+Swift为所有C和Objective-C的基础类型提供了自己的版本，包括整数值Int，浮点值Double和Float，布尔值Bool，以及文本值String。Swift还提供了两个强大的常见集合类型，数组和字典，见[集合类型](link)。
 
 Like C, Swift uses variables to store and refer to values by an identifying name. Swift also makes extensive use of variables whose values cannot be changed. These are known as constants, and are much more powerful than constants in C. Constants are used throughout Swift to make code safer and clearer in intent when you work with values that do not need to change.
 
@@ -93,7 +93,7 @@ The colon in the declaration means “…of type…,” so the code above can be
 
 The phrase “of type String” means “can store any String value.” Think of it as meaning “the type of thing” (or “the kind of thing”) that can be stored.
 
-“类型是”表示“可以储存任意的字符串类型的值”。可以把它想作是“一个事物的类型”它可以储存的。（Think of it as meaning “the type of thing” (or “the kind of thing”) that can be stored. 妈蛋这句真心不会翻啊……）
+“类型是字符串”表示“可以储存任意的字符串类型的值”。可以把它想作是它可以储存的“一个事物的类型”。
 
 The welcomeMessage variable can now be set to any string value without error:
 
@@ -149,7 +149,7 @@ You can change the value of an existing variable to another value of a compatibl
 
 Unlike a variable, the value of a constant cannot be changed once it is set. Attempting to do so is reported as an error when your code is compiled:
 
-和变量不同，常量的值一旦设定就不能更改。尝试这样做会导致代码编译时报错。
+和变量不同，常量的值一旦设定就不能更改。尝试更改会导致代码编译时报错。
 
 	let languageName = "Swift"
 	languageName = "Swift++"
@@ -187,7 +187,7 @@ The println function can print more complex logging messages, in a similar manne
 
 Swift uses string interpolation to include the name of a constant or variable as a placeholder in a longer string, and to prompt Swift to replace it with the current value of that constant or variable. Wrap the name in parentheses and escape it with a backslash before the opening parenthesis:
 
-Swift使用字符串内插(string interpolation)的方式将常量或变量名以占位符的形式加入一个长的字符串中，并且提示Swift用常量或变量的当前值取代替它。将名字包裹在括号中并在前面加上反斜扛来转义。
+Swift使用字符串内插(string interpolation)的方式将常量或变量名以占位符的形式加入一个长的字符串中，并且提示Swift用常量或变量的当前值取代替它。书写格式是将名字包裹在括号中并在前面加上反斜扛来转义：
 
 ```
 println("The current value of friendlyWelcome is \(friendlyWelcome)")