[GitHub] WillemJiang closed pull request #4: SCB-108 user guide translation

[GitBox <gi...@apache.org>]

WillemJiang closed pull request #4: SCB-108 user guide translation
URL: https://github.com/apache/incubator-servicecomb-website/pull/4
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/_users/servicecomb-introduction.md b/_users/servicecomb-introduction.md
index 872f898..25daafc 100644
--- a/_users/servicecomb-introduction.md
+++ b/_users/servicecomb-introduction.md
@@ -1,38 +1,38 @@
 ---
-title: "Java Chassis????"
+title: "Java Chassis Architecture"
 lang: en
 ref: servicecomb-introduction
 permalink: /users/
-excerpt: "Java Chassis????"
+excerpt: "Java Chassis Architecture"
 last_modified_at: 2017-06-14T10:01:43-04:00
 redirect_from:
   - /theme-setup/
 ---
 
 {% include toc %}
-## ????
-![ServiceComb Model](/assets/images/servicecomb-models.png){: .align-center}
+## Basic Framework
+![ServiceComb Model](/assets/images/servicecomb_mode_en.png){: .align-center}
 
-## ??????
+## Purpose
 
-1.??????????????????????????????????????????????????????????????????legacy??????legacy???????????????????annotation???????????
+1.To decouple the programming and communication models, so that a programming model can be combined with any communication models as needed. Application developers only need to focus on APIs during development and can flexibly switch communication models during deployment. Services can also be switched over to a legacy system. The developers simply need to modify the configuration file(or annotation) released by the service.
 
-?????SpringMVC?JAX-RS???RPC???????
+Currently, applications can be developed in Spring MVC, JAX-RS, or transparent RPC mode.
 
-2.??API-first?????????????????????????????????????????????????????????????????
+2.To introduce the code-first approach. This allows cross-language communication through API definition-based microservice development and supports the development of software tool chains(such as code generated based on API definitions and API definitions generated based on code) to build a complete development ecosystem.
 
-3.??????????????????????????????????????????????????????
+3.To define common microservice running model, encapsulating fault tolerance methods of microservices used from discovery to interaction, The running model can be customized or extended.
 
-## ????
+## Modules
 
-| ?? | artifact id | ???? | ???? |
-| :--- | :--- | :--- | :--- |
-| ???? | provider-pojo | ? | ??RPC???? |
-| ???? | provider-jaxrs | ? | ??JAX RS???? |
-| ???? | provider-springmvc | ? | ??Spring MVC???? |
-| ???? | transport-rest-vertx | ? | ???HTTP???????????WEB???????????jar |
-| ???? | transport-rest-servlet | ? | ???WEB?????????????war? |
-| ???? | transport-highway | ? | ????????????????java????? |
-| ???? | handler-loadbalance | ? | ????????????????????????????? |
-| ???? | handler-bizkeeper | ? | ?????????????????????? |
-| ???? | handler-tracing | ? | ?????????????????????? |
+| Type                   | artifact id            | Available or NOT | Function                                 |
+| :--------------------- | :--------------------- | :--------------- | :--------------------------------------- |
+| Programming model      | provider-pojo          | Yes              | Provides the RPC development mode.       |
+| Programming model      | provider-jaxrs         | Yes              | Provides the JAX-RS development mode.    |
+| Programming model      | provider-springmvc     | Yes              | Provides the Spring MVC development mode. |
+| Communication on model | transport-rest-vertx   | Yes              | A development framework running over HTTP, it does not depend on Web containers. Applications are packaged as executable .jar files. |
+| Communication on model | transport-rest-servlet | Yes              | A development framework running on Web container. Applications are packaged as WAR files. |
+| Communication on model | transport-highway      | Yes              | Provides high-performance private communication protocols for Java communication. |
+| Running model          | handler-loadbalance    | Yes              | A load balancing module that provides various routing policies and configurations. It is usually used for clients. |
+| Running model          | handler-bizkeeper      | Yes              | Provides service governance functions, such as isolation, fallbreak, and fault tolerance. |
+| Running model          | handler-tracing        | Yes              | Provides the capability of developing and managing TCC transactions. |
diff --git a/_users/setup-environment.md b/_users/setup-environment.md
index af72ea2..9f2c664 100644
--- a/_users/setup-environment.md
+++ b/_users/setup-environment.md
@@ -1,63 +1,63 @@
 ---
