From 723e520eb236739f24881219c0aa011a6f17180a Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 5 Dec 2014 12:32:49 +0100 Subject: [PATCH 1/4] generate documentation from config.sample.php --- .../configuration/config_sample_php_parameters.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/admin_manual/configuration/config_sample_php_parameters.rst b/admin_manual/configuration/config_sample_php_parameters.rst index 6412258bd..e82e8ff65 100644 --- a/admin_manual/configuration/config_sample_php_parameters.rst +++ b/admin_manual/configuration/config_sample_php_parameters.rst @@ -519,6 +519,18 @@ If it is not, then any options controlled by ``.htaccess``, such as large file uploads, will not work. It also runs checks on the ``data/`` directory, which verifies that it can't be accessed directly through the web server. +:: + + 'config_is_read_only' => false, + +In certain environments it is desired to have a read-only config file. + +When this switch is set to ``true`` ownCloud will not verify whether the +configuration is writable. However, it will not be possible to configure +all options via the web-interface. Furthermore, when updating ownCloud +it is required to make the config file writable again for the update +process. + Logging ------- From 12f8bf7f32d79909c643505404df137cf4b39925 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 5 Dec 2014 22:17:49 +0100 Subject: [PATCH 2/4] Use correct link --- go.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.php b/go.php index 85a5f13df..2a24d0dfa 100644 --- a/go.php +++ b/go.php @@ -5,7 +5,7 @@ $mapping = array( 'admin-ldap' => '/admin_manual/configuration/auth_ldap.html', - 'admin-dir_permissions' => '/admin_manual/installation/installation_source.html#set-the-directory-permissions', + 'admin-dir_permissions' => '/admin_manual/installation/installation_source.html#setting-secure-directory-permissions', 'admin-source_install' => '/admin_manual/installation/installation_source.html', 'admin-install' => '/admin_manual/installation/index.html', 'admin-encryption' => '/admin_manual/configuration/configuration_encryption.html', From 3c53b0b3c22efae750f175acff96e9c77dd4e75a Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sun, 7 Dec 2014 18:50:09 +0100 Subject: [PATCH 3/4] backport of #692 --- user_manual/documents.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_manual/documents.rst b/user_manual/documents.rst index d5dc8bbef..70ae54fa2 100644 --- a/user_manual/documents.rst +++ b/user_manual/documents.rst @@ -55,7 +55,8 @@ border color of their user picture. If a user is not a local user (e.g accessing the file using public link), they will be shown as guest in the user list, automatically named Guest 1, Guest 2, -and so on. Guests can change their nicknames at any time. +and so on. Guests can change their nicknames at any time by clicking on their +names or thumbnails in the user list. Delete a Document ~~~~~~~~~~~~~~~~~ From 81bf5b368bf9fa44bc84b0b05bbf5f14ff5b226d Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sun, 7 Dec 2014 20:06:29 +0100 Subject: [PATCH 4/4] typo --- admin_manual/configuration/database_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/configuration/database_configuration.rst b/admin_manual/configuration/database_configuration.rst index 184f20ef8..a164a2a7a 100644 --- a/admin_manual/configuration/database_configuration.rst +++ b/admin_manual/configuration/database_configuration.rst @@ -10,7 +10,7 @@ ownCloud requires a database in which administrative data is stored. The followi The MySQL or MariaDB databases are the recommended database engines. However, because it is a file based database with the least administrative overhead, SQLite is chosen by default. -.. note:: Because SQLite has some difficulties handling multiple users, we recommend that it be used only for single user ownCloud installatins. +.. note:: Because SQLite has some difficulties handling multiple users, we recommend that it be used only for single user ownCloud installations. Requirements ------------