From c4861fa8f163f09dbe1293da1e6c73427db55f77 Mon Sep 17 00:00:00 2001
From: pengzhile <pengzhile@gmail.com>
Date: Wed, 24 Apr 2019 14:24:29 +0800
Subject: [PATCH] add confluence faq

Signed-off-by: pengzhile <pengzhile@gmail.com>
---
 README.md             |  2 +-
 doc/Confluence_FAQ.md | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 doc/Confluence_FAQ.md

diff --git a/README.md b/README.md
index 7a206af..772338c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 * JIRA plugin: Capture
 * JIRA plugin: Training
 * JIRA plugin: Portfolio
-* Confluence
+* Confluence [Windows特别注意](doc/Confluence_FAQ.md)
 * Confluence plugin: Questions
 * Confluence plugin: Team Calendars
 * Bamboo [FAQ](doc/Bamboo_FAQ.md)
diff --git a/doc/Confluence_FAQ.md b/doc/Confluence_FAQ.md
new file mode 100644
index 0000000..e3b0587
--- /dev/null
+++ b/doc/Confluence_FAQ.md
@@ -0,0 +1,14 @@
+# Confluence FAQ
+
+### Windows下Confluence的激活注意点
+
+* 不要使用start-service.bat启动（如果非要这样启动，自己去注册表改-javaagent参数），改用bin\start-confluence.bat。
+* 在bin\setenv.bat里添加-javaagent参数。
+* Windows下Confluence有个bug，需要改动setenv.bat修复：
+
+ ```bash
+set CATALINA_OPTS=-Xloggc:"%atlassian_logsdir%\gc-%atlassian_timestamp%.log" %CATALINA_OPTS%
+//改成
+set CATALINA_OPTS=-Xloggc:"%atlassian_logsdir%\gc-%%t.log" %CATALINA_OPTS%
+```
+