mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4808 from nextcloud/downstream-27788 

Adjust sample documentation
This commit is contained in:
Morris Jobke 2017-05-11 09:07:57 -05:00 committed by GitHub
parent 995fed8d8a 2c3df9ee0c
commit ec0c7fd104
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/config.sample.php
View File

@ -249,7 +249,7 @@ $CONFIG = array(
), ),
/** /**
* If your user backend does not allow to reset the password (e.g. when it's a * If your user backend does not allow password resets (e.g. when it's a
* read-only user backend like LDAP), you can specify a custom link, where the * read-only user backend like LDAP), you can specify a custom link, where the
* user is redirected to, when clicking the "reset password" link after a failed * user is redirected to, when clicking the "reset password" link after a failed
* login-attempt. * login-attempt.
@ -435,12 +435,12 @@ $CONFIG = array(
* the correct value would most likely be "/nextcloud". If Nextcloud is running * the correct value would most likely be "/nextcloud". If Nextcloud is running
* under "https://mycloud.org/" then it would be "/". * under "https://mycloud.org/" then it would be "/".
* *
* Note that above rule is not valid in every case, there are some rare setup * Note that the above rule is not valid in every case, as there are some rare setup
* cases where this may not apply. However, to avoid any update problems this * cases where this may not apply. However, to avoid any update problems this
* configuration value is explicitly opt-in. * configuration value is explicitly opt-in.
* *
* After setting this value run `occ maintenance:update:htaccess` and when following * After setting this value run `occ maintenance:update:htaccess`. Now, when the
* conditions are met Nextcloud uses URLs without index.php in it: * following conditions are met Nextcloud URLs won't contain `index.php`:
* *
* - `mod_rewrite` is installed * - `mod_rewrite` is installed
* - `mod_env` is installed * - `mod_env` is installed
@ -959,7 +959,7 @@ $CONFIG = array(
/** /**
* Replaces the default System Tags Manager Factory. This can be utilized if an * Replaces the default System Tags Manager Factory. This can be utilized if an
* own or 3rdParty SystemTagsManager should be used that – for instance – uses the * own or 3rdParty SystemTagsManager should be used that – for instance – uses the
* filesystem instead of the database to keep the comments. * filesystem instead of the database to keep the tags.
* *
* Defaults to ``\OC\SystemTag\ManagerFactory`` * Defaults to ``\OC\SystemTag\ManagerFactory``
*/ */
@ -1156,7 +1156,7 @@ $CONFIG = array(
'objectstore' => [ 'objectstore' => [
'class' => 'OC\\Files\\ObjectStore\\Swift', 'class' => 'OC\\Files\\ObjectStore\\Swift',
'arguments' => [ 'arguments' => [
// trystack will user your facebook id as the user name // trystack will use your facebook id as the user name
'username' => 'facebook100000123456789', 'username' => 'facebook100000123456789',
// in the trystack dashboard go to user -> settings -> API Password to // in the trystack dashboard go to user -> settings -> API Password to
// generate a password // generate a password
@ -1190,7 +1190,7 @@ $CONFIG = array(
/** /**
* Replaces the default Share Provider Factory. This can be utilized if * Replaces the default Share Provider Factory. This can be utilized if
* own or 3rdParty Share Providers be used that – for instance – uses the * own or 3rdParty Share Providers are used that – for instance – use the
* filesystem instead of the database to keep the share information. * filesystem instead of the database to keep the share information.
* *
* Defaults to ``\OC\Share20\ProviderFactory`` * Defaults to ``\OC\Share20\ProviderFactory``
@ -1447,7 +1447,7 @@ $CONFIG = array(
'filelocking.enabled' => true, 'filelocking.enabled' => true,
/** /**
* Set the time-to-live for locks in secconds. * Set the lock's time-to-live in seconds.
* *
* Any lock older than this will be automatically cleaned up. * Any lock older than this will be automatically cleaned up.
* *