diff --git a/docs/deploy/ssl.txt b/docs/deploy/ssl.txt
index ba5d5ca2e98..5bd5c8a903b 100644
--- a/docs/deploy/ssl.txt
+++ b/docs/deploy/ssl.txt
@@ -45,25 +45,25 @@ Next as root edit the Apache geonode config file :file:`/etc/apache/sites-availa
with::
-
-
+
+
At the bottom of the file, replace::
-
+
with::
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/geonode.crt
- SSLCertificateKeyFile /etc/ssl/private/geonode.key
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
-
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/geonode.crt
+ SSLCertificateKeyFile /etc/ssl/private/geonode.key
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ # MSIE 7 and newer should be able to use keepalive
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+
+
This tells Apache where to fine the key and certificate. There are also some additional lines to handle MSIE, taken from Apache's default-ssl file.
@@ -73,20 +73,20 @@ Tomcat Configuration
As root edit the Tomcat server config file :file:`/var/lib/tomcat6/conf/server.xml`, and replace::
with::
+ connectionTimeout="20000"
+ URIEncoding="UTF-8"
+ scheme="https"
+ proxyName=""
+ proxyPort="443"
+ />
This tells Tomcat that it is running behind an https proxy. If this is omitted Tomcat will try to redirect to http.
@@ -95,7 +95,7 @@ GeoNode Configuration
As root edit the geonode config file :file:`/etc/geonode/local_settings.py` and change the ``SITEURL`` protocol to https::
- SITEURL = 'https:///'
+ SITEURL = 'https:///'
GeoServer Configuration
@@ -103,10 +103,10 @@ GeoServer Configuration
As root edit the file :file:`/var/lib/tomcat6/webapps/geoserver/WEB-INF/web.xml` and ensure the ``GEONODE_BASE_URL`` is specified as follows::
-
- GEONODE_BASE_URL
- https://localhost/
-
+
+ GEONODE_BASE_URL
+ https://localhost/
+
Also update ``proxyBaseUrl`` in the Geoserver global settings file :file:`/var/lib/geoserver/geonode-data/global.xml`::
diff --git a/docs/index.txt b/docs/index.txt
index 0e826db9398..ac130c7bdd2 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -56,6 +56,7 @@ Administrators are expected to have some experience with Linux systems but they
* :doc:`Customizing the Look and Feel of GeoNode `
* :doc:`Debugging GeoNode Installations `
* :doc:`Running GeoNode under SSL `
+ * :doc:`Changing the default language `
.. toctree::
@@ -67,6 +68,7 @@ Administrators are expected to have some experience with Linux systems but they
deploy/customize
deploy/debug
deploy/ssl
+ deploy/language
For Developers
==============