Fix some typos and grammar mistakes (#2269)

This commit is contained in:
Xu Xiaoqiang
2019-11-21 21:40:56 +08:00
committed by Mingyu Chen
parent 4fb498a1dc
commit bcc876e0de

View File

@ -1,4 +1,4 @@
<!--
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@ -21,7 +21,7 @@ under the License.
[![Join the chat at https://gitter.im/apache-doris/Lobby](https://badges.gitter.im/apache-doris/Lobby.svg)](https://gitter.im/apache-doris/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Doris is an MPP-based interactive SQL data warehousing for reporting and analysis.
Its orignal name was Palo, developed in Baidu. After donating it to Apache Software Foundation, it was renamed Doris.
Its original name was Palo, developed in Baidu. After donating it to Apache Software Foundation, it was renamed Doris.
## 1. License
@ -31,11 +31,11 @@ Its orignal name was Palo, developed in Baidu. After donating it to Apache Softw
Doris mainly integrates the technology of Google Mesa and Apache Impala, and it is based on a column-oriented storage engine and can communicate by MySQL client.
## 3. User cases
Doris not only provides high concurrent low latency point query performance, but also provides high throughput queries of ad-hoc analysis.
Doris not only provides high concurrent low latency point query performance, but also provides high throughput queries of ad-hoc analysis.
Doris not only provides batch data loading, but also provides near real-time mini-batch data loading.
Doris not only provides batch data loading, but also provides near real-time mini-batch data loading.
Doris also provides high availability, reliability, fault tolerance, and scalability.
Doris also provides high availability, reliability, fault tolerance, and scalability.
The simplicity (of developing, deploying and using) and meeting many data serving requirements in single system are the main features of Doris (refer to [Overview](https://github.com/apache/incubator-doris/wiki/Doris-Overview)).
@ -45,7 +45,7 @@ Currently only supports Docker environment and Linux OS, such as Ubuntu and Cent
### 4.1 Compile in Docker environment (Recommended)
We offer a docker images as a Doris compilation environment. You can compile Doris from source in it and run the output binaries in other Linux environment.
We offer a docker image as a Doris compilation environment. You can compile Doris from source in it and run the output binaries in other Linux environment.
Firstly, you must be install and start docker service.
@ -65,7 +65,7 @@ REPOSITORY TAG IMAGE ID CREATED
apachedoris/doris-dev build-env f8bc5d4024e0 21 hours ago 3.28GB
```
> NOTE: You may have to use different images to compile from source.
>
>
> | image version | commit id | release version |
> |---|---|---|
> | apachedoris/doris-dev:build-env | before [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.8.x, 0.9.x |
@ -74,9 +74,9 @@ apachedoris/doris-dev build-env f8bc5d4024e0 21 hours ago
#### Step2: Run the Docker image
#### Step2: Run the Docker image
You can run the image directyly:
You can run the image directly:
```
$ docker run -it apachedoris/doris-dev:build-env
@ -90,7 +90,7 @@ $ docker run -it -v /your/local/path/incubator-doris-DORIS-x.x.x-release/:/root/
#### Step3: Download Doris source
Now you should in docker environment.
Now you should attached in docker environment.
You can download Doris source by release package or by git clone in image.
@ -124,7 +124,7 @@ GCC 5.3.1+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.4.3+
After you installed above all, you also must be set them to environment variable PATH and set JAVA_HOME.
If your GCC version is less than 5.3.1, you can run:
If your GCC version is lower than 5.3.1, you can run:
```
sudo yum install devtoolset-4-toolchain -y
@ -134,7 +134,7 @@ and then, set the path of GCC (e.g /opt/rh/devtoolset-4/root/usr/bin) to the env
#### Compile and install
Run following script, it will compile thirdparty libraries and build whole Doris.
Run the following script, it will compile thirdparty libraries and build whole Doris.
```
sh build.sh
@ -142,9 +142,9 @@ sh build.sh
After successfully building, it will install binary files in the directory `output/`.
## 5. Licence Notice
## 5. License Notice
License of some of third-party dependencies are not compatible with Apache 2.0 License. So you may have to disable
Some of the third-party dependencies' license are not compatible with Apache 2.0 License. So you may have to disable
some features of Doris to be complied with Apache 2.0 License. Details can be found in `thirdparty/LICENSE.txt`
## 6. Reporting Issues