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

Merge pull request #512 from nextcloud/backport-496-doc-fix-10 

[stable10] Make the changes from doc fix persistant
This commit is contained in:
Roeland Douma 2016-07-22 11:12:19 +02:00 committed by GitHub
parent b4c7eb5326 413968d4ba
commit 49a4654150
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/appinfo/info.xml
View File

@ -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>

12
config/config.sample.php
View File

@ -435,7 +435,7 @@ $CONFIG = array(
* 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:
*
@ -475,7 +475,7 @@ $CONFIG = array(
* 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:
*
@ -659,7 +659,7 @@ $CONFIG = array(
'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
@ -1136,12 +1136,12 @@ $CONFIG = array(
'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.
*/