From 9cd647a7f36a768948dc84592eca7458325792db Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 21 Jun 2016 10:27:41 +0200 Subject: [PATCH] Adjust samples --- .../config_sample_php_parameters.rst | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index 2a820304f..16bc3fba0 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -22,7 +22,7 @@ into a set of smaller files. These custom files are not overwritten by Nextcloud, and the values in these files take precedence over :file:`config.php`. .. The following section is auto-generated from -.. https://github.com/owncloud/core/blob/master/config/config.sample.php +.. https://github.com/nextcloud/server/blob/master/config/config.sample.php .. Do not edit this file; edit the source file in core .. DEFAULT_SECTION_START @@ -68,7 +68,7 @@ necessary security checks. :: - 'datadirectory' => '/var/www/owncloud/data', + 'datadirectory' => '/var/www/nextcloud/data', Where user files are stored; this defaults to ``data/`` in the Nextcloud directory. The SQLite database is also stored here, when you use SQLite. @@ -106,7 +106,7 @@ Your host server name, for example ``localhost``, ``hostname``, :: - 'dbname' => 'owncloud', + 'dbname' => 'nextcloud', The name of the Nextcloud database, which is set during installation. You should not need to change this. @@ -162,7 +162,7 @@ systems you should use MySQL, MariaDB, or PosgreSQL. 0 => 'localhost', 1 => 'studio', ), - 'datadirectory' => '/var/www/owncloud/data', + 'datadirectory' => '/var/www/nextcloud/data', 'dbtype' => 'sqlite3', 'version' => '7.0.2.1', 'installed' => true, @@ -181,10 +181,10 @@ This example is from a new Nextcloud installation using MariaDB:: 1 => 'studio', 2 => '192.168.10.155' ), - 'datadirectory' => '/var/www/owncloud/data', + 'datadirectory' => '/var/www/nextcloud/data', 'dbtype' => 'mysql', 'version' => '7.0.2.1', - 'dbname' => 'owncloud', + 'dbname' => 'nextcloud', 'dbhost' => 'localhost', 'dbtableprefix' => 'oc_', 'dbuser' => 'oc_carla', @@ -270,7 +270,7 @@ Enabling this sends a "heartbeat" to the server to keep it from timing out. :: - 'skeletondirectory' => '/path/to/owncloud/core/skeleton', + 'skeletondirectory' => '/path/to/nextcloud/core/skeleton', The directory where the skeleton files are located. These files will be copied to the data directory of new users. Leave empty to not copy any @@ -310,12 +310,12 @@ resets. 'mail_domain' => 'example.com', The return address that you want to appear on emails sent by the Nextcloud -server, for example ``oc-admin@example.com``, substituting your own domain, +server, for example ``nextcloud-admin@example.com``, substituting your own domain, of course. :: - 'mail_from_address' => 'owncloud', + 'mail_from_address' => 'nextcloud', FROM address that overrides the built-in ``sharing-noreply`` and ``lostpassword-noreply`` FROM addresses. @@ -433,8 +433,8 @@ Valid values are ``http`` and ``https``. Nextcloud attempts to detect the webroot for generating URLs automatically. -For example, if ``www.example.com/owncloud`` is the URL pointing to the -Nextcloud instance, the webroot is ``/owncloud``. When proxies are in use, it +For example, if ``www.example.com/nextcloud`` is the URL pointing to the +Nextcloud instance, the webroot is ``/nextcloud``. When proxies are in use, it may be difficult for Nextcloud to detect this parameter, resulting in invalid URLs. @@ -454,7 +454,7 @@ addresses starting with ``10.0.0.`` and ending with 1 to 3: Use this configuration parameter to specify the base URL for any URLs which are generated within Nextcloud using any kind of command line tools (cron or occ). The value should contain the full base URL: -``https://www.example.com/owncloud`` +``https://www.example.com/nextcloud`` :: @@ -468,8 +468,8 @@ path of the Nextcloud installation it cannot be set automatically properly in every scenario and needs thus some manual configuration. In a standard Apache setup this usually equals the folder that Nextcloud is -accessible at. So if Nextcloud is accessible via "https://mycloud.org/owncloud" -the correct value would most likely be "/owncloud". If Nextcloud is running +accessible at. So if Nextcloud is accessible via "https://mycloud.org/nextcloud" +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 @@ -773,9 +773,9 @@ Some of the Nextcloud code may be stored in alternate locations. Nextcloud uses some 3rd party PHP components to provide certain functionality. These components are shipped as part of the software package and reside in -``owncloud/3rdparty``. Use this option to configure a different location. -For example, if your location is /var/www/owncloud/foo/3rdparty, then the -correct configuration is '3rdpartyroot' => '/var/www/owncloud/foo/', +``nextcloud/3rdparty``. Use this option to configure a different location. +For example, if your location is /var/www/nextcloud/foo/3rdparty, then the +correct configuration is '3rdpartyroot' => '/var/www/nextcloud/foo/', :: @@ -789,7 +789,7 @@ seen by a Web browser. 'customclient_desktop' => 'http://owncloud.org/sync-clients/', 'customclient_android' => - 'https://play.google.com/store/apps/details?id=com.owncloud.android', + 'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'customclient_ios' => 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8', @@ -828,7 +828,7 @@ loss or security breaches. 'apps_paths' => array( array( - 'path'=> '/var/www/owncloud/apps', + 'path'=> '/var/www/nextcloud/apps', 'url' => '/apps', 'writable' => true, ), @@ -1149,7 +1149,7 @@ Using Object Store with Nextcloud // generate a password 'password' => 'Secr3tPaSSWoRdt7', // must already exist in the objectstore, name can be different - 'container' => 'owncloud', + 'container' => 'nextcloud', // create the container if it does not exist. default is false 'autocreate' => true, // required, dev-/trystack defaults to 'RegionOne' @@ -1235,7 +1235,7 @@ Available: :: - 'tempdirectory' => '/tmp/owncloudtemp', + 'tempdirectory' => '/tmp/nextcloudtemp', Override where Nextcloud stores temporary files. Useful in situations where the system temporary directory is on a limited space ramdisk or is otherwise @@ -1272,7 +1272,7 @@ Define a default folder for shared files and folders other than root. If you are applying a theme to Nextcloud, enter the name of the theme here. -The default location for themes is ``owncloud/themes/``. +The default location for themes is ``nextcloud/themes/``. :: @@ -1334,7 +1334,7 @@ file and one css file if this is set to ``true``. This improves performance. :: - 'assetdirectory' => '/var/www/owncloud', + 'assetdirectory' => '/var/www/nextcloud', The parent of the directory where css and js assets will be stored if pipelining is enabled; this defaults to the Nextcloud directory. The assets @@ -1346,7 +1346,7 @@ is not writeable by the Web server in your configuration. :: - 'mount_file' => '/var/www/owncloud/data/mount.json', + 'mount_file' => '/var/www/nextcloud/data/mount.json', Where ``mount.json`` file should be stored, defaults to ``data/mount.json`` in the Nextcloud directory.