Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0

components/upload/index.jsx

@@ -173,7 +173,7 @@ export default class Upload extends React.Component {
     this.handleRemove(targetItem);
   }
 
-  beforeUpload(file) {
+  beforeUpload = (file) => {
     this.recentUploadStatus = this.props.beforeUpload(file);
     return this.recentUploadStatus;
   }

components/upload/uploadList.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import Animate from 'rc-animate';
 import Icon from '../icon';
 const prefixCls = 'ant-upload';
-import { Line } from '../progress';
+import Progress from '../progress';
 import classNames from 'classnames';
 
 // https://developer.mozilla.org/en-US/docs/Web/API/FileReader/readAsDataURL
@@ -81,7 +81,7 @@ export default class UploadList extends React.Component {
       if (file.status === 'uploading') {
         progress = (
           <div className={`${prefixCls}-list-item-progress`}>
-            <Line {...this.props.progressAttr} percent={file.percent} />
+            <Progress type="line" {...this.props.progressAttr} percent={file.percent} />
           </div>
         );
       }

docs/react/install.md

@@ -30,7 +30,7 @@ $ npm install antd@beta --save
 
 ## 浏览器引入
 
-官方不再提供单独的构建文件，建议开发者自行构建 `antd.js` 和 `antd.css`。我们提供了一个 [构建的例子](https://github.com/ant-design/antd-init/tree/master/examples/build-antd-standalone) 以供参考。
+我们在 `antd/dist` 目录下提供了 `antd.js` `antd.css` 以及 `antd.min.js` `antd.min.css` 用于一次性引入所有的 antd 组件，也可以使用 [npmcdn](https://npmcdn.com/) 引入。
 
 ## 开发工具