Merge branch 'stable7' of https://github.com/owncloud/documentation into stable7

This commit is contained in:
Carla Schroder 2014-12-08 10:09:47 -08:00
commit d11c465532
4 changed files with 16 additions and 3 deletions

View File

@ -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
-------

View File

@ -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
------------

2
go.php
View File

@ -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',

View File

@ -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
~~~~~~~~~~~~~~~~~