wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18364 from owncloud/config-sample-tyops

Browse source 
clean up typos in config.sample.php
This commit is contained in:
Thomas Müller 2015-08-17 20:22:24 +02:00
commit 03965053c3
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
config/config.sample.php
View file

@ -284,7 +284,7 @@ $CONFIG = array(
'mail_smtpmode' => 'sendmail',
/**
* This depends on ``mail_smtpmode``. Specified the IP address of your mail
* This depends on ``mail_smtpmode``. Specify the IP address of your mail
* server host. This may contain multiple hosts separated by a semi-colon. If
* you need to specify the port number append it to the IP address separated by
* a colon, like this: ``127.0.0.1:24``.
@ -297,7 +297,7 @@ $CONFIG = array(
'mail_smtpport' => 25,
/**
* This depends on ``mail_smtpmode``. This set an SMTP server timeout, in
* This depends on ``mail_smtpmode``. This sets the SMTP server timeout, in
* seconds. You may need to increase this if you are running an anti-malware or
* spam scanner.
*/
@ -373,7 +373,7 @@ $CONFIG = array(
'overwritecondaddr' => '',
/**
* Use this configuration parameter to specify the base url for any urls which
* Use this configuration parameter to specify the base URL for any URLs which
* are generated within ownCloud using any kind of command line tools (cron or
* occ). The value should contain the full base URL:
* ``https://www.example.com/owncloud``
@ -412,18 +412,19 @@ $CONFIG = array(
* ownCloud 8.1 and before.
*
* Available values:
* ``auto`` default setting. keeps files and folders in the trash bin
*
* * ``auto`` default setting. keeps files and folders in the trash bin
* for 30 days and automatically deletes anytime after that
* if space is needed (note: files may not be deleted if space
* is not needed).
* ``D, auto`` keeps files and folders in the trash bin for D+ days,
* * ``D, auto`` keeps files and folders in the trash bin for D+ days,
* delete anytime if space needed (note: files may not be deleted
* if space is not needed)
* * ``auto, D`` delete all files in the trash bin that are older than D days
* automatically, delete other files anytime if space needed
* * ``D1, D2`` keep files and folders the in trash bin for at least D1 days
* and delete when exceeds D2 days
* ``disabled`` trash bin auto clean disabled, files and folders will be
* * ``disabled`` trash bin auto clean disabled, files and folders will be
* kept forever
*/
'trashbin_retention_obligation' => 'auto',
@ -550,8 +551,8 @@ $CONFIG = array(
* Location of the lock file for cron executions can be specified here.
* Default is within the tmp directory. The file is named in the following way:
* owncloud-server-$INSTANCEID-cron.lock
* where $INSTANCEID is the string specified in the instanceid field.
* Because the cron lock file is accessed in regular intervals, it may prevent
* where $INSTANCEID is the string specified in the ``instanceid`` field.
* Because the cron lock file is accessed at regular intervals, it may prevent
* enabled disk drives from spinning down. A different location for this file
* can solve such issues.
*/
@ -654,7 +655,7 @@ $CONFIG = array(
/**
* By default, ownCloud can generate previews for the following filetypes:
*
* - Images files
* - Image files
* - Covers of MP3 files
* - Text documents
*
@ -765,7 +766,7 @@ $CONFIG = array(
/**
* defines the interval in minutes for the background job that checks user
* existance and marks them as ready to be cleaned up. The number is always
* existence and marks them as ready to be cleaned up. The number is always
* minutes. Setting it to 0 disables the feature.
* See command line (occ) methods ldap:show-remnants and user:delete
*/
@ -782,10 +783,10 @@ $CONFIG = array(
/**
* Enable maintenance mode to disable ownCloud
*
* If you want to prevent users to login to ownCloud before you start doing some
* maintenance work, you need to set the value of the maintenance parameter to
* true. Please keep in mind that users who are already logged-in are kicked out
* of ownCloud instantly.
* If you want to prevent users from logging in to ownCloud before you start
* doing some maintenance work, you need to set the value of the maintenance
* parameter to true. Please keep in mind that users who are already logged-in
* are kicked out of ownCloud instantly.
*/
'maintenance' => false,
@ -1003,7 +1004,7 @@ $CONFIG = array(
/**
* The parent of the directory where css and js assets will be stored if
* piplelining is enabled; this defaults to the ownCloud directory. The assets
* pipelining is enabled; this defaults to the ownCloud directory. The assets
* will be stored in a subdirectory of this directory named 'assets'. The
* server *must* be configured to serve that directory as $WEBROOT/assets.
* You will only likely need to change this if the main ownCloud directory
@ -1059,7 +1060,7 @@ $CONFIG = array(
* Enables transactional file locking.
* This is disabled by default as it is still beta.
*
* Prevents concurrent processes to access the same files
* Prevents concurrent processes from accessing the same files
* at the same time. Can help prevent side effects that would
* be caused by concurrent operations. Mainly relevant for
* very large installations with many users working with