correct Redis config, various other small fixes

Conflicts:
	admin_manual/configuration_files/files_locking_transactional.rst

admin_manual/configuration_files/files_locking_transactional.rst

@@ -23,29 +23,32 @@ The new file locking mechanism has these capabilities:
 You must install the Redis server and ``php-redis`` module for the new file 
 locking to work. On Debian/Ubuntu/Mint this is ``redis-server`` and 
 ``php5-redis``, and on Red Hat/CentOS/Fedora is it ``redis`` 
-and ``php-pecl-redis`` from the EPEL repository.
+and ``php-pecl-redis`` from the EPEL repository. After installing Redis and its 
+corresponding PHP module, restart your HTTP server.
 
 After installing Redis you must enter a simple configuration in your 
 ``config.php`` file, like this example::
 
- 'filelocking.enabled' => 'true',
- 'memcache.local' => '\OC\Memcache\Redis',
- 'redis' => array(
-	'host' => 'localhost', 
-	// can also be a unix domain socket: 
-        '/tmp/redis.sock',
-	'port' => 6379,
-	'timeout' => 0.0,
-	// Optional, if undefined SELECT will not run and will use Redis 
-        // Server's default DB Index.
-	'dbindex' => 0, 
- ),
- 
-The **Server status** section on your ownCloud Admin page indicates whether 
-experimental file locking is enabled or disabled, and if it is configured 
-correctly. 
+  'filelocking.enabled' => 'true',
+  'memcache.locking' => '\OC\Memcache\Redis',
+  'redis' => array(
+       'host' => 'localhost',
+       // can also be a unix domain socket:
+       '/tmp/redis.sock',
+       'port' => 6379,
+       'timeout' => 0.0,
+       // Optional, if undefined SELECT will not run and will use Redis
+       // Server's default DB Index.
+       //'dbindex' => 0,
+     ),
 
-.. figure:: ../images/file-lock-status.png
+The **Server status** section on your ownCloud Admin page indicates whether 
+<<<<<<< HEAD:admin_manual/configuration_files/files_locking_experimental.rst
+experimental file locking is enabled or disabled.
+
+.. figure:: ../images/transactional-locking-1.png
+
+.. figure:: ../images/transactional-locking-2.png
 
 See ``config.sample.php`` to see configuration examples for Redis, and for all 
 supported memcaches.

admin_manual/configuration_files/index.rst

@@ -14,7 +14,7 @@ File Sharing and Management
     external_storage_configuration
     encryption_configuration
     files_locking_enabling
-    files_locking_experimental
+    files_locking_transactional
     federated_cloud_sharing_configuration
     previews_configuration
     serving_static_files_configuration

admin_manual/configuration_user/user_auth_ldap.rst

@@ -584,7 +584,7 @@ improve login times set up a slave LDAP server to share the load.
 
 The Redis key-value cache and store is an excellent fast and robust cache, and 
 if you are using the new experimental file locking (see 
-:doc:`../configuration_files/files_locking_experimental`) then you must use 
+:doc:`../configuration_files/files_locking_transactional`) then you must use 
 Redis. Redis configuration looks like this::
 
  'filelocking.enabled' => 'true',

admin_manual/enterprise_user_management/user_auth_shibboleth.rst

@@ -229,9 +229,10 @@ Status codes:
 * 100 - successful
 * 998 - user unknown
 
-Example
+Example:
 
 .. code-block:: bash
+
 	$ curl -X DELETE "https://cloud.example.com/ocs/v1.php/cloud/users/myself@testshib.org/non_shib_password" -u admin:admin 
 	<?xml version="1.0"?>
 	<ocs>

admin_manual/installation/nginx_configuration.rst

@@ -1,4 +1,6 @@
 .. _nginx_configuration_example:
+
+===================
 Nginx Configuration
 ===================