This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit b0880cc778aa7de7cfda974dda8886ebaae7a93b
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date: Mon Apr 28 23:21:56 2014 +0200
various fixes
---
admin_manual/config/default_parameters.rst | 10 ++--
admin_manual/config/mail_parameters.rst | 4 +-
admin_manual/config/miscellaneous.rst | 96 +++++++++++++++---------------
admin_manual/configuration/xsendfile.rst | 4 +-
admin_manual/contents.rst | 3 +
admin_manual/cron/index.rst | 2 +-
admin_manual/index.rst | 2 +
7 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/admin_manual/config/default_parameters.rst b/admin_manual/config/default_parameters.rst
index 7f28a8b..790b410 100644
--- a/admin_manual/config/default_parameters.rst
+++ b/admin_manual/config/default_parameters.rst
@@ -24,14 +24,14 @@ These parameters are mandatory for the ownCloud instance to operate properly.
| **DB Name** | "dbname" => "owncloud", | The ownCloud database within the SQL instance. |
| | | ownCloud database configuration guides use “owncloud” in the instructions, it is the default for this field. |
| | | This may be set to any valid table name. |
-| | | If the table doesn’t exist, the setup will attempt to create it, provided it has proper permissions. |
+| | | If the table does not exist, the setup will attempt to create it, provided it has proper permissions. |
| | | |
+---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **DB User** | "dbuser" => "", | This is the user that ownCloud uses to write to the databse. |
+| **DB User** | "dbuser" => "", | This is the user that ownCloud uses to write to the database. |
| | | This must be unique across ownCloud instances using the same SQL database. |
| | | The user will be created when the install wizard is complete. |
| | | Since the database user in the initial login screen has admin privileges (root), ownCloud creates a new user to ensure ownCloud does not run with unnecessary database permissions. |
-| | | ownCloud prefixes “oc_” to the userid to prevent a collision between the ownCloud admin user and any existing database users. |
+| | | ownCloud prefixes “oc\_” to the userid to prevent a collision between the ownCloud admin user and any existing database users. |
| | | This is generated at the time of the initial login and is the Admin User as entered by the ownCloud admin. |
| | | |
+---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -43,8 +43,8 @@ These parameters are mandatory for the ownCloud instance to operate properly.
| | | Can be an IP pointing to the database server, a Fully Qualified Domain Name (FQDN) or localhost. |
| | | |
+---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **DB Table Prefix** | "dbtableprefix" => "oc_", | All tables in the database will begin with this prefix. |
-| | | By default the prefix is “oc_”. |
+| **DB Table Prefix** | "dbtableprefix" => "oc\_",| All tables in the database will begin with this prefix. |
+| | | By default the prefix is “oc\_”. |
| | | If this prefix is changed in the config file, the tables in the database will need to be manually renamed. |
| | | ownCloud will not detect a change to this option so changing this prefix without manually renaming the tables will break the instance of ownCloud. |
| | | |
diff --git a/admin_manual/config/mail_parameters.rst b/admin_manual/config/mail_parameters.rst
index 7257c34..55a1700 100644
--- a/admin_manual/config/mail_parameters.rst
+++ b/admin_manual/config/mail_parameters.rst
@@ -23,9 +23,9 @@ These parameters are related to ownCloud’s ability to send emails for lost pas
| | | The program used to send email is defined in the PHP.ini file. |
| | | |
| | | If using sendmail, it is necessary to have an installed and working email system on the server. |
-| | | The sendmail binary is /usr/sbin/sendmail and should be installed on your *nix system. |
+| | | The sendmail binary is /usr/sbin/sendmail and should be installed on your Unix system. |
| | | |
-| | | If using qmail to send email, the binary is /var/qmail/bin/sendmail and should be installed in your *nix system. |
+| | | If using qmail to send email, the binary is /var/qmail/bin/sendmail and should be installed in your Unix system. |
| | | |
| | | |
+-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
diff --git a/admin_manual/config/miscellaneous.rst b/admin_manual/config/miscellaneous.rst
index fc97dd0..778a589 100644
--- a/admin_manual/config/miscellaneous.rst
+++ b/admin_manual/config/miscellaneous.rst
@@ -3,54 +3,54 @@ Miscellaneous
The remaining parameters are listed below.
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Parameter** | **Format** | **Description** |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Open SSL** | 'openssl' => array( | |
-| | | |
-| | //'config' => '/absolute/location/of/openssl.cnf', | |
-| | | |
-| | ), | |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **User Backends** | 'user_backends'=>array( | It is possible to configure additional user backends in ownCloud. |
-| | | The “External user Support” (user_external) app provides the following backends: IMAP (OC_User_IMAP), SMB (OC_User_SMB), FTP (OC_User_FTP). |
-| | array( | |
-| | | |
-| | 'class'=>'OC_User_IMAP', | |
-| | | |
-| | 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX'), | |
-| | | |
-| | ), | |
-| | | |
-| | ), | |
-| | | |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **CSP Policy** | "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *", | |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **X Frame** | “xframe_restriction" => true, | XFrame-restriction is a header which |
-| | | prevents browsers from showing the site inside an iframe. |
-| | | This may be used to prevent clickjacking. |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Mem Cache** | "memcached_server" => array('localhost', 11211), | Server details for one or more memcached servers to use for memory caching. |
-| | | Memcache is only used if other memory cache options (xcache, apc, apcu) are not available. |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Force SSL** | "forcessl" => false, | If the admin checks “Enforce HTTPS” in the Admin page of the ownCloud WebUI. This will be set to true indicating that only HTTPS may be used to access this instance of ownCloud. |
-| | | HTTP requests will be denied. |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Black List** | "blacklisted_files" => array('.htaccess'), | Files listed in this array will not be uploaded to ownCloud. |
-| | | It should be noted that wildcards are not supported in this array. |
-| | | The configured must be exact file names to be blocked. |
-| | | If wildcards are |
-| | | required, use the ownCloud firewall. |
-| | | |
-+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Parameter** | **Format** | **Description** |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Open SSL** | 'openssl' => array( | |
+| | | |
+| | //'config' => '/absolute/location/of/openssl.cnf', | |
+| | | |
+| | ), | |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **User Backends** | 'user_backends'=>array( | It is possible to configure additional user backends in ownCloud. |
+| | | The “External user Support” (user_external) app provides the following backends: IMAP (OC_User_IMAP), SMB (OC_User_SMB), FTP (OC_User_FTP). |
+| | array( | |
+| | | |
+| | 'class'=>'OC_User_IMAP', | |
+| | | |
+| | 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX'), | |
+| | | |
+| | ), | |
+| | | |
+| | ), | |
+| | | |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **CSP Policy** | "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src \*; img-src \*; font-src 'self' data:; media-src \*", | |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **X Frame** | “xframe_restriction" => true, | XFrame-restriction is a header which |
+| | | prevents browsers from showing the site inside an iframe. |
+| | | This may be used to prevent clickjacking. |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Mem Cache** | "memcached_server" => array('localhost', 11211), | Server details for one or more memcached servers to use for memory caching. |
+| | | Memcache is only used if other memory cache options (xcache, apc, apcu) are not available. |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Force SSL** | "forcessl" => false, | If the admin checks “Enforce HTTPS” in the Admin page of the ownCloud WebUI. This will be set to true indicating that only HTTPS may be used to access this instance of ownCloud. |
+| | | HTTP requests will be denied. |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Black List** | "blacklisted_files" => array('.htaccess'), | Files listed in this array will not be uploaded to ownCloud. |
+| | | It should be noted that wildcards are not supported in this array. |
+| | | The configured must be exact file names to be blocked. |
+| | | If wildcards are |
+| | | required, use the ownCloud firewall. |
+| | | |
++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/admin_manual/configuration/xsendfile.rst b/admin_manual/configuration/xsendfile.rst
index fd5e75d..3e910a1 100644
--- a/admin_manual/configuration/xsendfile.rst
+++ b/admin_manual/configuration/xsendfile.rst
@@ -4,8 +4,8 @@ Since ownCloud 5 it is possible to let web servers handle static file serving.
This should generally improve performance (web servers are optimized for this) and in some cases permits controlled
file serving (i.e. pause and resume downloads).
-.. note :: This feature can currently only be activated for local files, i.e. files inside the **data/** directory
-and local mounts. Controlled file serving **does not work for generated zip files**. This is due to how temporary files are created.
+.. note:: This feature can currently only be activated for local files, i.e. files inside the **data/** directory
+ and local mounts. Controlled file serving **does not work for generated zip files**. This is due to how temporary files are created.
Apache2 (X-Sendfile)
--------------------
diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst
index 1fccb2d..fe97397 100644
--- a/admin_manual/contents.rst
+++ b/admin_manual/contents.rst
@@ -16,6 +16,9 @@ ownCloud documentation contents
configuration/index
apps/index
maintenance/index
+ cron/index
+ quota/index
+ sharing_api/index
config/index
issues/index
diff --git a/admin_manual/cron/index.rst b/admin_manual/cron/index.rst
index 7c2a94e..7751254 100644
--- a/admin_manual/cron/index.rst
+++ b/admin_manual/cron/index.rst
@@ -29,7 +29,7 @@ Cron.php needs to be called by the system’s cron daemon and run as the same
user the web server runs as.
As an example, on an ordinary Linux distribution, place the following in the
-webserver’s user’s crontab::
+web server’s user’s crontab::
*/15 * * * * /usr/bin/php -f /srv/http/owncloud/cron.php /dev/null 2>&1
diff --git a/admin_manual/index.rst b/admin_manual/index.rst
index 913261c..334f659 100644
--- a/admin_manual/index.rst
+++ b/admin_manual/index.rst
@@ -54,6 +54,8 @@ This chapter covers ownCloud and web server configuration.
* :doc:`configuration/configuration_users`
* :doc:`configuration/configuration_database`
* :doc:`configuration/auth_ldap`
+* :doc:`cron/index`
+* :doc:`quota/index`
* :doc:`configuration/custom_mount_config_gui`
* :doc:`configuration/custom_mount_config`
* :doc:`configuration/background_jobs`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git