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

components/date-picker/demo/start-end.md

@@ -64,7 +64,7 @@ const DateRange = React.createClass({
           showTime
           format="YYYY-MM-DD HH:mm:ss"
           value={this.state.startValue}
-          placeholder="开始日期"
+          placeholder="Start"
           onChange={this.onStartChange}
           onOpenChange={this.handleStartOpenChange}
         />
@@ -73,7 +73,7 @@ const DateRange = React.createClass({
           showTime
           format="YYYY-MM-DD HH:mm:ss"
           value={this.state.endValue}
-          placeholder="结束日期"
+          placeholder="End"
           onChange={this.onEndChange}
           open={this.state.endOpen}
           onOpenChange={this.handleEndOpenChange}

components/date-picker/demo/time.md

@@ -17,10 +17,10 @@ This property provide an additional time selection. When `showTime` is an Object
 import { DatePicker } from 'antd';
 
 function onChange(value) {
-  console.log('选择了时间：', value);
+  console.log('Selected Time: ', value);
 }
 
 ReactDOM.render(
-  <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" onChange={onChange} />
+  <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" placeholder="Select Time" onChange={onChange} />
 , mountNode);
 ````

components/switch/demo/text.md

@@ -17,8 +17,8 @@ With text and icon.
 import { Switch, Icon } from 'antd';
 
 ReactDOM.render(<div>
-  <Switch checkedChildren="开" unCheckedChildren="关" />
-  <Switch checkedChildren="On" unCheckedChildren="Off" />
+  <Switch checkedChildren={'开'} unCheckedChildren={'关'} />
+  <Switch checkedChildren="1" unCheckedChildren="0" />
   <Switch checkedChildren={<Icon type="check" />} unCheckedChildren={<Icon type="cross" />} />
 </div>, mountNode);
 ````