fix several mistakes

web/_config.yml

@@ -15,7 +15,7 @@ lessons:
     url: basics2.html
     desc: Case classes, objects, packages, apply, update, Functions are Objects (uniform access principle), pattern matching.
     desc_ru: Case классы, объекты, пакеты, apply, update, Функции как Объекты (единый принцип доступа), сопоставление с образцом.
-    desc_zh_cn: 样本类（Case classes），对象，包，应用，更新，函数即对象（统一访问原则），模式匹配（pattern matching）。
+    desc_zh_cn: 样本类，对象，包，应用，更新，函数即对象（统一访问原则），模式匹配。
   -
     title: Collections
     title_ru: Коллекции
@@ -39,15 +39,15 @@ lessons:
     url: type-basics.html
     desc: Basic Types and type polymorphism, type inference, variance, bounds, quantification
     desc_ru: Основные типы и полиморфизм типов, вывод типов, изменчивость, пределы, квантификация
-    desc_zh_cn: 基本类型和类型多态性，类型推断，TODO方差，突飞猛进，量化
+    desc_zh_cn: 基本类型和类型多态性，类型推断，变性，边界，量化
   -
     title: Advanced types
     title_ru: Дополнительные типы
     title_zh_cn: 高级类型
     url: advanced-types.html
     desc: Advanced Types, view bounds, higher-kinded types, recursive types, structural types
     desc_ru: Дополнительные типы, видимое ограничение, типы высшего порядка, рекурсивные типы, структурные типы
-    desc_zh_cn: TODO高级类型，视图界限，更高kinded类型，递归类型，结构类型
+    desc_zh_cn: 高级类型，视界，更高kinded类型，递归类型，结构类型
   -
     title: Simple Build Tool
     title_ru: Simple Build Tool

web/_layouts/default.html

@@ -31,7 +31,7 @@
       <div class="inner">
         <div class="container">
           <p>
-            Built at <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/stevej" target="_blank">@stevej</a>, <a href="http://twitter.com/marius" target="_blank">@marius</a>, and <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a> with much help from <a href="http://twitter.com/evanm" target="_blank">@evanm</a>, <a href="http://twitter.com/sprsquish" target="_blank">@sprsquish</a>, <a href="http://twitter.com/kevino" target="_blank">@kevino</a>, <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>, <a href="http://twitter.com/timtrueman" target="_blank">@timtrueman</a>, <a href="http://twitter.com/wickman" target="_blank">@wickman</a> and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>; Russian translation by <a href="https://github.com/appigram">appigram</a><br />
+            Built at <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/stevej" target="_blank">@stevej</a>, <a href="http://twitter.com/marius" target="_blank">@marius</a>, and <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a> with much help from <a href="http://twitter.com/evanm" target="_blank">@evanm</a>, <a href="http://twitter.com/sprsquish" target="_blank">@sprsquish</a>, <a href="http://twitter.com/kevino" target="_blank">@kevino</a>, <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>, <a href="http://twitter.com/timtrueman" target="_blank">@timtrueman</a>, <a href="http://twitter.com/wickman" target="_blank">@wickman</a> and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>; Russian translation by <a href="https://github.com/appigram">appigram</a>; Chinese simple translation by <a href="https://github.com/jasonqu">jasonqu</a><br />
             Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
           </p>
         </div>

web/_layouts/post.html

@@ -43,7 +43,7 @@ <h3><a href="index.html">{{ page.title }}</a></h3>
       <div class="inner">
         <div class="container">
           <p>
-            Built at <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/stevej" target="_blank">@stevej</a>, <a href="http://twitter.com/marius" target="_blank">@marius</a>, and <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a> with much help from <a href="http://twitter.com/evanm" target="_blank">@evanm</a>, <a href="http://twitter.com/sprsquish" target="_blank">@sprsquish</a>, <a href="http://twitter.com/kevino" target="_blank">@kevino</a>, <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>, <a href="http://twitter.com/timtrueman" target="_blank">@timtrueman</a>, <a href="http://twitter.com/wickman" target="_blank">@wickman</a> and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>; Russian translation by <a href="https://github.com/appigram">appigram</a><br />
+            Built at <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/stevej" target="_blank">@stevej</a>, <a href="http://twitter.com/marius" target="_blank">@marius</a>, and <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a> with much help from <a href="http://twitter.com/evanm" target="_blank">@evanm</a>, <a href="http://twitter.com/sprsquish" target="_blank">@sprsquish</a>, <a href="http://twitter.com/kevino" target="_blank">@kevino</a>, <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>, <a href="http://twitter.com/timtrueman" target="_blank">@timtrueman</a>, <a href="http://twitter.com/wickman" target="_blank">@wickman</a> and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>; Russian translation by <a href="https://github.com/appigram">appigram</a>; Chinese simple translation by <a href="https://github.com/jasonqu">jasonqu</a><br />
             Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
           </p>
         </div>

web/zh_cn/advanced-types.textile

@@ -7,14 +7,14 @@ layout: post
 
 课程内容：
 
-* "View bounds":#viewbounds ("type classes")
-* "Other Type Bounds":#otherbounds
-* "Higher kinded types & ad-hoc polymorphism":#higher
-* "F-bounded polymorphism / recursive types":#fbounded
-* "Structural types":#structural
-* "Abstract types members":#abstractmem
-* "Type erasures & manifests":#manifest
-* "Case study: Finagle":#finagle
+* "视界":#viewbounds ("类型类")
+* "其他类型限制":#otherbounds
+* "高阶类型 和 特设多态性":#higher
+* "F-界多态性 / 递归类型":#fbounded
+* "结构类型":#structural
+* "抽象类型成员":#abstractmem
+* "类型擦除和清单":#manifest
+* "案例分析: Finagle":#finagle
 
 h2(#viewbounds). 视界（“类型类”）
 
@@ -152,7 +152,7 @@ res37: Ordering[Int] = scala.math.Ordering$Int$@3a9291cf
 
 相结合后往往会使用更少的代码，尤其是串联视图的时候。
 
-h2(#higher). Higher-kinded types & ad-hoc polymorphism 高阶类型 和 特设多态性
+h2(#higher). 高阶类型 和 特设多态性
 
 Scala可以对“更高阶”的类型进行抽象。例如，假设您需要用几种类型的容器处理几种类型的数据。你可能定义了一个<code>Container</code>的接口，它可以被实现为几种类型的容器：<code>Option</code>、<code>List</code>等。你要定义可以使用这些容器里的值的接口，但不想确定值的类型。
 
@@ -319,7 +319,7 @@ scala> (new MakeFoo[String]).make
 res10: String = ""
 </pre>
 
-h2(#finagle). Case study: Finagle
+h2(#finagle). 案例分析: Finagle
 
 参见: https://github.com/twitter/finagle