Skip to content

Commit

Permalink
Merge pull request #512 from nextcloud/backport-496-doc-fix-10
Browse files Browse the repository at this point in the history
[stable10] Make the changes from doc fix persistant
  • Loading branch information
rullzer authored Jul 22, 2016
2 parents b4c7eb5 + 413968d commit 49a4654
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion apps/dav/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<info>
<id>dav</id>
<name>WebDAV</name>
<description>ownCloud WebDAV endpoint</description>
<description>WebDAV endpoint</description>
<licence>AGPL</licence>
<author>owncloud.org</author>
<version>0.2.5</version>
Expand Down
12 changes: 6 additions & 6 deletions config/config.sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,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 @@ -475,7 +475,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 @@ -659,7 +659,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 @@ -1136,12 +1136,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
* clientversion 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 49a4654

Please sign in to comment.