-title: "????"
+title: "Setup Environment"
 lang: en
 ref: setup-environment
 permalink: /users/setup-environment/
-excerpt: "????"
+excerpt: "Setup Environment"
 last_modified_at: 2017-09-03T10:01:43-04:00
 ---
 
 {% include toc %}
 
-## ??Java????
+## Setup Local Java Develop Environment
 
-* ??git??????[git????](https://git-scm.com/book/zh/v2/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git)
+* Setup git?Refer to [How to setup git](https://git-scm.com/book/zh/v2/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git)
 
-* ??JDK 1.8??????[JDK????](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html){:target="_blank"}?
+* Setup JDK 1.8?Refer to [How to setup JDK](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html){:target="_blank"}?
 
-* ??Maven 3.x??????[Maven????](https://maven.apache.org/install.html){:target="_blank"}?
+* Setup Maven 3.x?Refer to [How to setup Maven](https://maven.apache.org/install.html){:target="_blank"}?
 
-* ??IntelliJ Idea IDE??????[IntelliJ????](https://www.jetbrains.com/help/idea/installing-and-launching.html){:target="_blank"}?
+* Setup IntelliJ Idea IDE?Refer to [How to setup IntelliJ](https://www.jetbrains.com/help/idea/installing-and-launching.html){:target="_blank"}?
 
-## ??*Service Center*
-??Service Center???????:
+## Starting Local *Service Center*
+There are two ways to start a service center service:
 
-1. ???????????
+1. Start from installation package
 
    <ul class="nav nav-tabs">
      <li data-toggle="tab" class="active"><a data-toggle="tab" href="#windows">Windows</a></li>
      <li data-toggle="tab"><a data-toggle="tab" href="#linux">Linux</a></li>
    </ul>
-   
+
    <div class="tab-content">
      <div id="windows" class="tab-pane active" markdown="1">
-   1. ??[??????????????](https://github.com/ServiceComb/service-center/releases/download/0.5.0/service-center-0.5.0-windows-amd64.zip)
-   2. ?????????
-   3. ????????????????**start**??
+   1. Download [the installation package of ServiceCenter](https://github.com/ServiceComb/service-center/releases/download/0.5.0/service-center-0.5.0-windows-amd64.zip)
+   2. Decompress the installation package into the installation directory.
+   3. Start Local ServiceCenter from **start** file
      </div>
      <div id="linux" class="tab-pane fade" markdown="1">
-   1. ????????????????????
+   4. Download and Decompress command:
    ```bash
    wget https://github.com/ServiceComb/service-center/releases/download/0.5.0/service-center-0.5.0-linux-amd64.tar.gz
    tar xvf service-center-0.5.0-linux-amd64.tar.gz
    ```
-   2. ????????
+   2. Start local service center command:
    ```bash
    bash service-center-0.5.0-linux-amd64/start.sh
    ```
     </div>
    </div>
 
-   ???Window?Linux??????64????
+   NOTE?The OS must be 64-bit.
    {: .notice--warning}
 
-2. ?Docker?????
+2. Start from Docker
 
 ```bash
 docker pull servicecomb/service-center
 docker run -d -p 30100:30100 servicecomb/service-center:latest
 ```
 
-**?????** ????????????IP??*http://127.0.0.1:30100*?  
-???Docker Toolbox???? `docker-machine ip` ??????IP???
+**NOTE?** Running Service Center will bind on: *http://127.0.0.1:30100*?  
+If using Docker Toolbox?command `docker-machine ip` can be used to get binded IP address.
 {: .notice--warning}
diff --git a/assets/images/servicecomb_mode_en.png b/assets/images/servicecomb_mode_en.png
new file mode 100644
index 0000000..1ed0525
Binary files /dev/null and b/assets/images/servicecomb_mode_en.png differ


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services