Merge branch 'master' of github.com:ant-design/ant-design

components/cascader/demo/custom-trigger.md

@@ -18,24 +18,24 @@ import { Cascader } from 'antd';
 
 const options = [{
   value: 'zhejiang',
-  label: '浙江',
+  label: 'Zhejiang',
   children: [{
     value: 'hangzhou',
-    label: '杭州',
+    label: 'Hangzhou',
   }],
 }, {
   value: 'jiangsu',
-  label: '江苏',
+  label: 'Jiangsu',
   children: [{
     value: 'nanjing',
-    label: '南京',
+    label: 'Nanjing',
   }],
 }];
 
 const CitySwitcher = React.createClass({
   getInitialState() {
     return {
-      text: '未选择',
+      text: 'Unselect',
     };
   },
   onChange(value, selectedOptions) {
@@ -49,7 +49,7 @@ const CitySwitcher = React.createClass({
         {this.state.text}
          
         <Cascader options={options} onChange={this.onChange}>
-          <a href="#">切换城市</a>
+          <a href="#">Change city</a>
         </Cascader>
       </span>
     );

components/tabs/demo/disabled.md

@@ -21,7 +21,7 @@ ReactDOM.render(
   <Tabs defaultActiveKey="1">
     <TabPane tab="Tab 1" key="1">Tab 1</TabPane>
     <TabPane tab="Tab 2" disabled key="2">Tab 2</TabPane>
-    <TabPane tab="Tav 3" key="3">Tab 3</TabPane>
+    <TabPane tab="Tab 3" key="3">Tab 3</TabPane>
   </Tabs>
 , mountNode);
 ````