Merge pull request #2663 from wojiushixiaobai/docs

[Update]更新文档

docs/change_log.rst

@@ -5,7 +5,22 @@
 ------------------------
 2019年4月30日
 
+**新增功能**
 
+* 新增权限控制：可分别对连接、上传、下载等动作单独授权；
+
+**功能优化**
+
+* 权限优化：组织管理员不允许对超级管理员进行操作；
+* Luna优化：Luna搜索功能优化；
+
+**Bug修复**
+
+* 修复通过API批量更新用户的bug
+* 修复luna页面刷新不跳转OpeID认证的bug
+* 修复创建azure类型的录像存储时前端的bug
+* 修复其他前端页面bug
+* 修复录像上传到Azure的bug
 
 1.4.9
 ------------------------

docs/setup_by_centos.rst

@@ -365,7 +365,6 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     $ yum install -y java-1.8.0-openjdk libtool
     $ yum install -y cairo-devel libjpeg-turbo-devel libpng-devel uuid-devel
     $ yum install -y ffmpeg-devel freerdp-devel freerdp-plugins pango-devel libssh2-devel libtelnet-devel libvncserver-devel pulseaudio-libs-devel openssl-devel libvorbis-devel libwebp-devel ghostscript
-    $ ln -s /usr/local/lib/freerdp/*.so /usr/lib64/freerdp/
 
 **5.2 编译安装 guacamole 服务**
 
@@ -379,6 +378,7 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     $ autoreconf -fi
     $ ./configure --with-init-dir=/etc/init.d
     $ make && make install
+    $ ln -s /usr/local/lib/freerdp/*.so /usr/lib64/freerdp/
     $ cd ..
     $ rm -rf guacamole-server-0.9.14
     $ ldconfig

docs/setup_by_ubuntu.rst

@@ -341,7 +341,6 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     $ apt-get -y install libtool autoconf
     $ apt-get -y install libcairo2-dev libjpeg-turbo8-dev libpng12-dev libossp-uuid-dev
     $ apt-get -y install libavcodec-dev libavutil-dev libswscale-dev libfreerdp-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev libvorbis-dev libwebp-dev ghostscript
-    $ ln -s /usr/local/lib/freerdp/*.so /usr/lib/x86_64-linux-gnu/freerdp/
     $ apt-get -y install default-jre default-jdk
 
 **5.2 编译安装 guacamole 服务**
@@ -356,6 +355,7 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     $ autoreconf -fi
     $ ./configure --with-init-dir=/etc/init.d
     $ make && make install
+    $ ln -s /usr/local/lib/freerdp/*.so /usr/lib/x86_64-linux-gnu/freerdp/
     $ cd ..
     $ rm -rf guacamole-server-0.9.14
     $ ldconfig

docs/upgrade.rst

@@ -1143,9 +1143,9 @@
 .. code-block:: shell
 
     $ cd /opt/docker-guacamole
-    $ git pull
     $ /etc/init.d/guacd stop
     $ sh /config/tomcat8/bin/shutdown.sh
+    $ git pull
     $ /etc/init.d/guacd start
     $ sh /config/tomcat8/bin/startup.sh
 
@@ -1221,9 +1221,9 @@
 .. code-block:: shell
 
     $ cd /opt/docker-guacamole
-    $ git pull
     $ /etc/init.d/guacd stop
     $ sh /config/tomcat8/bin/shutdown.sh
+    $ git pull
     $ /etc/init.d/guacd start
     $ sh /config/tomcat8/bin/startup.sh