Skip to content

Commit

Permalink
Merge pull request #511 from nextcloud/backport-496-doc-changes
Browse files Browse the repository at this point in the history
[stable9] Make the changes from doc fix persistant
  • Loading branch information
rullzer authored Jul 22, 2016
2 parents 87eb869 + 74ed2be commit a760564
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions config/config.sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
* Both minimum and maximum times can be set together to explicitly define
* file and folder deletion. For migration purposes, this setting is installed
* initially set to "auto", which is equivalent to the default setting in
* ownCloud 8.1 and before.
* Nextcloud.
*
* Available values:
*
Expand Down Expand Up @@ -454,7 +454,7 @@
* Both minimum and maximum times can be set together to explicitly define
* version deletion. For migration purposes, this setting is installed
* initially set to "auto", which is equivalent to the default setting in
* ownCloud 8.1 and before.
* Nextcloud.
*
* Available values:
*
Expand Down Expand Up @@ -636,7 +636,7 @@
'customclient_android' =>
'https://play.google.com/store/apps/details?id=com.nextcloud.client',
'customclient_ios' =>
'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8',
'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',

/**
* Apps
Expand Down Expand Up @@ -1081,12 +1081,12 @@
'cipher' => 'AES-256-CFB',

/**
* The minimum ownCloud desktop client version that will be allowed to sync with
* The minimum Nextcloud desktop client version that will be allowed to sync with
* this server instance. All connections made from earlier clients will be denied
* by the server. Defaults to the minimum officially supported ownCloud desktop
* by the server. Defaults to the minimum officially supported Nextcloud desktop
* client version at the time of release of this server version.
*
* When changing this, note that older unsupported versions of the ownCloud desktop
* When changing this, note that older unsupported versions of the Nextcloud desktop
* client may not function as expected, and could lead to permanent data loss for
* clients or other unexpected results.
*/
Expand Down

0 comments on commit a760564

Please sign in to comment.