[incubator-skywalking] branch master updated: Adjust Tomcat deploy doc (#1330)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new ab82f64  Adjust Tomcat deploy doc (#1330)
ab82f64 is described below

commit ab82f644a0150264740cf6f19130a250da25a715
Author: haotian2015 <18...@163.com>
AuthorDate: Fri Jun 8 17:08:51 2018 +0800

    Adjust Tomcat deploy doc (#1330)
---
 docs/cn/Deploy-skywalking-agent-CN.md | 6 +++---
 docs/en/Deploy-skywalking-agent.md    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/cn/Deploy-skywalking-agent-CN.md b/docs/cn/Deploy-skywalking-agent-CN.md
index d4c928b..91ac6ac 100644
--- a/docs/cn/Deploy-skywalking-agent-CN.md
+++ b/docs/cn/Deploy-skywalking-agent-CN.md
@@ -70,14 +70,14 @@ logging.level=DEBUG
 - Log默认使用文件输出，输出到`/logs`目录中
 
 # Tomcat配置探针FAQ
-- Tomcat 7
+- Linux Tomcat 7, Tomcat 8
 修改`tomcat/bin/catalina.sh`，在首行加入如下信息
 ```shell
 CATALINA_OPTS="$CATALINA_OPTS -javaagent:/path/to/skywalking-agent/skywalking-agent.jar"; export CATALINA_OPTS
 ```
 
-- Tomcat 8
-修改`tomcat/bin/catalina.sh`，在首行加入如下信息
+- Windows Tomcat7, Tomcat 8
+修改`tomcat/bin/catalina.bat`，在首行加入如下信息
 ```shell
 set "CATALINA_OPTS=... -javaagent:E:\apache-tomcat-8.5.20\skywalking-agent\skywalking-agent.jar"
 ```
\ No newline at end of file
diff --git a/docs/en/Deploy-skywalking-agent.md b/docs/en/Deploy-skywalking-agent.md
index d335246..a270064 100644
--- a/docs/en/Deploy-skywalking-agent.md
+++ b/docs/en/Deploy-skywalking-agent.md
@@ -30,14 +30,14 @@ New agent package looks like this：
 - The default logging output folder is `/logs`.
 
 # Deploy agent in Tomcat FAQ
-- Tomcat 7
+- Linux Tomcat 7, Tomcat 8
 Change the first line of `tomcat/bin/catalina.sh`.
 ```shell
 CATALINA_OPTS="$CATALINA_OPTS -javaagent:/path/to/skywalking-agent/skywalking-agent.jar"; export CATALINA_OPTS
 ```
 
-- Tomcat 8
-Change the first line of `tomcat/bin/catalina.sh`.
+- Windows Tomcat7, Tomcat 8
+Change the first line of `tomcat/bin/catalina.bat`.
 ```shell
 set "CATALINA_OPTS=-javaagent:E:\apache-tomcat-8.5.20\skywalking-agent\skywalking-agent.jar"
 ```
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.