Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-09-03 17:56:31 +02:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Merge pull request #496 from nextcloud/fix-config-generation

Browse Source 
Make the changes from doc fix persistant
This commit is contained in:
Morris Jobke 2016-07-21 23:37:22 +02:00 committed by GitHub
commit febf95ffb4
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> <info>
<id>dav</id> <id>dav</id>
<name>WebDAV</name> <name>WebDAV</name>
<description>ownCloud WebDAV endpoint</description> <description>Nextcloud WebDAV endpoint</description>
<licence>AGPL</licence> <licence>AGPL</licence>
<author>owncloud.org</author> <author>owncloud.org</author>
<version>0.2.5</version> <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 * Both minimum and maximum times can be set together to explicitly define
* file and folder deletion. For migration purposes, this setting is installed * file and folder deletion. For migration purposes, this setting is installed
* initially set to "auto", which is equivalent to the default setting in * initially set to "auto", which is equivalent to the default setting in
* ownCloud 8.1 and before. * Nextloud.
* *
* Available values: * Available values:
* *
@ -475,7 +475,7 @@ $CONFIG = array(
* Both minimum and maximum times can be set together to explicitly define * Both minimum and maximum times can be set together to explicitly define
* version deletion. For migration purposes, this setting is installed * version deletion. For migration purposes, this setting is installed
* initially set to "auto", which is equivalent to the default setting in * initially set to "auto", which is equivalent to the default setting in
* ownCloud 8.1 and before. * Nextloud.
* *
* Available values: * Available values:
* *
@ -659,7 +659,7 @@ $CONFIG = array(
'customclient_android' => 'customclient_android' =>
'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'https://play.google.com/store/apps/details?id=com.nextcloud.client',
'customclient_ios' => 'customclient_ios' =>
'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8', 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
/** /**
* Apps * Apps
@ -1136,12 +1136,12 @@ $CONFIG = array(
'cipher' => 'AES-256-CFB', '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 * 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. * 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 * client may not function as expected, and could lead to permanent data loss for
* clients or other unexpected results. * clients or other unexpected results.
*/ */