You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/29 03:53:26 UTC
[shardingsphere] branch master updated: grammar (#6499)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new fe3a850 grammar (#6499)
fe3a850 is described below
commit fe3a850a723daaf9b2ac9b671b7d0cd70b96aea3
Author: wubingting <49...@users.noreply.github.com>
AuthorDate: Wed Jul 29 11:53:13 2020 +0800
grammar (#6499)
---
CONTRIBUTING.md | 2 +-
README.md | 2 +-
RELEASE-NOTES.md | 2 +-
docs/blog/content/material/ElasticJob.en.md | 2 +-
docs/blog/content/material/proxy.en.md | 2 +-
.../exampleSite/content/shortcodes/attachments.en.cn.md | 2 +-
docs/community/content/contribute/release.en.md | 2 +-
docs/community/content/contribute/subscribe.en.md | 2 +-
docs/document/content/faq/_index.en.md | 4 ++--
.../content/features/governance/management/registry-center.en.md | 4 ++--
docs/document/content/features/pluggable-architecture/_index.en.md | 4 ++--
docs/document/content/features/scaling/_index.en.md | 2 +-
docs/document/content/features/sharding/_index.en.md | 2 +-
docs/document/content/features/sharding/concept/configuration.en.md | 4 ++--
.../content/quick-start/shardingsphere-jdbc-quick-start.en.md | 2 +-
docs/document/content/user-manual/_index.en.md | 2 +-
.../content/user-manual/shardingsphere-proxy/usage/transaction.en.md | 2 +-
examples/docker/docker-compose.md | 4 ++--
18 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 82e5b18..2b60676 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ You can report a bug, submit a new feature enhancement recommendation, or commit
## Commit pull request
- - Please choose a interested issue, or create a new issue and then settle a correct label.
+ - Please choose an interested issue, or create a new issue and then settle a correct label.
- Reply a deadline message to pickup this issue.
- Find a mentor in [Core developers list](https://shardingsphere.apache.org/community/en/team/), he will give you feedback for design and implements.
- Fork to your github repo and begin to work.
diff --git a/README.md b/README.md
index b20fd6e..64e1397 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Apache ShardingSphere begins to focus on pluggable architecture from version 5.x
Currently, the features such as data sharding, read-write splitting, multi replica, data encrypt, shadow test, and SQL dialects / database protocols such as MySQL, PostgreSQL, SQLServer, Oracle supported are all weaved by plugins.
Developers can customize their own ShardingSphere systems just like building lego blocks. There are lots of SPI extensions for Apache ShardingSphere now and increasing continuously.
-ShardingSphere became an [Apache](https://apache.org/index.html#projects-list) Top Level Project on April 16 2020.
+ShardingSphere became an [Apache](https://apache.org/index.html#projects-list) Top Level Project on April 16, 2020.
Welcome communicate with community via [mail list](mailto:dev@shardingsphere.apache.org).
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index f412b2a..1d9ce51 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -44,7 +44,7 @@
### Bug Fixes
-1. Fix an exception caused by using a CHAR/VARCHAR type column as a order by item
+1. Fix an exception caused by using a CHAR/VARCHAR type column as an order by item
1. Refine `DataTypeName` syntax rules of all database dialects
1. Fix an exception caused by executing `BEGIN` using prepared statement of MySQL C API
1. Fix the problem that `ALTER TABLE` fails to execute when the field type of the table contains Integer/Double/BigDecimal
diff --git a/docs/blog/content/material/ElasticJob.en.md b/docs/blog/content/material/ElasticJob.en.md
index aff67af..bae83c7 100644
--- a/docs/blog/content/material/ElasticJob.en.md
+++ b/docs/blog/content/material/ElasticJob.en.md
@@ -18,7 +18,7 @@ chapter = true
ElasticJob can fully meet enterprise user's requirements on scheduling and processing ability for task management and batch jobs.
-ElasticJob began to open it's source code at end of 2014. Since richness functions, quite completed documents and easy to use, it earns a lot of loyal users and good word of mouth in the past five years. ElasticJob is one of the most popular distributed scheduling framework and gains more than 5.8K star on github.
+ElasticJob began to open its source code at end of 2014. Since richness functions, quite completed documents and easy to use, it earns a lot of loyal users and good word of mouth in the past five years. ElasticJob is one of the most popular distributed scheduling framework and gains more than 5.8K star on github.
In the last two years, the core developer spent much time maintaining and contributing to Apache ShardingSphere, which caused ElasticJob to develop slowly. But with the development of Apache ShardingSphere on distributed domain, we need a distributed scheduling component to support distributed management of multi cluster, data migration and scaling. So Apache ShardingSphere community put forward a proposal to make ElasticJob as a sub-project, that makes sure ElasticJob could be maintaine [...]
diff --git a/docs/blog/content/material/proxy.en.md b/docs/blog/content/material/proxy.en.md
index 4a7ee16..3281644 100644
--- a/docs/blog/content/material/proxy.en.md
+++ b/docs/blog/content/material/proxy.en.md
@@ -98,7 +98,7 @@ jdbc:mysql://127.0.0.1:3306/demo_ds?
useServerPrepStmts=true&cachePrepStmts=true
```
-We get the expected message flow. The speed is much faster then normal query after test.
+We get the expected message flow. The speed is much faster than normal query after test.
diff --git a/docs/blog/themes/hugo-theme-learn/exampleSite/content/shortcodes/attachments.en.cn.md b/docs/blog/themes/hugo-theme-learn/exampleSite/content/shortcodes/attachments.en.cn.md
index 81886b0..e568589 100644
--- a/docs/blog/themes/hugo-theme-learn/exampleSite/content/shortcodes/attachments.en.cn.md
+++ b/docs/blog/themes/hugo-theme-learn/exampleSite/content/shortcodes/attachments.en.cn.md
@@ -10,7 +10,7 @@ The Attachments shortcode displays a list of files attached to a page.
## Usage
The shortcurt lists files found in a **specific folder**.
-Currently, it support two implementations for pages
+Currently, it supports two implementations for pages
1. If your page is a markdown file, attachements must be place in a **folder** named like your page and ending with **.files**.
diff --git a/docs/community/content/contribute/release.en.md b/docs/community/content/contribute/release.en.md
index 3fd027a..a5c6421 100644
--- a/docs/community/content/contribute/release.en.md
+++ b/docs/community/content/contribute/release.en.md
@@ -91,7 +91,7 @@ Among them, 700E6065 is public key ID.
### Upload the Public Key to Key Server
-The command is as follow:
+The command is as follows:
```shell
gpg --keyserver hkp://pool.sks-keyservers.net --send-key 700E6065
diff --git a/docs/community/content/contribute/subscribe.en.md b/docs/community/content/contribute/subscribe.en.md
index 45a26e2..bd924046 100644
--- a/docs/community/content/contribute/subscribe.en.md
+++ b/docs/community/content/contribute/subscribe.en.md
@@ -10,7 +10,7 @@ During the process of using ShardingSphere, if there is any problem, suggestion
Use your mailbox to send an e-mail to [dev-subscribe@shardingsphere.apache.org](mailto:dev-subscribe@shardingsphere.apache.org) with any subject or content.
1. Receive and reply the confirmation e-mail.
-After Step 1, you will receive a confirmation e-mail from [dev-help@shardingsphere.apache.org](mailto:dev-help@shardingsphere.apache.org) (if you have not receive that, please check “RSS feeds”, “junk e-mail” or other items). Reply that e-mail directly or click the link in e-mail to reply, with any subject or content.
+After Step 1, you will receive a confirmation e-mail from [dev-help@shardingsphere.apache.org](mailto:dev-help@shardingsphere.apache.org) (if you have not received that, please check “RSS feeds”, “junk e-mail” or other items). Reply that e-mail directly or click the link in e-mail to reply, with any subject or content.
1. Receive the welcome e-mail.
After finishing the two steps above, an e-mail with the subject of `WELCOME to dev@shardingsphere.apache.org` will be sent to your e-mail address. Until now, you have succeeded in subscribing Apache ShardingSphere mail-list.
diff --git a/docs/document/content/faq/_index.en.md b/docs/document/content/faq/_index.en.md
index 1f0446a..8697bb4 100644
--- a/docs/document/content/faq/_index.en.md
+++ b/docs/document/content/faq/_index.en.md
@@ -246,8 +246,8 @@ Answer:
Answer:
-1. Because the spring-boot-starter of certain datasource pool (such as druid) will configured before shardingsphere-jdbc-spring-boot-starter and create a default datasource, then conflict occur when ShardingSphere-JDBC create datasources.
-2. A simple way to solve this issue is removing the the spring-boot-starter of certain datasource pool, shardingsphere-jdbc create datasources with suitable pools.
+1. Because the spring-boot-starter of certain datasource pool (such as druid) will be configured before shardingsphere-jdbc-spring-boot-starter and create a default datasource, then conflict occur when ShardingSphere-JDBC create datasources.
+2. A simple way to solve this issue is removing the spring-boot-starter of certain datasource pool, shardingsphere-jdbc create datasources with suitable pools.
## 21. How to add a new logic schema dynamically when use ShardingSphere-Proxy?
diff --git a/docs/document/content/features/governance/management/registry-center.en.md b/docs/document/content/features/governance/management/registry-center.en.md
index dfdef0f..65b5676 100644
--- a/docs/document/content/features/governance/management/registry-center.en.md
+++ b/docs/document/content/features/governance/management/registry-center.en.md
@@ -51,7 +51,7 @@ It is able to orchestrate read-write split slave database, delete or disable dat
Write `DISABLED` (case insensitive) to `IP@-@PID` to disable that instance; delete `DISABLED` to enable the instance.
-Zookeeper command is as follow:
+Zookeeper command is as follows:
```
[zk: localhost:2181(CONNECTED) 0] set /your_zk_namespace/your_app_name/state/instances/your_instance_ip_a@-@your_instance_pid_x DISABLED
@@ -61,7 +61,7 @@ Zookeeper command is as follow:
Under read-write split scenarios, users can write `DISABLED` (case insensitive) to sub-nodes of data source name to disable slave database sources. Delete `DISABLED` or the node to enable it.
-Zookeeper command is as follow:
+Zookeeper command is as follows:
```
[zk: localhost:2181(CONNECTED) 0] set /your_zk_namespace/your_app_name/state/datasources/your_slave_datasource_name DISABLED
diff --git a/docs/document/content/features/pluggable-architecture/_index.en.md b/docs/document/content/features/pluggable-architecture/_index.en.md
index 7413fb5..c58a040 100644
--- a/docs/document/content/features/pluggable-architecture/_index.en.md
+++ b/docs/document/content/features/pluggable-architecture/_index.en.md
@@ -7,14 +7,14 @@ chapter = true
## Background
-In Apache ShardingSphere, many functionality implementation are uploaded through [SPI (Service Provider Interface)](https://docs.oracle.com/javase/tutorial/sound/SPI-intro.html),
+In Apache ShardingSphere, many functionality implementations are uploaded through [SPI (Service Provider Interface)](https://docs.oracle.com/javase/tutorial/sound/SPI-intro.html),
which is a kind of API for the third party to implement or expand, and can be applied in framework expansion or component replacement.
## Challenges
Pluggable architecture is very difficult to design for the project architecture.
It needs to make each module decouple to independent and imperceptible to each other totally, and enables appendable functions in a way of superposition through a pluggable kernel.
-Design a architecture to completely isolate each function, not only can stimulate the enthusiasm of the open source community, but also can guarantee the quality of the project.
+Design an architecture to completely isolate each function, not only can stimulate the enthusiasm of the open source community, but also can guarantee the quality of the project.
Apache ShardingSphere begin to focus on pluggable architecture from version 5.x, features can be embedded into project flexibility.
Currently, the features such as data sharding, read-write splitting, multi replica, data encrypt, shadow test, and SQL dialects / database protocols such as MySQL, PostgreSQL, SQLServer, Oracle supported are all weaved by plugins.
diff --git a/docs/document/content/features/scaling/_index.en.md b/docs/document/content/features/scaling/_index.en.md
index 6c22e5f..c6e8d24 100644
--- a/docs/document/content/features/scaling/_index.en.md
+++ b/docs/document/content/features/scaling/_index.en.md
@@ -25,7 +25,7 @@ Apache ShardingSphere provides users with great freedom in sharding strategies a
So it's the first challenge that how to find a way can support kinds of sharding strategies and algorithms and scale data nodes efficiently.
What's more, During the scaling process, it should not affect the running applications.
-So It is a other big challenge for scaling to reduce the time window of data unavailability during the scaling as much as possible, or even completely unaware.
+So It is another big challenge for scaling to reduce the time window of data unavailability during the scaling as much as possible, or even completely unaware.
Finally, scaling should not affect the existing data. How to ensure the availability and correctness of data is the third challenge of scaling.
diff --git a/docs/document/content/features/sharding/_index.en.md b/docs/document/content/features/sharding/_index.en.md
index 2e13234..7dc896d 100644
--- a/docs/document/content/features/sharding/_index.en.md
+++ b/docs/document/content/features/sharding/_index.en.md
@@ -36,7 +36,7 @@ Horizontal sharding is also called transverse sharding. Compared with the catego
-Theoretically, horizontal sharding has overcame the limitation of data processing volume in single machine and can be extended relatively freely, so it can be taken as a standard solution to database sharding and table sharding.
+Theoretically, horizontal sharding has overcome the limitation of data processing volume in single machine and can be extended relatively freely, so it can be taken as a standard solution to database sharding and table sharding.
## Challenges
diff --git a/docs/document/content/features/sharding/concept/configuration.en.md b/docs/document/content/features/sharding/concept/configuration.en.md
index 51b811f..0d20c0e 100644
--- a/docs/document/content/features/sharding/concept/configuration.en.md
+++ b/docs/document/content/features/sharding/concept/configuration.en.md
@@ -32,7 +32,7 @@ db1
└── t_order1
```
-So the data node configurations will be as follow:
+So the data node configurations will be as follows:
```
db0.t_order0, db0.t_order1, db1.t_order0, db1.t_order1
@@ -52,7 +52,7 @@ db1
└── t_order4
```
-So the data node configurations will be as follow:
+So the data node configurations will be as follows:
```
db0.t_order0, db0.t_order1, db1.t_order2, db1.t_order3, db1.t_order4
diff --git a/docs/document/content/quick-start/shardingsphere-jdbc-quick-start.en.md b/docs/document/content/quick-start/shardingsphere-jdbc-quick-start.en.md
index 3ac6188..17fdf67 100644
--- a/docs/document/content/quick-start/shardingsphere-jdbc-quick-start.en.md
+++ b/docs/document/content/quick-start/shardingsphere-jdbc-quick-start.en.md
@@ -25,7 +25,7 @@ Please refer to [Configuration Manual](/en/user-manual/shardingsphere-jdbc/confi
## 3. Create Data Source
Use `ShardingSphereDataSourceFactory` and rule configurations to create `ShardingSphereDataSource`, which implements DataSource interface of JDBC.
-It can used for native JDBC or JPA, MyBatis and other ORM frameworks.
+It can be used for native JDBC or JPA, MyBatis and other ORM frameworks.
```java
DataSource dataSource = ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, configurations, properties);
diff --git a/docs/document/content/user-manual/_index.en.md b/docs/document/content/user-manual/_index.en.md
index 685cd25..11bb17e 100644
--- a/docs/document/content/user-manual/_index.en.md
+++ b/docs/document/content/user-manual/_index.en.md
@@ -5,5 +5,5 @@ weight = 4
chapter = true
+++
-This chapter describe how to use projects of Apache ShardingSphere: ShardingSphere-JDBC, ShardingSphere-Proxy and ShardingSphere-Sidecar.
+This chapter describes how to use projects of Apache ShardingSphere: ShardingSphere-JDBC, ShardingSphere-Proxy and ShardingSphere-Sidecar.
Except main projects, this chapter also describe how to use derivative projects of Apache ShardingSphere: ShardingSphere-Scaling and ShardingSphere-UI.
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
index 4e800a9..64e3c06 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
@@ -11,4 +11,4 @@ Default XA transaction manager of ShardingSphere is Atomikos. Users can customiz
## BASE Transaction
-Since we have not pack the BASE implementation jar into ShardingSphere-Proxy, you should copy relevant jar which implement `ShardingTransactionManager` SPI to `conf/lib`, then switch the transaction type to `BASE`.
+Since we have not packed the BASE implementation jar into ShardingSphere-Proxy, you should copy relevant jar which implement `ShardingTransactionManager` SPI to `conf/lib`, then switch the transaction type to `BASE`.
diff --git a/examples/docker/docker-compose.md b/examples/docker/docker-compose.md
index c334974..56c79d3 100644
--- a/examples/docker/docker-compose.md
+++ b/examples/docker/docker-compose.md
@@ -8,7 +8,7 @@ before we use docker compose, please install docker and docker-compose first : h
2. launch the environment by docker compose (docker-compose up -d)
3. access mysql / etcd / zookeeper as you want
4. if there is conflict on port, just modify the corresponding port defined in docker-compose.yml and then launch docker compose again(docker-compose up -d)
-5. if you want to stop these environment, use command docker-compose down
+5. if you want to stop the environment, use command docker-compose down
#### ShardingSphere-Proxy
@@ -16,6 +16,6 @@ before we use docker compose, please install docker and docker-compose first : h
2. launch the environment by docker compose (docker-compose up -d)
3. access proxy by `mysql -h127.0.0.1 -P13308 -proot -uroot`
4. if there is conflict on port, just modify the corresponding port defined in docker-compose.yml and then launch docker compose again(docker-compose up -d)
-5. if you want to stop these environment, use command docker-compose down
+5. if you want to stop the environment, use command docker-compose down
to clean the docker container , you could use docker rm `docker ps -a -q` (be careful)