merge from upstream

README

@@ -5,6 +5,5 @@ Introduction
 * 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

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]",