From 3446805a1251d21285536d529dfdb81ab767a190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E9=AB=98=E9=93=81?= Date: Tue, 5 Mar 2013 03:36:27 +0800 Subject: [PATCH 1/2] Update README --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index b6bc847d20..0f4b8d59cd 100644 --- a/README +++ b/README @@ -4,3 +4,7 @@ Introduction * cd druid && mvn install * have fun. +Doucumentation +--- +中文 https://github.com/alibaba/druid/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98 +English https://github.com/alibaba/druid/wiki/FAQ From 93819d9df27d1f5a471bbea53a26e221cf91083d Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Fri, 8 Mar 2013 13:41:54 +0800 Subject: [PATCH 2/2] bugfix http://www.oschina.net/question/2795_92396 --- src/main/resources/support/http/resources/datasource.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/support/http/resources/datasource.html b/src/main/resources/support/http/resources/datasource.html index 33d90dd858..cdbe47264a 100644 --- a/src/main/resources/support/http/resources/datasource.html +++ b/src/main/resources/support/http/resources/datasource.html @@ -35,8 +35,8 @@ ] var descs = ["Specify the username used when creating a new connection.", "The JDBC driver connection URL", "database type", "The fully qualifed name of the JDBC driver class", - "All the fully qualifed name of the filter classes", " Test or not when borrow a connection", "Test or not when return a connection", - "Test or not when a connection is idle for a while","The size of datasource connections to create when initial a datasource", + "All the fully qualifed name of the filter classes", " Test or not when borrow a connection", "Test or not when a connection is idle for a while", + "Test or not when return a connection","The size of datasource connections to create when initial a datasource", "The minimum number of connections a pool should hold. ", "The maximum number of connections for a pool", "", "", "", "", "", "", "", "", "Total times for wait to get a connection","Total millins for wait to get a connection", "The current waiting thread count", "The count of start transaction", "The histogram values of transaction time, [0-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]",