summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-05-11 09:07:57 -0500
committerGitHub <noreply@github.com>2017-05-11 09:07:57 -0500
commitec0c7fd104e7cc2edd029160433bdcba008849b4 (patch)
tree0f2dab8b351ade39be18e2c8cfa8f1527816908b /config
parent995fed8d8ae618bcf7a4d1fb7f66c41da95b6f34 (diff)
parent2c3df9ee0cac09e73dbc4410be7d46f04e3fc384 (diff)
downloadnextcloud-server-ec0c7fd104e7cc2edd029160433bdcba008849b4.tar.gz
nextcloud-server-ec0c7fd104e7cc2edd029160433bdcba008849b4.zip
Merge pull request #4808 from nextcloud/downstream-27788
Adjust sample documentation
Diffstat (limited to 'config')
-rw-r--r--config/config.sample.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 001df5fd49c..002f47649bc 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -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
* user is redirected to, when clicking the "reset password" link after a failed
* login-attempt.
@@ -435,12 +435,12 @@ $CONFIG = array(
* the correct value would most likely be "/nextcloud". If Nextcloud is running
* 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
* configuration value is explicitly opt-in.
*
- * After setting this value run `occ maintenance:update:htaccess` and when following
- * conditions are met Nextcloud uses URLs without index.php in it:
+ * After setting this value run `occ maintenance:update:htaccess`. Now, when the
+ * following conditions are met Nextcloud URLs won't contain `index.php`:
*
* - `mod_rewrite` 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
* 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``
*/
@@ -1156,7 +1156,7 @@ $CONFIG = array(
'objectstore' => [
'class' => 'OC\\Files\\ObjectStore\\Swift',
'arguments' => [
- // trystack will user your facebook id as the user name
+ // trystack will use your facebook id as the user name
'username' => 'facebook100000123456789',
// in the trystack dashboard go to user -> settings -> API Password to
// generate a password
@@ -1190,7 +1190,7 @@ $CONFIG = array(
/**
* 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.
*
* Defaults to ``\OC\Share20\ProviderFactory``
@@ -1447,7 +1447,7 @@ $CONFIG = array(
'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.
*