From 490116ca6357bfc693dd05c16a2bc0e1fc5dbb61 Mon Sep 17 00:00:00 2001
From: wojiushixiaobai <296015668@qq.com>
Date: Fri, 27 Apr 2018 08:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/faq.rst              | 12 +++++++-----
 docs/setup_by_centos7.rst |  4 ++--
 docs/setup_by_ubuntu.rst  |  6 +++---
 docs/step_by_step.rst     |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 19191e03..50f29a3b 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -62,11 +62,13 @@ FAQ
       $ rm /opt/guacamole/key/*  # guacamole, 如果你是按文档安装的，key应该在这里
       $ systemctl stop docker
       $ systemctl start docker
-      $ docker run —name jms_guacamole -d \
-         -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \
-         -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-         -e JUMPSERVER_SERVER=http://<填写jumpserver的IP地址>:8080 \
-         registry.jumpserver.org/public/guacamole:1.0.0
+      $ docker run --name jms_guacamole -d \
+        -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \
+        -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
+        -e JUMPSERVER_SERVER=http://<填写jumpserver的url地址> \
+        registry.jumpserver.org/public/guacamole:latest
+
+      # 如果registry.jumpserver.org/public/guacamole:latest下载很慢，可以换成jumpserver/guacamole:latest
 
       # 正常运行后到Jumpserver 会话管理-终端管理 里面接受gua注册
       $ docker restart jms_guacamole  # 如果接受注册后显示不在线，重启gua就好了
diff --git a/docs/setup_by_centos7.rst b/docs/setup_by_centos7.rst
index a05f8b69..494ad9fb 100644
--- a/docs/setup_by_centos7.rst
+++ b/docs/setup_by_centos7.rst
@@ -246,8 +246,8 @@ CentOS 7 安装文档
     $ docker run --name jms_guacamole -d \
       -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \
       -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-      -e JUMPSERVER_SERVER=http://<填写jumpserver的地址> \
-      registry.jumpserver.org/public/guacamole:1.0.0
+      -e JUMPSERVER_SERVER=http://<填写jumpserver的url地址> \
+      registry.jumpserver.org/public/guacamole:latest
 
 ::
 
diff --git a/docs/setup_by_ubuntu.rst b/docs/setup_by_ubuntu.rst
index 08a70eed..2fe189c2 100644
--- a/docs/setup_by_ubuntu.rst
+++ b/docs/setup_by_ubuntu.rst
@@ -235,11 +235,11 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
 
     # 注意：这里一定要改写一下本机的IP地址, 否则会出错，带宽有限, 下载时间可能有点长，可以喝杯咖啡，别看对面了，你对面不是小姐姐。
 
-    $ docker run -d \
+    $ docker run --name jms_guacamole -d \
       -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \
       -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-      -e JUMPSERVER_SERVER=http://<填写本机的IP地址>:8080 \
-      registry.jumpserver.org/public/guacamole:1.0.0
+      -e JUMPSERVER_SERVER=http://<填写jumpserver的url地址> \
+      registry.jumpserver.org/public/guacamole:latest
 
 这里所需要注意的是 guacamole 暴露出来的端口是 8081，若与主机上其他端口冲突请自定义一下。
 
diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst
index 8cfac4c8..4ebbf6db 100644
--- a/docs/step_by_step.rst
+++ b/docs/step_by_step.rst
@@ -288,7 +288,7 @@ Jumpserver 会话管理-终端管理（http://192.168.244.144:8080/terminal/term
     $ docker run --name jms_guacamole -d \
       -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \
       -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-      -e JUMPSERVER_SERVER=http://<填写本机的IP地址>:8080 \
+      -e JUMPSERVER_SERVER=http://<填写jumpserver的url地址> \
       registry.jumpserver.org/public/guacamole:1.0.0
 
 六. 配置 Nginx 整合各组件
-- 
2.18.0