From 422dfc1e9128c0794985c6e6f15658d891474e4f Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Mon, 8 May 2017 21:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0RM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                | 9 ++++++++-
 .../main/webapp/WEB-INF/template/joblog/joblog.index.ftl | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6e7ed8c9..0b43122c 100644
--- a/README.md
+++ b/README.md
@@ -411,7 +411,14 @@ try{
 
 而且，在JobHandler中开启子线程时，子线程也不可catch处理"InterruptedException"，应该主动向上抛出。
 
-#### 4.9 删除任务
+
+#### 4.9 删除执行日志
+在任务日志界面，选中执行器和任务之后，点击右侧的"删除"按钮将会出现"日志清理"弹框，弹框中支持选择不同类型的日志清理策略，选中后点击"确定"按钮即可进行日志清理操作；
+![输入图片说明](https://static.oschina.net/uploads/img/201705/08210711_Ypik.png "在这里输入图片标题")
+
+![输入图片说明](https://static.oschina.net/uploads/img/201705/08211152_EB65.png "在这里输入图片标题")
+
+#### 4.10 删除任务
 点击删除按钮，可以删除对应任务。
 
 ![输入图片说明](https://static.oschina.net/uploads/img/201607/24140641_Z9Qr.png "在这里输入图片标题")
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
index 8f11dcf5..fa63a13a 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
@@ -150,7 +150,7 @@
                     <hr>
                     <div class="form-group">
                         <div class="col-sm-offset-3 col-sm-6">
-                            <button type="button" class="btn btn-primary ok" >保存</button>
+                            <button type="button" class="btn btn-primary ok" >确定</button>
                             <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
                         </div>
                     </div>
-- 
GitLab