Updated documentation

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index fa3efea4a6998e644fcfc0aca36df1b2ad717f07..b99aa52eebeb5c9a0880e50c036dbd0d9af2d6c2 100644 (file)
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -61,6 +61,7 @@
     - Korean\r
        - Brazilian Portuguese\r
        - Dutch\r
+       - Chinese (zh_CN)\r
 \r
 ## Gitblit GO Features\r
 - Out-of-the-box integrated stack requiring minimal configuration\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index ea71d413311e1d72475f2e0f06c7a70a410c71e5..6f6fd752e30bb3c7792851bebbd6fd0a161b374b 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -2,6 +2,18 @@
 \r
 ### Current Release\r
 \r
+**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
+\r
+#### fixes\r
+\r
+- Can't set reset settings with $ or { characters through Gitblit Manager because they are not properly escaped\r
+\r
+#### additions\r
+\r
+ - Chinese translation (github/dapengme)\r
+\r
+### Older Releases\r
+\r
 <div class="alert alert-info">\r
 <h4>Update Note 1.2.1</h4>\r
 Because there are now several types of files and folders that must be considered Gitblit data, the default location for data has changed.\r
@@ -10,8 +22,6 @@ Because there are now several types of files and folders that must be considered
 <b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values!\r
 </div>\r
 \r
-**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*\r
-\r
 #### fixes\r
 \r
 - Fixed nullpointer on recursively calculating folder sizes when there is a named pipe or symlink in the hierarchy\r
@@ -47,8 +57,6 @@ However, Express for OpenShift continues to be configured by `web.xml`.
 - Updated Korean translation (github/ds5apn)\r
 - Updated checkstyle definition (github/mystygage)\r
 \r
-### Older Releases\r
-\r
 <div class="alert alert-info">\r
 <h4>Update Note 1.2.0</h4>\r
 The permissions model has changed in the 1.2.0 release.\r