Merge branch '4.3' into 4.4

Conflicts: source/accounts.rst source/service_offerings.rst
apache · Sep 10, 2014 · 6507638 · 6507638
2 parents 00c90ec + 5d59a37
commit 6507638
Show file tree

Hide file tree

Showing 4 changed files with 8,457 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=ours
+*.mo merge=ours
diff --git a/source/accounts.rst b/source/accounts.rst
@@ -235,9 +235,13 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~~~~~~~~~
 
--  ``ldap.truststore``, ``ldap.truststore.password``:	truststore, password
-   to use for LDAP SSL.
-
+| If the LDAP server requires SSL, you need to enable the below configurations.
+Before enabling SSL for LDAP, you need to get the certificate which the LDAP server is using and add it to a trusted keystore.
+You will need to know the path to the keystore and the password.
+
+-  ``ldap.truststore`` : truststore path
+-  ``ldap.truststore.password`` : truststore password
+
 
 LDAP groups:
 ~~~~~~~~~~~~

diff --git a/source/locale/zh_CN/LC_MESSAGES/networking2.mo b/source/locale/zh_CN/LC_MESSAGES/networking2.mo