From 01753a0628baea8d773f4677bb6def8627a37be6 Mon Sep 17 00:00:00 2001
From: catbaron- <catbaron@live.cn>
Date: Mon, 27 Oct 2014 08:37:58 +0900
Subject: [PATCH 1/2] fromRaw() and toRaw() is replaced with rawValue

---
 source/chapter1/02_a_swift_tour.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/chapter1/02_a_swift_tour.md b/source/chapter1/02_a_swift_tour.md
index b9f08998..65f172e7 100755
--- a/source/chapter1/02_a_swift_tour.md
+++ b/source/chapter1/02_a_swift_tour.md
@@ -531,12 +531,12 @@ enum Rank: Int {
         case .King:
             return "king"
         default:
-            return String(self.toRaw())
+            return String(self.rawValue())
         }
     }
 }
 let ace = Rank.Ace
-let aceRawValue = ace.toRaw()
+let aceRawValue = ace.rawValue()
 ```
 
 > 练习：  
@@ -544,10 +544,10 @@ let aceRawValue = ace.toRaw()
 
 在上面的例子中，枚举原始值的类型是`Int`，所以你只需要设置第一个原始值。剩下的原始值会按照顺序赋值。你也可以使用字符串或者浮点数作为枚举的原始值。
 
-使用`toRaw`和`fromRaw`函数来在原始值和枚举值之间进行转换。
+使用'rawValue'在原始值和枚举值之间进行转换。
 
 ```swift
-if let convertedRank = Rank.fromRaw(3) {
+if let convertedRank = Rank(rawValue: 3) {
     let threeDescription = convertedRank.simpleDescription()
 }
 ```

From cf193478aa6799b4ba13cb86943050876b39f661 Mon Sep 17 00:00:00 2001
From: catbaron- <catbaron@live.cn>
Date: Mon, 27 Oct 2014 08:45:52 +0900
Subject: [PATCH 2/2] fromRaw() and toRaw is replaced with 'rawValue'

---
 source-tw/chapter1/02_a_swift_tour.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source-tw/chapter1/02_a_swift_tour.md b/source-tw/chapter1/02_a_swift_tour.md
index c4333459..d673eae6 100644
--- a/source-tw/chapter1/02_a_swift_tour.md
+++ b/source-tw/chapter1/02_a_swift_tour.md
@@ -513,12 +513,12 @@ enum Rank: Int {
         case .King:
             return "king"
         default:
-            return String(self.toRaw())
+            return String(self.rawValue())
         }
     }
 }
 let ace = Rank.Ace
-let aceRawValue = ace.toRaw()
+let aceRawValue = ace.rawValue()
 ```
 
 > 練習：  
@@ -526,10 +526,10 @@ let aceRawValue = ace.toRaw()
 
 在上面的例子中，枚舉原始值的類型是`Int`，所以你只需要設置第一個原始值。剩下的原始值會按照順序賦值。你也可以使用字符串或者浮點數作為枚舉的原始值。
 
-使用`toRaw`和`fromRaw`函數來在原始值和枚舉值之間進行轉換。
+使用`rawValue`來在原始值和枚舉值之間進行轉換。
 
 ```swift
-if let convertedRank = Rank.fromRaw(3) {
+if let convertedRank = Rank(rawValue: 3) {
     let threeDescription = convertedRank.simpleDescription()
 }
 ```