This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit 268038e9f6b2bfc89e58d2d6dadad5f7df07bac3
Author: Steve Robinson <ser72 at owncloud.com>
Date: Wed Mar 5 15:57:54 2014 -0500
update config.php
---
admin_manual/config/APPS.rst | 2 +-
admin_manual/config/Default_Parameters.rst | 11 ++++
admin_manual/config/Mail_Parameters.rst | 9 ++--
admin_manual/config/Miscellaneous.rst | 2 +-
.../config/Reverse_Proxy_Configurations.rst | 3 +-
admin_manual/config/User_Experience.rst | 58 +++++++++++-----------
admin_manual/config/Verification.rst | 5 +-
admin_manual/config/index.rst | 2 +-
8 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/admin_manual/config/APPS.rst b/admin_manual/config/APPS.rst
index a16b239..8e99c96 100644
--- a/admin_manual/config/APPS.rst
+++ b/admin_manual/config/APPS.rst
@@ -9,7 +9,7 @@ The following parameters are used for ownCloud apps.
+-----------------------+-----------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+
| **Apps Paths** | "apps_paths" => array( | Use this parameter to set the location of the apps folder which should be scanned for available apps and/or where user specific apps should be installed. |
| | | The path defines the absolute file system path to the app folder. |
-| | 0 => array( | The key url defines the http web path to that folder starting at the ownCloud web root. |
+| | 0 => array( | The key url defines the http web path to that folder starting at the owncloud web root. |
| | | The key writable indicates if a user can install apps in that folder. |
| | 'path'=> '/var/www/owncloud/apps', | |
| | | |
diff --git a/admin_manual/config/Default_Parameters.rst b/admin_manual/config/Default_Parameters.rst
index 0f6db35..7f28a8b 100644
--- a/admin_manual/config/Default_Parameters.rst
+++ b/admin_manual/config/Default_Parameters.rst
@@ -60,4 +60,15 @@ These parameters are mandatory for the ownCloud instance to operate properly.
| | | |
| | | |
+---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **Trusted Domains** | 'trusted_domains' => | This parameter identifies trusted URL for ownCloud which users may log into. |
+| | | The initial entry ‘0’ is automatic. |
+| | array ( | If it is desired to have additional entries, these may be added manually. |
+| | | This is used to mitigate Header Post Poisoning attacks. |
+| | 0 => ‘A.B.C.D | |
+| | ', | |
+| | | |
+| | ), | |
+| | | |
+| | | |
++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/admin_manual/config/Mail_Parameters.rst b/admin_manual/config/Mail_Parameters.rst
index 740a88c..7257c34 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 *nix 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 *nix system. |
| | | |
| | | |
+-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
@@ -42,8 +42,9 @@ These parameters are related to ownCloud’s ability to send emails for lost pas
| | | That can be done using this parameter. |
| | | |
+-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
-| **Mail SMTP Secure** | "mail_smtpsecure" => "", | Default value is no security. |
-| | | May be ssl or tls depending on the required level of security. |
+| **Mail SMTP ** | "mail_smtpsecure" => "", | Default value is no security. |
+| **Secure** | | May be ssl or tls depending |
+| | | on the required level of security. |
| | | |
+-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
| **MAIL SMPT AUTH** | "mail_smtpauth" => false, | Determine if the mail server requires authentication. |
diff --git a/admin_manual/config/Miscellaneous.rst b/admin_manual/config/Miscellaneous.rst
index e0cbc00..fc97dd0 100644
--- a/admin_manual/config/Miscellaneous.rst
+++ b/admin_manual/config/Miscellaneous.rst
@@ -28,7 +28,7 @@ The remaining parameters are listed below.
| | | |
| | | |
+-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **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 \*", | |
+| **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 |
diff --git a/admin_manual/config/Reverse_Proxy_Configurations.rst b/admin_manual/config/Reverse_Proxy_Configurations.rst
index 2a8da73..d2d1038 100644
--- a/admin_manual/config/Reverse_Proxy_Configurations.rst
+++ b/admin_manual/config/Reverse_Proxy_Configurations.rst
@@ -7,8 +7,7 @@ The following parameters are used in the instance that Proxies are being used wi
| **Parameter** | **Format** | **Description** |
| | | |
+-------------------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Overwrite Host** | "overwritehost" => "", | By default, ownCloud attempts to detect what outside host can access the instance (www.example.com |
-| | | ) for generating URLs. |
+| **Overwrite Host** | "overwritehost" => "", | By default, ownCloud attempts to detect what outside host can access the instance (www.example.com) for generating URLs. |
| | | However, due to some reverse proxies, the automatically detected value may be incorrect (www.example.com:88) which would lead to incorrect URLs being generated. |
| | | Use this field to enter the proper URL. |
| | | |
diff --git a/admin_manual/config/User_Experience.rst b/admin_manual/config/User_Experience.rst
index c9fcd30..78f0909 100644
--- a/admin_manual/config/User_Experience.rst
+++ b/admin_manual/config/User_Experience.rst
@@ -3,33 +3,33 @@ User Experience
The following parameters are those that influence the end user’s experience.
-+----------------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
-| **Parameter** | **Format** | **Description** |
-| | | |
-+----------------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
-| **Default Language** | "default_language" => "en", | This is the default language for the ownCloud WebUI. When configured, the default language will be the same for all users. |
-| | | Users may then configure their own language preference in their Personal page. |
-| | | When not configured, the default language is determined form the headers sent by the web browser. |
-| | | For instance, if the browser is in Spanish, ownCloud will be presented in Spanish |
-| | | |
-+----------------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
-| **Default App** | "defaultapp" => "files", | By default, when a user logs into ownCloud, they are brought to the files page. |
-| | | If, for instance, the admin desires a different page to be loaded upon login, configure that app here. |
-| | | Valid values are app id’s (for example news, files, gallery). |
-| | | |
-| | | |
-+----------------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
-| **Knowledge Base Enabled** | "knowledgebaseenabled" => true, | When enabled, default, the help menu brings up the user documentation. |
-| | | |
-+----------------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
-| **Enable Avatars** | 'enable_avatars' => true, | Allows for the ability to use avatars. |
-| | | |
-| | | |
-+----------------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
-| **Display Name** | 'allow_user_to_change_display_name' => true, | Users can modify their display name in the Personal page. |
-| | | If this parameter is set to false, they may not change their display |
-| | | name. |
-| | | |
-| | | |
-+----------------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
++----------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
+| **Parameter** | **Format** | **Description** |
+| | | |
++----------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
+| **Default Language** | "default_language" => "en", | This is the default language for the ownCloud WebUI. When configured, the default language will be the same for all users. |
+| | | Users may then configure their own language preference in their Personal page. |
+| | | When not configured, the default language is determined form the headers sent by the web browser. |
+| | | For instance, if the browser is in Spanish, ownCloud will be presented in Spanish |
+| | | |
++----------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
+| **Default App** | "defaultapp" => "files", | By default, when a user logs into ownCloud, they are brought to the files page. |
+| | | If, for instance, the admin desires a different page to be loaded upon login, configure that app here. |
+| | | Valid values are app id’s (for example news, files, gallery). |
+| | | |
+| | | |
++----------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
+| **Knowledge Base ** | "knowledgebaseenabled" => true, | When enabled, default, the help menu brings up the user documentation. |
+| **Enabled** | | |
+| | | |
++----------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
+| **Enable Avatars** | 'enable_avatars' => true, | Allows for the ability to use avatars. |
+| | | |
+| | | |
++----------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
+| **Display Name** | 'allow_user_to_change_display_name' => true, | Users can modify their display name in the Personal page. |
+| | | If this parameter is set to false, they may not change their display name. |
+| | | |
+| | | |
++----------------------+----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+
diff --git a/admin_manual/config/Verification.rst b/admin_manual/config/Verification.rst
index 67c1c12..d4facf9 100644
--- a/admin_manual/config/Verification.rst
+++ b/admin_manual/config/Verification.rst
@@ -21,9 +21,10 @@ This section describes different verification checks that ownCloud may perform.
| | | |
+-----------------------------+---------------------------------------+----------------------------------------------------------------------------------------------------------------------+
| **Working .htaccess** | "check_for_working_htaccess" => true, | Verifies whether the .htaccess file may be modified by ownCloud. |
-| | | If set to false, this check will not be performed. |
+| | | If set to false, this check will not be |
+| | | performed. |
| | | If the file cannot be modified, items such as large file uploads cannot be performed. |
-| | | This check only affects Apache servers. |
+| | | This check only affects apache servers. |
| | | |
+-----------------------------+---------------------------------------+----------------------------------------------------------------------------------------------------------------------+
diff --git a/admin_manual/config/index.rst b/admin_manual/config/index.rst
index 9aaf574..2d24472 100644
--- a/admin_manual/config/index.rst
+++ b/admin_manual/config/index.rst
@@ -1,9 +1,9 @@
**ownCloud config.php**
+
.. toctree::
:maxdepth: 2
- Table_of_Contents
Introduction
Default_Parameters
Reverse_Proxy_Configurations
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git