[Pkg-owncloud-commits] [owncloud] 14/16: Imported Upstream version 7.0.11~~rc1~dfsg
David Prévot
taffit at moszumanska.debian.org
Thu Oct 22 15:55:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 80574dcd3c1dd172a42dc9f4a06851a075c69f6f
Merge: 0d4d217 df9b8cd
Author: David Prévot <taffit at debian.org>
Date: Thu Oct 22 11:12:14 2015 -0400
Imported Upstream version 7.0.11~~rc1~dfsg
apps/user_ldap/lib/user/user.php | 8 +-
core/ajax/update.php | 6 ++
core/command/upgrade.php | 6 ++
.../big_file_upload_configuration.txt | 2 +-
.../configuration/config_sample_php_parameters.txt | 13 ++-
.../_sources/configuration/user_configuration.txt | 3 +-
.../_sources/installation/installation_wizard.txt | 7 +-
.../_sources/installation/nginx_configuration.txt | 93 ++++++++++++++-------
.../_sources/installation/source_installation.txt | 96 ++++++++++++++++++---
core/doc/admin/release/_sources/issues/index.txt | 6 ++
.../big_file_upload_configuration.html | 2 +-
.../config_sample_php_parameters.html | 17 ++--
.../release/configuration/user_configuration.html | 2 +-
core/doc/admin/release/contents.html | 7 +-
core/doc/admin/release/installation/index.html | 7 +-
.../release/installation/installation_wizard.html | 7 +-
.../release/installation/nginx_configuration.html | 97 ++++++++++++++--------
.../release/installation/source_installation.html | 86 ++++++++++++++++---
core/doc/admin/release/issues/index.html | 6 ++
core/doc/admin/release/objects.inv | 4 +-
core/doc/user/_sources/files/files.txt | 62 ++++++++++++++
core/doc/user/contents.html | 1 +
core/doc/user/files/files.html | 52 ++++++++++++
core/js/js.js | 2 +-
core/js/tests/specs/coreSpec.js | 2 +
lib/private/connector/sabre/objecttree.php | 3 +
lib/private/memcache/memcached.php | 5 ++
lib/private/updater.php | 16 ++++
version.php | 8 +-
29 files changed, 512 insertions(+), 114 deletions(-)
diff --cc core/doc/admin/release/_sources/configuration/big_file_upload_configuration.txt
index b336f0d,0000000..8c597bc
mode 100644,000000..100644
--- a/core/doc/admin/release/_sources/configuration/big_file_upload_configuration.txt
+++ b/core/doc/admin/release/_sources/configuration/big_file_upload_configuration.txt
@@@ -1,104 -1,0 +1,104 @@@
+Uploading big files > 512MB (as set by default)
+===============================================
+
+The default maximum file size for uploads is 512MB. You can increase this
+limit up to what your filesystem and operating system allows. There are certain
+hard limits that cannot be exceeded:
+
+* < 2GB on 32Bit OS-architecture
+* < 2GB with Server Version 4.5 or older
+* < 2GB on Windows (32Bit and 64Bit)
+* < 2GB with IE6 - IE8
- * < 4GB with IE9 - IE10
++* < 4GB with IE9 - IE11
+
+64-bit filesystems have much higher limits; consult the documentation for your
+filesystem.
+
+.. note:: The ownCloud sync client is not affected by this described upload limits
+ as it is uploading files in smaller chunks.
+
+System Configuration
+--------------------
+
+* Make sure that the latest version of PHP (at least 5.4.9) is installed
+* Disable user quotas, which makes them unlimited
+* Your temp file or partition has to be big enough to hold multiple
+ parallel uploads from multiple users; e.g. if the max upload size is 10GB and
+ the average users uploading the same time is 100: temp space has to hold at
+ least 10x100 GB
+
+Configuring Your Webserver
+--------------------------
+
+ownCloud comes with its own ``owncloud/.htaccess`` file. Set the following
+two parameters inside this ``.htaccess`` file::
+
+ php_value upload_max_filesize = 16G
+ php_value post_max_size = 16G
+
+Adjust these values for your needs. If you see PHP timeouts in your logfiles,
+increase the timeout values, which are in seconds::
+
+ php_value max_input_time 3600
+ php_value max_execution_time 3600
+
+The `mod_reqtimeout <https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html>`_
+Apache module could also stop large uploads from completing. If you're using this
+module and getting failed uploads of large files either disable it in your Apache
+config or raise the configured ``RequestReadTimeout`` timeouts.
+
+There are also several other configuration option in your webserver config which
+could prevent the upload of larger files. Please see the manual of your webserver
+how to configure those values correctly:
+
+Apache
+~~~~~~
+* `LimitRequestBody <https://httpd.apache.org/docs/current/en/mod/core.html#limitrequestbody>`_
+* `SSLRenegBufferSize <https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslrenegbuffersize>`_
+
+Apache with mod_fcgid
+~~~~~~~~~~~~~~~~~~~~~
+* `FcgidMaxRequestLen <https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#fcgidmaxrequestlen>`_
+
+NginX
+~~~~~
+* `client_max_body_size <http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size>`_
+
+IIS
+~~~
+* `maxAllowedContentLength <http://www.iis.net/configreference/system.webserver/security/requestfiltering/requestlimits#005>`_
+
+
+Configuring PHP
+---------------
+
+If you don't want to use the ownCloud ``.htaccess`` file, you may
+configure PHP instead. Make sure to comment out any lines ``.htaccess``
+pertaining to upload size, if you entered any.
+
+To view your current PHP configuration and to see the location of your
+``php.ini`` file, create a plain text file named ``phpinfo.php`` with just this
+single line of code in it: ``<?php phpinfo(); ?>``. Place this file in your Web
+root, for example ``/var/www/html``, and open it in your Web browser, for
+example ``http://localhost/phpinfo.php``. This will display your complete
+current PHP configuration. Look for the **Loaded Configuration File** section
+to see which ``php.ini`` file your server is using. This is the one you want to
+edit.
+
+If you are running ownCloud on a 32-bit system, any ``open_basedir`` directive
+in your ``php.ini`` file needs to be commented out
+
+Set the following two parameters inside ``php.ini``, using your own desired
+file size values::
+
+ upload_max_filesize = 16G
+ post_max_size = 16G
+
+Tell PHP which temp file you want it to use::
+
+ upload_tmp_dir = /var/big_temp_file/
+
+**Output Buffering** must be turned off in ``.htaccess`` or ``php.ini``, or PHP
+will return memory-related errors:
+
+* ``output_buffering = 0``
diff --cc core/doc/admin/release/_sources/configuration/config_sample_php_parameters.txt
index 2d6ce6c,0000000..8bfc75e
mode 100644,000000..100644
--- a/core/doc/admin/release/_sources/configuration/config_sample_php_parameters.txt
+++ b/core/doc/admin/release/_sources/configuration/config_sample_php_parameters.txt
@@@ -1,1054 -1,0 +1,1061 @@@
+Config.php Parameters
+=====================
++
+ownCloud uses the ``config/config.php`` file to control server operations.
+``config/config.sample.php`` lists all the configurable parameters within
- ownCloud. This document provides a more detailed reference. Many options are
- configurable on your Admin page, so it is usually not necessary to edit
- ``config/config.php``.
++ownCloud, along with example or default values. This document provides a more
++detailed reference. Most options are configurable on your Admin page, so it
++is usually not necessary to edit ``config/config.php``.
++
++.. note:: The installer creates a configuration containing the essential parameters.
++ Only manually add configuration parameters to ``config/config.php`` if you need to
++ use a special value for a parameter. **Do not copy everything from
++ ``config/config.sample.php``. Only enter the parameters you wish to modify!**
+
+.. Generated content below. Don't change this.
+.. DEFAULT_SECTION_START
+
+
+Default Parameters
+------------------
+
+These parameters are configured by the ownCloud installer, and are required
+for your ownCloud server to operate.
+
+
+::
+
+ 'instanceid' => '',
+
+This is a unique identifier for your ownCloud installation, created
+automatically by the installer. This example is for documentation only,
+and you should never use it because it will not work. A valid ``instanceid``
+is created when you install ownCloud.
+
+'instanceid' => 'd3c944a9a',
+
+::
+
+ 'passwordsalt' => '',
+
+The salt used to hash all passwords, auto-generated by the ownCloud
+installer. (There are also per-user salts.) If you lose this salt you lose
+all your passwords. This example is for documentation only,
+and you should never use it.
+
+'passwordsalt' => 'd3c944a9af095aa08f',
+
+::
+
+ 'trusted_domains' =>
+ array (
+ 'demo.example.org',
+ 'otherdomain.example.org',
+ ),
+
+Your list of trusted domains that users can log into. Specifying trusted
+domains prevents host header poisoning. Do not remove this, as it performs
+necessary security checks.
+
+::
+
+ 'datadirectory' => '/var/www/owncloud/data',
+
+Where user files are stored; this defaults to ``data/`` in the ownCloud
+directory. The SQLite database is also stored here, when you use SQLite. (SQLite is
+available only in ownCloud Community Edition)
+
+::
+
+ 'version' => '',
+
+The current version number of your ownCloud installation. This is set up
+during installation and update, so you shouldn't need to change it.
+
+::
+
+ 'dbtype' => 'sqlite',
+
+Identifies the database used with this installation. See also config option
+``supportedDatabases``
+
+Available:
+ - sqlite (SQLite3 - Community Edition Only)
+ - mysql (MySQL/MariaDB)
+ - pgsql (PostgreSQL)
+ - oci (Oracle - Enterprise Edition Only)
+ - mssql (Microsoft SQL Server - Enterprise Edition Only)
+
+::
+
+ 'dbhost' => '',
+
+Your host server name, for example ``localhost``, ``hostname``,
+``hostname.example.com``, or the IP address. To specify a port use
+``hostname:####``; to specify a Unix socket use
+``localhost:/path/to/socket``.
+
+::
+
+ 'dbname' => 'owncloud',
+
+The name of the ownCloud database, which is set during installation. You
+should not need to change this.
+
+::
+
+ 'dbuser' => '',
+
+The user that ownCloud uses to write to the database. This must be unique
+across ownCloud instances using the same SQL database. This is set up during
+installation, so you shouldn't need to change it.
+
+::
+
+ 'dbpassword' => '',
+
+The password for the database user. This is set up during installation, so
+you shouldn't need to change it.
+
+::
+
+ 'dbtableprefix' => '',
+
+Prefix for the ownCloud tables in the database.
+
+::
+
+ 'dbdriveroptions' => array(
+ PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+ ),
+
+Additional driver options for the database connection, eg. to enable SSL
+encryption in MySQL.
+
+::
+
+ 'installed' => false,
+
+Indicates whether the ownCloud instance was installed successfully; ``true``
+indicates a successful installation, and ``false`` indicates an unsuccessful
+installation.
++
+.. DEFAULT_SECTION_END
+.. Generated content above. Don't change this.
+
+Default config.php Examples
+---------------------------
+When you use SQLite as your ownCloud database, your ``config.php`` looks like
+this after installation. The SQLite database is stored in your ownCloud
+``data/`` directory. SQLite is a simple, lightweight embedded database that
+is good for testing and for simple installations, but for production ownCloud
+systems you should use MySQL, MariaDB, or PosgreSQL.
+
+::
+
+ <?php
+ $CONFIG = array (
+ 'instanceid' => 'occ6f7365735',
+ 'passwordsalt' => '2c5778476346786306303',
+ 'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'studio',
+ ),
+ 'datadirectory' => '/var/www/owncloud/data',
+ 'dbtype' => 'sqlite3',
+ 'version' => '7.0.2.1',
+ 'installed' => true,
+ );
+
+This example is from a new ownCloud installation using MariaDB::
+
+
+ <?php
+ $CONFIG = array (
+ 'instanceid' => 'oc8c0fd71e03',
+ 'passwordsalt' => '515a13302a6b3950a9d0fdb970191a',
+ 'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'studio',
+ 2 => '192.168.10.155'
+ ),
+ 'datadirectory' => '/var/www/owncloud/data',
+ 'dbtype' => 'mysql',
+ 'version' => '7.0.2.1',
+ 'dbname' => 'owncloud',
+ 'dbhost' => 'localhost',
+ 'dbtableprefix' => 'oc_',
+ 'dbuser' => 'oc_carla',
+ 'dbpassword' => '67336bcdf7630dd80b2b81a413d07',
+ 'installed' => true,
+ );
+
+.. Generated content below. Don't change this.
+.. ALL_OTHER_SECTIONS_START
+
+
+User Experience
+---------------
+
+These optional parameters control some aspects of the user interface. Default
+values, where present, are shown.
+
+
+::
+
+ 'default_language' => 'en',
+
+This sets the default language on your ownCloud server, using ISO_639-1
+language codes such as ``en`` for English, ``de`` for German, and ``fr`` for
+French. It overrides automatic language detection on public pages like login
+or shared items. User's language preferences configured under "personal ->
+language" override this setting after they have logged in.
+
+::
+
+ 'defaultapp' => 'files',
+
+Set the default app to open on login. Use the app names as they appear in the
+URL after clicking them in the Apps menu, such as documents, calendar, and
+gallery. You can use a comma-separated list of app names, so if the first
+app is not enabled for a user then ownCloud will try the second one, and so
+on. If no enabled apps are found it defaults to the Files app.
+
+::
+
+ 'knowledgebaseenabled' => true,
+
+``true`` enables the Help menu item in the user menu (top right of the
+ownCloud Web interface). ``false`` removes the Help item.
+
+::
+
+ 'enable_avatars' => true,
+
+``true`` enables avatars, or user profile photos. These appear on the User
+page, on user's Personal pages and are used by some apps (contacts, mail,
+etc). ``false`` disables them.
+
+::
+
+ 'allow_user_to_change_display_name' => true,
+
+``true`` allows users to change their display names (on their Personal
+pages), and ``false`` prevents them from changing their display names.
+
+::
+
+ 'remember_login_cookie_lifetime' => 60*60*24*15,
+
+Lifetime of the remember login cookie, which is set when the user clicks the
+``remember`` checkbox on the login screen. The default is 15 days, expressed
+in seconds.
+
+::
+
+ 'session_lifetime' => 60 * 60 * 24,
+
+The lifetime of a session after inactivity; the default is 24 hours,
+expressed in seconds.
+
+::
+
+ 'session_keepalive' => true,
+
+Enable or disable session keep-alive when a user is logged in to the Web UI.
+
+Enabling this sends a "heartbeat" to the server to keep it from timing out.
+
+::
+
+ 'skeletondirectory' => '/path/to/owncloud/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
+skeleton files.
+
+::
+
+ 'user_backends' => array(
+ array(
+ 'class' => 'OC_User_IMAP',
+ 'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
+ )
+ ),
+
+The ``user_backends`` app (which needs to be enabled first) allows you to
+configure alternate authentication backends. Supported backends are:
+IMAP (OC_User_IMAP), SMB (OC_User_SMB), and FTP (OC_User_FTP).
+
+Mail Parameters
+---------------
+
+These configure the email settings for ownCloud notifications and password
+resets.
+
+
+::
+
+ 'mail_domain' => 'example.com',
+
+The return address that you want to appear on emails sent by the ownCloud
+server, for example ``oc-admin at example.com``, substituting your own domain,
+of course.
+
+::
+
+ 'mail_from_address' => 'owncloud',
+
+FROM address that overrides the built-in ``sharing-noreply`` and
+``lostpassword-noreply`` FROM addresses.
+
+::
+
+ 'mail_smtpdebug' => false,
+
+Enable SMTP class debugging.
+
+::
+
+ 'mail_smtpmode' => 'sendmail',
+
+Which mode to use for sending mail: ``sendmail``, ``smtp``, ``qmail`` or
+``php``.
+
+If you are using local or remote SMTP, set this to ``smtp``.
+
+If you are using PHP mail you must have an installed and working email system
+on the server. The program used to send email is defined in the ``php.ini``
+file.
+
+For the ``sendmail`` option you need an installed and working email system on
+the server, with ``/usr/sbin/sendmail`` installed on your Unix system.
+
+For ``qmail`` the binary is /var/qmail/bin/sendmail, and it must be installed
+on your Unix system.
+
+::
+
+ 'mail_smtphost' => '127.0.0.1',
+
+This depends on ``mail_smtpmode``. Specified the IP address of your mail
+server host. This may contain multiple hosts separated by a semi-colon. If
+you need to specify the port number append it to the IP address separated by
+a colon, like this: ``127.0.0.1:24``.
+
+::
+
+ 'mail_smtpport' => 25,
+
+This depends on ``mail_smtpmode``. Specify the port for sending mail.
+
+::
+
+ 'mail_smtptimeout' => 10,
+
+This depends on ``mail_smtpmode``. This set an SMTP server timeout, in
+seconds. You may need to increase this if you are running an anti-malware or
+spam scanner.
+
+::
+
+ 'mail_smtpsecure' => '',
+
+This depends on ``mail_smtpmode``. Specify when you are using ``ssl`` or
+``tls``, or leave empty for no encryption.
+
+::
+
+ 'mail_smtpauth' => false,
+
+This depends on ``mail_smtpmode``. Change this to ``true`` if your mail
+server requires authentication.
+
+::
+
+ 'mail_smtpauthtype' => 'LOGIN',
+
+This depends on ``mail_smtpmode``. If SMTP authentication is required, choose
+the authentication type as ``LOGIN`` (default) or ``PLAIN``.
+
+::
+
+ 'mail_smtpname' => '',
+
+This depends on ``mail_smtpauth``. Specify the username for authenticating to
+the SMTP server.
+
+::
+
+ 'mail_smtppassword' => '',
+
+This depends on ``mail_smtpauth``. Specify the password for authenticating to
+the SMTP server.
+
+Proxy Configurations
+--------------------
+
+
+::
+
+ 'overwritehost' => '',
+
+The automatic hostname detection of ownCloud can fail in certain reverse
+proxy and CLI/cron situations. This option allows you to manually override
+the automatic detection; for example ``www.example.com``, or specify the port
+``www.example.com:8080``.
+
+::
+
+ 'overwriteprotocol' => '',
+
+When generating URLs, ownCloud attempts to detect whether the server is
+accessed via ``https`` or ``http``. However, if ownCloud is behind a proxy
+and the proxy handles the ``https`` calls, ownCloud would not know that
+``ssl`` is in use, which would result in incorrect URLs being generated.
+
+Valid values are ``http`` and ``https``.
+
+::
+
+ 'overwritewebroot' => '',
+
+ownCloud attempts to detect the webroot for generating URLs automatically.
+
+For example, if ``www.example.com/owncloud`` is the URL pointing to the
+ownCloud instance, the webroot is ``/owncloud``. When proxies are in use, it
+may be difficult for ownCloud to detect this parameter, resulting in invalid
+URLs.
+
+::
+
+ 'overwritecondaddr' => '',
+
+This option allows you to define a manual override condition as a regular
+expression for the remote IP address. For example, defining a range of IP
+addresses starting with ``10.0.0.`` and ending with 1 to 3:
+``^10\.0\.0\.[1-3]$``
+
+::
+
+ 'overwrite.cli.url' => '',
+
+Use this configuration parameter to specify the base url for any urls which
+are generated within ownCloud using any kind of command line tools (cron or
+occ). The value should contain the full base URL:
+``https://www.example.com/owncloud``
+
+::
+
+ 'proxy' => '',
+
+The URL of your proxy server, for example ``proxy.example.com:8081``.
+
+::
+
+ 'proxyuserpwd' => '',
+
+The optional authentication for the proxy to use to connect to the internet.
+
+The format is: ``username:password``.
+
+Deleted Items (trash bin)
+-------------------------
+
+These parameters control the Deleted files app.
+
+
+::
+
+ 'trashbin_retention_obligation' => 30,
+
+When the trash bin app is enabled (default), this is the number of days a
+file will be kept in the trash bin. Default is 30 days.
+
+::
+
+ 'trashbin_auto_expire' => true,
+
+Disable or enable auto-expiration for the trash bin. By default
+auto-expiration is enabled.
+
+ownCloud Verifications
+----------------------
+
+ownCloud performs several verification checks. There are two options,
+``true`` and ``false``.
+
+
+::
+
+ 'appcodechecker' => true,
+
+Check 3rd party apps to make sure they are using the private API and not the
+public API. If the app uses the private API it cannot be installed.
+
+::
+
+ 'updatechecker' => true,
+
+Check if ownCloud is up-to-date and shows a notification if a new version is
+available.
+
+::
+
+ 'has_internet_connection' => true,
+
+Is ownCloud connected to the Internet or running in a closed network?
+
+::
+
+ 'check_for_working_webdav' => true,
+
+Allows ownCloud to verify a working WebDAV connection. This is done by
+attempting to make a WebDAV request from PHP.
+
+::
+
+ 'check_for_working_htaccess' => true,
+
+This is a crucial security check on Apache servers that should always be set
+to ``true``. This verifies that the ``.htaccess`` file is writable and works.
+
+If it is not, then any options controlled by ``.htaccess``, such as large
+file uploads, will not work. It also runs checks on the ``data/`` directory,
+which verifies that it can't be accessed directly through the web server.
+
+::
+
+ 'config_is_read_only' => false,
+
+In certain environments it is desired to have a read-only config file.
+
+When this switch is set to ``true`` ownCloud will not verify whether the
+configuration is writable. However, it will not be possible to configure
+all options via the web-interface. Furthermore, when updating ownCloud
+it is required to make the config file writable again for the update
+process.
+
+Logging
+-------
+
+
+::
+
+ 'log_type' => 'owncloud',
+
+By default the ownCloud logs are sent to the ``owncloud.log`` file in the
+default ownCloud data directory. If syslogging is desired, set this parameter
+to ``syslog``.
+
+::
+
+ 'logfile' => 'owncloud.log',
+
+Change the ownCloud logfile name from ``owncloud.log`` to something else.
+
+::
+
+ 'loglevel' => 2,
+
+Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
+Warning, 3 = Error. The default value is Warning.
+
+::
+
+ 'logdateformat' => 'F d, Y H:i:s',
+
+This uses PHP.date formatting; see http://php.net/manual/en/function.date.php
+
+::
+
+ 'logtimezone' => 'Europe/Berlin',
+
+The default timezone for logfiles is UTC. You may change this; see
+http://php.net/manual/en/timezones.php
+
+::
+
+ 'log_query' => false,
+
+Append all database queries and parameters to the log file. Use this only for
+debugging, as your logfile will become huge.
+
+::
+
+ 'cron_log' => true,
+
+Log successful cron runs.
+
+::
+
+ 'log_rotate_size' => false,
+
+Enables log rotation and limits the total size of logfiles. The default is 0,
+or no rotation. Specify a size in bytes, for example 104857600 (100 megabytes
+= 100 * 1024 * 1024 bytes). A new logfile is created with a new name when the
+old logfile reaches your limit. The total size of all logfiles is double the
+``log_rotate_sizerotation`` value.
+
+Alternate Code Locations
+------------------------
+
+Some of the ownCloud code may be stored in alternate locations.
+
+
+::
+
+ '3rdpartyroot' => '',
+
+ownCloud 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.
+
+::
+
+ '3rdpartyurl' => '',
+
+If you have an alternate ``3rdpartyroot``, you must also configure the URL as
+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',
+ 'customclient_ios' =>
+ 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8',
+
+This section is for configuring the download links for ownCloud clients, as
+seen in the first-run wizard and on Personal pages.
+
+Apps
+----
+
+Options for the Apps folder, Apps store, and App code checker.
+
+
+::
+
+ 'appstoreenabled' => true,
+
+When enabled, admins may install apps from the ownCloud app store.
+
+The app store is disabled by default for ownCloud Enterprise Edition
+
+::
+
+ 'appstoreurl' => 'https://api.owncloud.com/v1',
+
+The URL of the appstore to use.
+
+::
+
+ 'apps_paths' => array(
+ array(
+ 'path'=> '/var/www/owncloud/apps',
+ 'url' => '/apps',
+ 'writable' => true,
+ ),
+ ),
+
+Use the ``apps_paths`` parameter to set the location of the Apps directory,
+which should be scanned for available apps, and where user-specific apps
+should be installed from the Apps store. The ``path`` defines the absolute
+file system path to the app folder. The key ``url`` defines the HTTP web path
+to that folder, starting from the ownCloud web root. The key ``writable``
+indicates if a web server can write files to that folder.
+
+::
+
+ 'appcodechecker' => true,
+
+Check 3rd party apps to make sure they are using the private API and not the
+public API. If the app uses the private API it cannot be installed.
+
+
+
+
+
+Previews
+--------
+
+ownCloud supports previews of image files, the covers of MP3 files, and text
+files. These options control enabling and disabling previews, and thumbnail
+size.
+
+
+::
+
+ 'enable_previews' => true,
+
+By default, ownCloud can generate previews for the following filetypes:
+
+- Images files
+- Covers of MP3 files
+- Text documents
+
+Valid values are ``true``, to enable previews, or
+``false``, to disable previews
+
+::
+
+ 'preview_max_x' => null,
+
+The maximum width, in pixels, of a preview. A value of ``null`` means there
+is no limit.
+
+::
+
+ 'preview_max_y' => null,
+
+The maximum height, in pixels, of a preview. A value of ``null`` means there
+is no limit.
+
+::
+
+ 'preview_max_scale_factor' => 10,
+
+If a lot of small pictures are stored on the ownCloud instance and the
+preview system generates blurry previews, you might want to consider setting
+a maximum scale factor. By default, pictures are upscaled to 10 times the
+original size. A value of ``1`` or ``null`` disables scaling.
+
+::
+
+ 'preview_max_filesize_image' => 50,
+
+max file size for generating image previews with imagegd (default behaviour)
+If the image is bigger, it'll try other preview generators,
+but will most likely show the default mimetype icon
+
+Value represents the maximum filesize in megabytes
+Default is 50
+Set to -1 for no limit
+
+::
+
+ 'preview_libreoffice_path' => '/usr/bin/libreoffice',
+
+custom path for LibreOffice/OpenOffice binary
+
+::
+
+ 'preview_office_cl_parameters' =>
+ ' --headless --nologo --nofirststartwizard --invisible --norestore '.
+ '-convert-to pdf -outdir ',
+
+Use this if LibreOffice/OpenOffice requires additional arguments.
+
+::
+
+ 'enabledPreviewProviders' => array(
+ 'OC\Preview\Image',
+ 'OC\Preview\MP3',
+ 'OC\Preview\TXT',
+ 'OC\Preview\MarkDown'
+ ),
+
+Only register providers that have been explicitly enabled
+
+The following providers are enabled by default:
+
+ - OC\\Preview\\Image
+ - OC\\Preview\\MarkDown
+ - OC\\Preview\\MP3
+ - OC\\Preview\\TXT
+
+The following providers are disabled by default due to performance or privacy
+concerns:
+
+ - OC\\Preview\\Movie
+ - OC\\Preview\\MSOffice2003
+ - OC\\Preview\\MSOffice2007
+ - OC\\Preview\\MSOfficeDoc
+ - OC\\Preview\\OpenDocument
+ - OC\\Preview\\PDF
+ - OC\\Preview\\StarOffice
+ - OC\\Preview\\SVG
+
+.. note:: Troubleshooting steps for the MS Word previews are available
+ at the :doc:`collaborative_documents_configuration` section
+ of the Administrators Manual.
+
+The following providers are not available in Microsoft Windows:
+
+ - OC\\Preview\\Movie
+ - OC\\Preview\\MSOfficeDoc
+ - OC\\Preview\\MSOffice2003
+ - OC\\Preview\\MSOffice2007
+ - OC\\Preview\\OpenDocument
+ - OC\\Preview\\StarOffice
+
+LDAP
+----
+
+Global settings used by LDAP User and Group Backend
+
+
+::
+
+ 'ldapUserCleanupInterval' => 51,
+
+defines the interval in minutes for the background job that checks user
+existance and marks them as ready to be cleaned up. The number is always
+minutes. Setting it to 0 disables the feature.
+
+See command line (occ) methods ldap:show-remnants and user:delete
+
+Maintenance
+-----------
+
+These options are for halting user activity when you are performing server
+maintenance.
+
+
+::
+
+ 'maintenance' => false,
+
+Enable maintenance mode to disable ownCloud
+
+If you want to prevent users to login to ownCloud before you start doing some
+maintenance work, you need to set the value of the maintenance parameter to
+true. Please keep in mind that users who are already logged-in are kicked out
+of ownCloud instantly.
+
+::
+
+ 'singleuser' => false,
+
+When set to ``true``, the ownCloud instance will be unavailable for all users
+who are not in the ``admin`` group.
+
+SSL
+---
+
+
+::
+
+ 'forcessl' => false,
+
+Change this to ``true`` to require HTTPS for all connections, and to reject
+HTTP requests.
+
+::
+
+ 'openssl' => array(
+ 'config' => '/absolute/location/of/openssl.cnf',
+ ),
+
+Extra SSL options to be used for configuration.
+
+Miscellaneous
+-------------
+
+
+::
+
+ 'blacklisted_files' => array('.htaccess'),
+
+Blacklist a specific file or files and disallow the upload of files
+with this name. ``.htaccess`` is blocked by default.
+
+WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING.
+
+::
+
+ 'share_folder' => '/',
+
+Define a default folder for shared files and folders other than root.
+
+::
+
+ 'theme' => '',
+
+If you are applying a theme to ownCloud, enter the name of the theme here.
+
+The default location for themes is ``owncloud/themes/``.
+
+::
+
+ 'xframe_restriction' => true,
+
+X-Frame-Restriction is a header which prevents browsers from showing the site
+inside an iframe. This is be used to prevent clickjacking. It is risky to
+disable this, so leave it set at ``true``.
+
+::
+
+ 'cipher' => 'AES-256-CFB',
+
+The default cipher for encrypting files. Currently AES-128-CFB and
+AES-256-CFB are supported.
+
+::
+
+ 'memcached_servers' => array(
+ // hostname, port and optional weight. Also see:
+ // http://www.php.net/manual/en/memcached.addservers.php
+ // http://www.php.net/manual/en/memcached.addserver.php
+ array('localhost', 11211),
+ //array('other.host.local', 11211),
+ ),
+
+Server details for one or more memcached servers to use for memory caching.
+
+Memcache is only used if other memory cache options (xcache, apc, apcu) are
+not available.
+
+::
+
+ 'cache_path' => '',
+
+Location of the cache folder, defaults to ``data/$user/cache`` where
+``$user`` is the current user. When specified, the format will change to
+``$cache_path/$user`` where ``$cache_path`` is the configured cache directory
+and ``$user`` is the user.
+
+::
+
+ 'quota_include_external_storage' => false,
+
+EXPERIMENTAL: option whether to include external storage in quota
+calculation, defaults to false.
+
+::
+
+ 'filesystem_check_changes' => 1,
+
+Specifies how often the filesystem is checked for changes made outside
+ownCloud.
+
+0 -> Never check the filesystem for outside changes, provides a performance
+increase when it's certain that no changes are made directly to the
+filesystem
+
+1 -> Check each file or folder at most once per request, recommended for
+general use if outside changes might happen.
+
+2 -> Check every time the filesystem is used, causes a performance hit when
+using external storages, not recommended for regular use.
+
+::
+
+ 'asset-pipeline.enabled' => false,
+
+All css and js files will be served by the web server statically in one js
+file and one css file if this is set to ``true``.
+
+.. note:: Test this thoroughly on production systems as it should work reliably
+ with core apps, but you may encounter problems with community/third-party apps.
+
+::
+
+ 'mount_file' => 'data/mount.json',
+
+Where ``mount.json`` file should be stored, defaults to ``data/mount.json``
+
+::
+
+ 'filesystem_cache_readonly' => false,
+
+When ``true``, prevent ownCloud from changing the cache due to changes in the
+filesystem for all storage.
+
+::
+
+ 'objectstore' => array(
+ 'class' => 'OC\\Files\\ObjectStore\\Swift',
+ 'arguments' => array(
+ // trystack will user your facebook id as the user name
+ 'username' => 'facebook100000123456789',
+ // in the trystack dashboard go to user -> settings -> API Password to
+ // generate a password
+ 'password' => 'Secr3tPaSSWoRdt7',
+ // must already exist in the objectstore, name can be different
+ 'container' => 'owncloud',
+ // create the container if it does not exist. default is false
+ 'autocreate' => true,
+ // required, dev-/trystack defaults to 'RegionOne'
+ 'region' => 'RegionOne',
+ // The Identity / Keystone endpoint
+ 'url' => 'http://8.21.28.222:5000/v2.0',
+ // required on dev-/trystack
+ 'tenantName' => 'facebook100000123456789',
+ // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
+ // if omitted
+ 'serviceName' => 'swift',
+ ),
+ ),
+
+The example below shows how to configure ownCloud to store all files in a
+swift object storage.
+
+It is important to note that ownCloud in object store mode will expect
+exclusive access to the object store container because it only stores the
+binary data for each file. The metadata is currently kept in the local
+database for performance reasons.
+
+WARNING: The current implementation is incompatible with any app that uses
+direct file IO and circumvents our virtual filesystem. That includes
+Encryption and Gallery. Gallery will store thumbnails directly in the
+filesystem and encryption will cause severe overhead because key files need
+to be fetched in addition to any requested file.
+
+One way to test is applying for a trystack account at http://trystack.org/
+
+::
+
+ 'supportedDatabases' => array(
+ 'sqlite',
+ 'mysql',
+ 'pgsql',
+ 'oci',
+ 'mssql'
+ ),
+
+Database types that are supported for installation.
+
+Available:
+ - sqlite (SQLite3 - Community Edition Only)
+ - mysql (MySQL)
+ - pgsql (PostgreSQL)
+ - oci (Oracle - Enterprise Edition Only)
+ - mssql (Microsoft SQL Server - Enterprise Edition Only)
+
+::
+
+ 'custom_csp_policy' =>
+ "default-src 'self'; script-src 'self' 'unsafe-eval'; ".
+ "style-src 'self' 'unsafe-inline'; frame-src *; img-src *; ".
+ "font-src 'self' data:; media-src *",
+
+Custom CSP policy, changing this will overwrite the standard policy
+
+::
+
+ 'secret' => 'ICertainlyShouldHaveChangedTheDefaultSecret',
+
+Secret used by ownCloud for various purposes, e.g. to encrypt data. If you
+lose this string there will be data corruption.
+
+.. ALL_OTHER_SECTIONS_END
+.. Generated content above. Don't change this.
+
+App config options
+------------------
+
+Retention for activities of the activity app:
+
+
+::
+
+ 'activity_expire_days' => 365,
+
+Every day a cron job is ran, which deletes all activities for all users
+which are older then the number of days that is set for ``activity_expire_days``
diff --cc core/doc/admin/release/_sources/configuration/user_configuration.txt
index d16dbf3,0000000..85ea7d3
mode 100644,000000..100644
--- a/core/doc/admin/release/_sources/configuration/user_configuration.txt
+++ b/core/doc/admin/release/_sources/configuration/user_configuration.txt
@@@ -1,163 -1,0 +1,164 @@@
++===============
+User Management
+===============
+
+In ownCloud 7, the Users management page has been streamlined and improved. You
+can create new users, view all of your users in a single scrolling window,
+filter users by group, see what groups they belong to, edit their full names and
+passwords, see their data storage locations, view and set quotas, and, if you so
+desire, delete them with a single click.
+
+.. figure:: ../images/users-config.png
+
+User accounts have the following properties:
+
+*Login Name (Username)*
+ This is the unique ID of an ownCloud user, and it cannot be changed.
+
+*Full Name*
+ The user's display name that appears on file shares, the ownCloud Web
+ interface, and emails. Admins and users may change the Full Name anytime. If
+ the Full Name is not set it defaults to the login name.
+
+*Password*
+ The admin sets the new user's first password. Both the user and the admin can
+ change the user's password at anytime.
+
+*Groups*
+ You may create groups, and assign group memberships to users. By default new
+ users are not assigned to any groups.
+
+*Group Admin*
+ Group admins are granted administrative privileges on specific groups, and
+ can add and remove users from their groups.
+
+*Quota*
+ The maximum disk space assigned to each user. Any user that exceeds the quota
+ cannot upload or sync data. ownCloud 7 introduces a new feature, and that is
+ the option to include external storage in user quotas.
+
+Creating a New User
+~~~~~~~~~~~~~~~~~~~
+
+To create a user account:
+
+* Enter the new user's **Login Name** and their initial **Password**
+* Optionally, assign **Groups** memberships
+* Click the **Create** button
+
+.. figure:: ../images/users-create.png
+
+Login names may contain letters (a-z, A-Z), numbers (0-9), dashes (-),
- underscores (_), periods (.) and ampersands (@). After creating the user, you
++underscores (_), periods (.) and at signs (@). After creating the user, you
+may fill in their **Full Name** if it is different than the login name, or
+leave it for the user to complete.
+
+Remember to give your new users their logins and passwords.
+
+Reset a User's Password
+~~~~~~~~~~~~~~~~~~~~~~~
+
+You cannot recover a user's password, but you can set a new one:
+
+* Hover your cursor over the user's **Password** field
+* Click on the **pencil icon**
+* Enter the user's new password in the password field, and remember to provide
+ the user with their password
+
+If you have encryption enabled, there are special considerations for user
+password resets. Please see :doc:`encryption_configuration`.
+
+Renaming a User
+~~~~~~~~~~~~~~~
+
+Each ownCloud user has two names: a unique **Login Name** used for
+authentication, and a **Full Name**, which is their display name. You can edit
+the display name of a user, but you cannot change the login name of any user.
+
+To set or change a user's display name:
+
+* Hover your cursor over the user's **Full Name** field
+* Click on the **Pencil icon**
+* Enter the user's new display name
+
+
+Granting Administrator Privileges to a User
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ownCloud has two types of administrators: **Super Administrators** and **Group
+Administrators**. Group administrators have the rights to create, edit and
+delete users in their assigned groups. Group administrators cannot access
+system settings, or add or modify users in the groups that they are not **Group
+Administrators** for. Use the dropdown menus in the **Group Admin** column to
+assign group admin privileges.
+
+.. figure:: ../images/users-groups.png
+
+**Super Administrators** have full rights on your ownCloud server, and can
+access and modify all settings. To assign the **Super Administrators** role to
+a user, simply add them to the ``admin`` group.
+
+
+Managing Groups
+~~~~~~~~~~~~~~~
+
+You can assign new users to groups when you create them, and create new groups
+when you create new users. You may also use the **Add Group** button at the top
+of the left pane to create new groups. New group members will immediately
+have access to file shares that belong to their new groups.
+
+Setting Storage Quotas
+~~~~~~~~~~~~~~~~~~~~~~
+
+Click the gear on the lower left pane to set a default storage quota. This is
+automatically applied to new users. You may assign a different quota to any user
+by selecting from the **Quota** dropdown, selecting either a preset value or
+entering a custom value. When you create custom quotas, use the normal
+abbreviations for your storage values such as 500 MB, 5 GB, 5 TB, and so on.
+
+You now have a configurable option in ``config.php`` that controls whether
+external storage is counted against user's quotas. This is still
+experimental, and may not work as expected. The default is to not count
+external storage as part of user storage quotas. If you prefer to include it,
+then change the default ``false`` to ``true``.::
+
+ 'quota_include_external_storage' => false,
+
+Metadata (such as thumbnails, temporary files, and encryption keys) takes up
+about 10% of disk space, but is not counted against user quotas. Users can check
+their used and available space on their Personal pages. Only files that
+originate with users count against their quotas, and not files shared with them
+that originate from other users. For example, if you upload files to a
+different user's share, those files count against your quota. If you re-share a
+file that another user shared with you, that file does not count against your
+quota, but the originating user's.
+
+Encrypted files are a little larger than unencrypted files; the unencrypted size
+is calculated against the user's quota.
+
+Deleted files that are still in the trash bin do not count against quotas. The
+trash bin is set at 50% of quota. Deleted file aging is set at 30 days. When
+deleted files exceed 50% of quota then the oldest files are removed until the
+total is below 50%.
+
+When version control is enabled, the older file versions are not counted
+against quotas.
+
+When a user creates a public share via URL, and allows uploads, any uploaded
+files count against that user's quota.
+
+Deleting users
+~~~~~~~~~~~~~~
+
+Deleting a user is easy: hover your cursor over their name on the **Users** page
+until a trashcan icon appears at the far right. Click the trashcan, and they're
+gone. You'll see an undo button at the top of the page, which remains until you
+refresh the page. When the undo button is gone you cannot recover the deleted
+user.
+
+All of the files owned by the user are deleted as well, including all files they
+have shared. If you need to preserve the user's files and shares, you must first
+download them from your ownCloud Files page, which compresses them into a zip
+file, or use a sync client to copy them to your local computer. See the "File
+Sharing" section of the Admin Manual to learn how to create persistent file
+shares that survive user deletions.
diff --cc core/doc/admin/release/_sources/installation/installation_wizard.txt
index 41a6187,0000000..a8584f7
mode 100644,000000..100644
--- a/core/doc/admin/release/_sources/installation/installation_wizard.txt
+++ b/core/doc/admin/release/_sources/installation/installation_wizard.txt
@@@ -1,205 -1,0 +1,206 @@@
+Installation Wizard
+===================
+
+When ownCloud prerequisites are fulfilled and all ownCloud files are installed
+on the server, the last step to complete the installation is
+running the Installation Wizard. Open your Web browser to your new ownCloud
+installation.
+
+ * If you are installing ownCloud on the same machine as you are accessing the
+ install wizard from, the URL will be ``http://localhost/owncloud``, or ``https://localhost/owncloud`` if you have enabled SSL.
+ * If you are installing ownCloud on a different machine, you'll have to access
+ it by its hostname or IP address, e.g. ``http://example.com/owncloud``.
+ * If you are using a self-signed certificate, you will be presented with a
+ security warning about the issuer of the certificate not being trusted which
+ you can ignore.
+
+* You will be presented with the setup screen:
+
+.. image:: images/install-wizard.png
+ :scale: 75%
+
+Required Settings
+~~~~~~~~~~~~~~~~~
+
+Under ``create an admin account`` you must enter a username and
+password for the administrative user account. You may choose any username and
+password that you want.
+
+Storage & Database
+~~~~~~~~~~~~~~~~~~
+
+* Click ``Storage & Database`` to see all of your database options, and to
+ optionally change the default data storage directory.
+* The database you want to use must already be installed, and you must have a
+ database admin user and password.
+* Enter any arbitrary name for the Database name. This must be a database that
+ does not already exist.
+* If you are not using Apache as the web server, it is highly
+ recommended to configure the data directory to a location outside of
+ the document root. Otherwise all user data is potentially publicly
+ visible!
+
+.. image:: images/install-wizard-advanced.png
+ :scale: 75%
+
+Database Choice
+~~~~~~~~~~~~~~~
+
+* For a guideline on which database system to choose, and on pointers how to
+ set them up for being available for PHP/ownCloud, see
+ :doc:`../configuration/database_configuration`
+
+* Note that you will only be able to choose among the PHP database connectors
+ which are actually installed on the system.
+
+* It is not easily possible to migrate to another database system once you have
+ set up your ownCloud to use a specific one. So make sure to carefully
+ consider which database system to use.
+
+* When using MySQL/MariaDB or PostgreSQL you have two options regarding the database
+ name and user account you specify:
+
+ * You can specify either an admin or the root user, and the name of a database
+ which does not yet exist. This lets ownCloud create its own database; it
+ will also create a database user account with restricted rights (with the
+ same username as you specified for the administrative user, plus an
+ ``oc_`` prefix) and will use that for all subsequent database access.
+
+ * There are restrictions as to what characters a database name may or may
+ not contain; see the
+ `MySQL Schema Object Names documentation`_ for details);
+
+Finish Installation
+~~~~~~~~~~~~~~~~~~~
+
+* Once you've entered all settings, click "Finish Setup"
+* ownCloud will set up your cloud according to the given settings
+* When it's finished, it will log you in as administrative user and present the
+ "Welcome to ownCloud" screen.
+
+Setting Strong Directory Permissions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For hardened security we recommend setting the permissions on your ownCloud
+directory as strictly as possible. This should be done immediately after the
+initial installation. Your HTTP user must own the ``config/``, ``data/`` and
+``apps/`` directories in your ownCloud directory so that you can configure
+ownCloud, create, modify and delete your data files, and install apps via the
+ownCloud Web interface.
+
+You can find your HTTP user in your HTTP server configuration files. Or you can
+create a PHP page to find it for you. To do this, create a plain text file with
+the following lines in it:
+
+.. code-block:: php
+
+ <?php
+ echo "User: " . exec('whoami');
+ echo "Group: " . exec('groups');
+ ?>
+
+If the exec php function is disabled (getting a white page with the script above)
+you can also try to use a script like:
+
+.. code-block:: php
+
+ <?php
+ $processUser = posix_getpwuid(posix_geteuid());
+ echo "User: " . $processUser['name'];
+ $processGroup = posix_getgrgid($processUser['gid']);
+ echo " Group: " . $processGroup['name'];
+ ?>
+
+Name it ``whoami.php`` and place it in your ``/var/www/html`` directory, and
+then open it in a Web browser, for example ``http://localhost/whoami.php``. You
+should see a single line in your browser page with the HTTP user name.
+
+* The HTTP user and group in Debian/Ubuntu is ``www-data``.
+* The HTTP user and group in Fedora/CentOS is ``apache``.
+* The HTTP user and group in Arch Linux is ``http``.
+* The HTTP user in openSUSE is ``wwwrun``, and the HTTP group is ``www``.
+
+.. note:: When using an NFS mount for the data directory, do not change its
+ ownership from the default. The simple act of mounting the drive will set
+ proper permissions for ownCloud to write to the directory. Changing
+ ownership as above could result in some issues if the NFS mount is
+ lost.
+
+The easy way to set the correct permissions is to copy and run this script. Replace the ``ocpath`` variable with the path to your ownCloud directory, and replace the ``htuser`` and ``htgroup`` variables with your HTTP user and group::
+
+ #!/bin/bash
+ ocpath='/var/www/owncloud'
+ htuser='www-data'
+ htgroup='www-data'
++ rootuser='root' # On QNAP this is admin
+
+ find ${ocpath}/ -type f -print0 | xargs -0 chmod 0640
+ find ${ocpath}/ -type d -print0 | xargs -0 chmod 0750
+
- chown -R root:${htuser} ${ocpath}/
++ chown -R ${rootuser}:${htgroup} ${ocpath}/
+ chown -R ${htuser}:${htgroup} ${ocpath}/apps/
+ chown -R ${htuser}:${htgroup} ${ocpath}/config/
+ chown -R ${htuser}:${htgroup} ${ocpath}/data/
+ chown -R ${htuser}:${htgroup} ${ocpath}/themes/
+
- chown root:${htuser} ${ocpath}/.htaccess
- chown root:${htuser} ${ocpath}/data/.htaccess
++ chown ${rootuser}:${htgroup} ${ocpath}/.htaccess
++ chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess
+
+ chmod 0644 ${ocpath}/.htaccess
+ chmod 0644 ${ocpath}/data/.htaccess
+
+If you have customized your ownCloud installation and your filepaths are
+different than the standard installation, then modify this script accordingly.
+
+This lists the recommended modes and ownership for your ownCloud directories
+and files:
+
+* All files should be read-write for the file owner, read-only for the
+ group owner, and zero for the world
+* All directories should be executable (because directories always need the
+ executable bit set), read-write for the directory owner, and read-only for
+ the group owner
+* The :file:`/` directory should be owned by ``root:[HTTP group]``
+* The :file:`apps/` directory should be owned by ``[HTTP user]:[HTTP group]``
+* The :file:`config/` directory should be owned by ``[HTTP user]:[HTTP group]``
+* The :file:`themes/` directory should be owned by ``[HTTP user]:[HTTP group]``
+* The :file:`data/` directory should be owned by ``[HTTP user]:[HTTP group]``
+* The :file:`[ocpath]/.htaccess` file should be owned by ``root:[HTTP group]``
+* The :file:`data/.htaccess` file should be owned by ``root:[HTTP group]``
+* Both :file:`.htaccess` files are read-write file owner, read-only group and
+ world
+
+Trusted Domains
+~~~~~~~~~~~~~~~
+
+ownCloud will take the URL used to access the Installation Wizard and insert
+that into the ``config.php`` file for the ``trusted_domains`` setting.
+All needed domain names of the ownCloud server go into the
+``trusted_domains`` setting. Users will only be able to log into ownCloud when they point their browsers to a domain name listed in the ``trusted_domains`` setting. An IPv4 address can be
+specified instead of a domain name. A typical configuration looks like this::
+
+ 'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'server1',
+ 2 => '192.168.1.50',
+ ),
+
+In the event that a load balancer is in place there will be no issues as long
+as it sends the correct X-Forwarded-Host header.
+
+The loopback address, ``127.0.0.1``, is whitelisted and
+therefore users on the ownCloud server who access ownCloud with the loopback
+interface will be able to successfully login.
+In the event that an improper URL is used, the
+following error will appear:
+
+.. image:: images/untrusted-domain.png
+ :scale: 75%
+
+For configuration examples, refer to the :file:`config/config.sample.php`
+document.
+
+
+
+.. _MySQL Schema Object Names documentation: http://dev.mysql.com/doc/refman/5.5/en/identifiers.html
diff --cc core/doc/admin/release/_sources/installation/nginx_configuration.txt
index 4851198,0000000..165b34c
mode 100644,000000..100644
--- a/core/doc/admin/release/_sources/installation/nginx_configuration.txt
+++ b/core/doc/admin/release/_sources/installation/nginx_configuration.txt
@@@ -1,112 -1,0 +1,143 @@@
+Nginx Configuration
+===================
+
+- You need to insert the following code into **your nginx config file.**
+- The config assumes that ownCloud is installed in /var/www/owncloud and
+ that it is accessed via http(s)://cloud.example.com.
+- Adjust **server_name**, **root**, **ssl_certificate** and
+ **ssl_certificate_key** to suit your needs.
+- Make sure your SSL certificates are readable by the server (see `Nginx HTTP
+ SSL Module documentation <http://wiki.nginx.org/HttpSslModule>`_).
+
+ .. note:: The following example assumes that your ownCloud is installed in
+ your webroot. If you're using a subfolder you need to adjust the configuration
+ accordingly.
+
+.. code-block:: python
+
+ upstream php-handler {
+ server 127.0.0.1:9000;
+ #server unix:/var/run/php5-fpm.sock;
- }
++ }
+
+ server {
+ listen 80;
+ server_name cloud.example.com;
+ # enforce https
+ return 301 https://$server_name$request_uri;
- }
++ }
+
+ server {
+ listen 443 ssl;
+ server_name cloud.example.com;
+
+ ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
+ ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
+
+ # Path to the root of your installation
+ root /var/www/owncloud/;
+ # set max upload size
+ client_max_body_size 10G;
+ fastcgi_buffers 64 4K;
+
+ # Disable gzip to avoid the removal of the ETag header
+ gzip off;
+
+ # Uncomment if your server is build with the ngx_pagespeed module
+ # This module is currently not supported.
+ #pagespeed off;
+
+ rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
+ rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
+ rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
+
+ index index.php;
+ error_page 403 /core/templates/403.php;
+ error_page 404 /core/templates/404.php;
+
+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
- }
++ }
+
+ location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){
+ deny all;
- }
++ }
+
+ location / {
- # The following 2 rules are only needed with webfinger
- rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
- rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
-
- rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
- rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
-
- rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
-
- try_files $uri $uri/ /index.php;
- }
-
- location ~ \.php(?:$|/) {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param PATH_INFO $fastcgi_path_info;
- fastcgi_param HTTPS on;
- fastcgi_pass php-handler;
- }
-
- # Optional: set long EXPIRES header on static assets
- location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
- expires 30d;
- # Optional: Don't log access to assets
- access_log off;
- }
++ # The following 2 rules are only needed with webfinger
++ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
++ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
++
++ rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
++ rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
++
++ rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
+
++ try_files $uri $uri/ /index.php;
++ }
++
++ location ~ \.php(?:$|/) {
++ fastcgi_split_path_info ^(.+\.php)(/.+)$;
++ include fastcgi_params;
++ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
++ fastcgi_param PATH_INFO $fastcgi_path_info;
++ fastcgi_param HTTPS on;
++ fastcgi_pass php-handler;
++ }
++
++ # Optional: set long EXPIRES header on static assets
++ location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
++ expires 30d;
++ # Optional: Don't log access to assets
++ access_log off;
+ }
++ }
+
+.. note:: You can use ownCloud over plain http, but we strongly encourage you to
+ use SSL/TLS to encrypt all of your server traffic, and to protect
+ user's logins and data in transit.
+
+- Remove the server block containing the redirect
+- Change **listen 443 ssl** to **listen 80;**
+- Remove **ssl_certificate** and **ssl_certificate_key**.
+- Remove **fastcgi_params HTTPS on;**
+
+.. note:: If you want to effectively increase maximum upload size you will also
+ have to modify your **php-fpm configuration** (**usually at
+ /etc/php5/fpm/php.ini**) and increase **upload_max_filesize** and
+ **post_max_size** values. You’ll need to restart php5-fpm and nginx
+ services in order these changes to be applied.
++
++Suppressing Log Messages
++------------------------
++
++If you're seeing meaningless messages in your logfile, for example `client
++denied by server configuration: /var/www/data/htaccesstest.txt
++<https://forum.owncloud.org/viewtopic.php?f=17&t=20217>`_, add this section to
++your Nginx configuration to suppress them::
++
++ location = /data/htaccesstest.txt {
++ allow all;
++ log_not_found off;
++ access_log off;
++ }
++
++JavaScript (.js) or CSS (.css) files not served properly
++--------------------------------------------------------
++
++A common issue with custom nginx configs is that JavaScript (.js)
++or CSS (.css) files are not served properly leading to a 404 (File not found)
++error on those files and a broken webinterface.
++
++This could be caused by the::
++
++ location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
++
++block shown above not located **below** the::
++
++ location ~ \.php(?:$|/) {
++
++block. Other custom configurations like caching JavaScript (.js)
++or CSS (.css) files via gzip could also cause such issues.
diff --cc core/doc/admin/release/_sources/installation/source_installation.txt
index e29a73d,0000000..46f4172
mode 100644,000000..100644
--- a/core/doc/admin/release/_sources/installation/source_installation.txt
+++ b/core/doc/admin/release/_sources/installation/source_installation.txt
@@@ -1,393 -1,0 +1,467 @@@
++============================
+Manual Installation on Linux
+============================
+
- Installing ownCloud on Linux from the openSUSE Build Service packages is the preferred method (see :doc:`linux_installation`). These are maintained by ownCloud engineers, and you can use your package manager to keep your ownCloud server up-to-date.
-
- If there are no packages for your Linux distribution, or you prefer installing from sources, you can setup ownCloud from scratch using a classic LAMP stack (Linux, Apache, MySQL/MariaDB, PHP). This document provides a complete walk-through for installing ownCloud on Ubuntu
++Installing ownCloud on Linux from the openSUSE Build Service packages is the
++preferred method (see :doc:`linux_installation`). These are maintained by
++ownCloud engineers, and you can use your package manager to keep your ownCloud
++server up-to-date. If there are no packages for your Linux distribution, or you
++prefer installing from sources, you can setup ownCloud from scratch using a
++classic LAMP stack (Linux, Apache, MySQL/MariaDB, PHP). This document provides a
++complete walk-through for installing ownCloud on Ubuntu
+14.04 LTS Server with Apache and MySQL.
+
+Prerequisites
+-------------
+
+.. note:: This tutorial assumes you have terminal access to the machine you want
+ to install ownCloud on. Although this is not an absolute requirement,
+ installation without it is likely to require contacting your
+ hoster (e.g. for installing required modules). Consult the `PHP manual
- <http://php.net/manual/en/extensions.php>`_ for information on modules. Your Linux distribution should have packages for all required modules.
++ <http://php.net/manual/en/extensions.php>`_ for information on
++ modules.Your Linux distribution should have packages for all
++ required modules.
+
+To run ownCloud, your web server must have the following installed:
+
- * php5 (>= 5.3.8, minimum recommended 5.4)
++* php5 (>= 5.3.8, we highly recommended 5.4+ as 5.3 is old and has many
++ problems. See :ref:`label-rhel6-php54`)
+* PHP module ctype
+* PHP module dom
+* PHP module GD
+* PHP module iconv
+* PHP module JSON
+* PHP module libxml
+* PHP module mb multibyte
+* PHP module SimpleXML
+* PHP module XMLWriter
+* PHP module zip
+* PHP module zlib
+
+Database connectors (pick at least one):
+
+* PHP module sqlite (>= 3, usually not recommended for performance reasons)
+* PHP module mysql
+* PHP module pgsql (requires PostgreSQL >= 9.0)
+
+*Recommended* packages:
+
+* PHP module curl (highly recommended, some functionality, e.g. http user
+ authentication, depends on this)
+* PHP module fileinfo (highly recommended, enhances file analysis performance)
+* PHP module bz2 (recommended, required for extraction of apps)
+* PHP module intl (increases language translation performance and fixes sorting
+ of non-ASCII characters)
+* PHP module mcrypt (increases file encryption performance)
+* PHP module openssl (required for accessing HTTPS resources)
+
+Required for specific apps:
+
+* PHP module ldap (for LDAP integration)
+* smbclient (for SMB storage / external user authentication)
+* PHP module ftp (for FTP storage / external user authentication)
+* PHP module imap (for external user authentication)
+
+Recommended for specific apps (*optional*):
+
+* PHP module exif (for image rotation in pictures app)
+* PHP module gmp (for SFTP storage)
+
+For enhanced server performance (*optional* / select only one of the following):
+
+* PHP module apc
+* PHP module apcu
+* PHP module xcache
+
+For preview generation (*optional*):
+
+* PHP module imagick
+* avconv or ffmpeg
+* OpenOffice or LibreOffice
+
- **Remarks:**
-
+* Please check your distribution, operating system or hosting partner
+ documentation on how to install and enable these modules.
+
+* Make sure your distribution's PHP version fulfills the version requirements
+ specified above. If it doesn't, there might be custom repositories you can
+ use. If you are e.g. running Ubuntu 10.04 LTS, you can update your PHP using
+ a custom `PHP PPA <https://launchpad.net/~ondrej/+archive/php5>`_::
+
+ sudo add-apt-repository ppa:ondrej/php5
+ sudo apt-get update
+ sudo apt-get install php5
+
+* You don’t need the WebDAV module for your web server (i.e. Apache’s
+ ``mod_webdav``) to access your ownCloud data via WebDAV. ownCloud has a built-in
+ WebDAV server of its own, SabreDAV.
++
++.. _label-rhel6-php54:
++
++Red Hat Enterprise Linux 6, CentOS 6, and PHP 5.4
++-------------------------------------------------
++
++RHEL 6 and CentOS still ship with PHP 5.3.x. It is highly recommended to
++upgrade to 5.4 because 5.3.x has many deprecated functions, and will cause
++problems with your ownCloud installation. To upgrade to PHP 5.4 without
++violating your RHEL support agreement you must use the Software Collections
++(SCL) repository. Follow these steps on RHEL 6::
++
++ subscription-manager repos --enable rhel-server-rhscl-6-eus-rpms
++
++Then install PHP 5.4 and these modules::
++
++ yum install php54 php54-php php54-php-gd php54-php-mbstring
++
++You must also install the updated database module for your database. This
++installs the new PHP 5.4 module for MySQL/MariaDB::
++
++ yum install php54-php-mysqlnd
++
++Activate the new PHP version permanently::
++
++ source /opt/rh/php54/enable
++
++Disable loading the old PHP 5.3 Apache module::
++
++ mv /etc/httpd/conf.d/php.conf /etc/httpd/conf.d/php.conf/old
++
++You should have a ``/etc/httpd/conf.d/php54-php.conf`` file, which loads the
++correct PHP 5.4 module for Apache.
++
++Then restart Apache::
++
++ service httpd restart
++
++Verify with ``phpinfo`` that your Apache server is using PHP 5.4 and loading
++the correct modules.
++
++The steps for CentOS 6 are slightly different. First install the SCL repo::
++
++ yum install centos-release-SCL
++
++Then install PHP 5.4 and these modules::
++
++ yum install php54 php54-php php54-php-gd php54-php-mbstring
++
++You must also install the updated database module. This installs the new PHP 5.4
++module for MySQL/MariaDB::
++
++ yum install php54-php-mysqlnd
++
++Activate the new PHP version permanently::
++
++ source /opt/rh/php54/enable
++
++Disable loading the old PHP 5.3 Apache module::
++
++ mv /etc/httpd/conf.d/php.conf /etc/httpd/conf.d/php.conf/old
++
++You should now have a /etc/httpd/conf.d/php54-php.conf file, which loads the
++correct PHP 5.4 module for Apache.
++
++Finally, restart Apache::
++
++ service httpd restart
++
++Verify with ``phpinfo`` that your Apache server is using PHP 5.4 and loading
++the correct module.
+
+Example installation on Ubuntu 14.04 LTS Server
+-----------------------------------------------
+On a machine running a pristine Ubuntu 14.04 LTS server, install the
+required and recommended modules for a typical ownCloud installation, using
+Apache and MariaDB, by issuing the following commands in a terminal::
+
+ apt-get install apache2 mariadb-server libapache2-mod-php5
+ apt-get install php5-gd php5-json php5-mysql php5-curl
+ apt-get install php5-intl php5-mcrypt php5-imagick
+
+* This installs the packages for the ownCloud core system. If you are planning
+ on running additional apps, keep in mind that they might require additional
+ packages. See the Prerequisites section (above) for details.
+
+* At the execution of each of the above commands you might be prompted whether
+ you want to continue; press "Y" for Yes (that is if your system language is
+ English. You might have to press a different key if you have a different
+ system language).
+
+* At the installation of the MySQL server, you will be prompted to create a root
+ password. Be sure to remember the password you enter there for later use
+ as you will need it during ownCloud database setup.
+
+Now download the archive of the latest ownCloud version:
+
+* Go to the `ownCloud Installation Page <http://owncloud.org/install>`_.
+* Click the **Archive file for server owners** button.
+* Click **Download Unix**.
+* This downloads a file named owncloud-x.y.z.tar.bz2 (where
+ x.y.z is the version number of the current latest version).
+* Save this file on the machine you want to install ownCloud on.
+* Verify the MD5 or SHA256 sum::
+
+ md5sum owncloud-x.y.z.tar.bz2
+ sha256sum owncloud-x.y.z.tar.bz2
+
+* You may also verify the PGP signature::
+
+ wget https://download.owncloud.org/community/owncloud-x.y.z.tar.bz2.asc
+ wget https://www.owncloud.org/owncloud.asc
+ gpg --import owncloud.asc
+ gpg --verify owncloud-x.y.z.tar.bz2.asc owncloud-x.y.z.tar.bz2
+
+* Now you can extract the archive contents. Open a terminal, navigate to your
+ download directory, and run::
+
+ tar -xjf owncloud-x.y.z.tar.bz2
+
+* Copy the ownCloud files to their final destination in the document root of
+ your web server::
+
+ cp -r owncloud /path/to/webserver/document-root
+
+ where ``/path/to/webserver/document-root`` is replaced by the
+ document root of your Web server. On Ubuntu systems this
+ ``/var/www/owncloud``, so your copying command is::
+
+ cp -r owncloud /var/www/
+
+Installation Wizard
+-------------------
+
+Finish setting up your ownCloud server by following
+the :doc:`installation_wizard`.
+
+After running the Installation Wizard your ownCloud installation is complete.
+However, you should perform the following steps to improve your server's
+security.
+
+Setting Strong Directory Permissions
+------------------------------------
+
+We recommend setting the directory permissions in your ownCloud installation as
+strictly as possible for stronger security. Please refer to the ``Setting
+Strong Directory Permissions`` section of :doc:`installation_wizard`.
+
+SELinux
+-------
+
+See :doc:`selinux_configuration` for a suggested configuration for SELinux-enabled distributions such as Fedora and CentOS.
+
+Apache is the recommended Web server.
+
+Configuration notes to php.ini files
+------------------------------------
+
+Keep in mind that changes to php.ini may have to be done on more than one ini file. This can be the case, as example, for the ``date.timezone`` setting.
+
+**php.ini - used by the webserver:**
+::
+
+ /etc/php5/apache2/php.ini
+ or
+ /etc/php5/fpm/php.ini
+ or ...
+
+**php.ini - used by the php-cli and so by ownCloud CRON jobs:**
+::
+
+ /etc/php5/cli/php.ini
+
+
+Apache Web Server Configuration
+-------------------------------
+
+.. note:: You can use ownCloud over plain http, but we strongly encourage you to
+ use SSL/TLS to encrypt all of your server traffic, and to protect
+ user's logins and data in transit.
+
+Enabling SSL
+------------
+
+An Apache installed under Ubuntu comes already set-up with a simple
+self-signed certificate. All you have to do is to enable the ssl module and
+the according site. Open a terminal and run::
+
+ a2enmod ssl
+ a2ensite default-ssl
+ service apache2 reload
+
+If you are using a different distribution, check your documentation on how to
+enable SSL.
+
+.. note:: Self-signed certificates have their drawbacks - especially when you
+ plan to make your ownCloud server publicly accessible. You might want
+ to consider getting a certificate signed by commercial signing
+ authority. Check with your domain name registrar or hosting service,
+ if you're using one, for good deals on commercial certificates.
+
+Configuring ownCloud
+--------------------
+
+Since there was a change in the way versions 2.2 and 2.4 are configured,
+you'll have to find out which Apache version you are using.
+
+Usually you can do this by running one of the following commands::
+
+ apachectl -v
+ apache2 -v
+
+Example output::
+
+ Server version: Apache/2.4.7 (Ubuntu)
+ Server built: Jul 22 2014 14:36:38
+
+Example config for Apache 2.2:
+
+.. code-block:: xml
+
+ <Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ allow from all
+ </Directory>
+
+
+Example config for Apache 2.4:
+
+.. code-block:: xml
+
+ <Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Require all granted
+ </Directory>
+
+* This configuration entry needs to go into the configuration file of the
+ "site" you want to use.
+* On a Ubuntu system, this typically is the "default-ssl" site (to be found in
+ the :file:`/etc/apache2/sites-available/default-ssl.conf`).
+* Add the entry shown above immediately before the line containing::
+
+ </VirtualHost>
+
+ (this should be one of the last lines in the file).
+
+* A minimal site configuration file on Ubuntu 14.04 might look like this:
+
+.. code-block:: xml
+
+ <IfModule mod_ssl.c>
+ <VirtualHost _default_:443>
+ ServerName YourServerName
+ ServerAdmin webmaster at localhost
+ DocumentRoot /var/www
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /var/www/>
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ LogLevel warn
+ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+ <Directory /var/www/owncloud>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Allow from all
+ Require all granted
+ Dav Off
+ Satisfy Any
+ </Directory>
+ </VirtualHost>
+ </IfModule>
+
+* For ownCloud to work correctly, we need the module ``mod_rewrite``. Enable it
+ by running::
+
+ a2enmod rewrite
+
+* In distributions that do not come with ``a2enmod``, the module needs to be
+ enabled manually by editing the Apache config files, usually
+ :file:`/etc/httpd/httpd.conf`. Consult the Apache documentation or your Linux
+ distribution's documentation.
+
+* In order for the maximum upload size to be configurable, the
+ :file:`.htaccess` in the ownCloud folder needs to be made writable by the
+ server (this should already be done, see section ``Set the Directory
+ Permissions``).
+
+* You should make sure that any built-in WebDAV module of your web server is
+ disabled (at least for the ownCloud directory), as it will interfere with
+ ownCloud's built-in WebDAV support.
+
+ If you need the WebDAV support in the rest of your configuration, you can turn
+ it off specifically for the ownCloud entry by adding the following line in
+ the ``<Directory`` section for your ownCloud server. Add the following line
+ directly after the ``allow from all`` / ``Require all granted`` line::
+
+ Dav Off
+
+* You must disable any server-configured authentication for ownCloud, as it
+ uses Basic authentication internally for DAV services. If you have turned on
+ authentication on a parent folder (via e.g. an ``AuthType Basic``
+ directive), you can turn off the authentication specifically for the ownCloud
+ entry. Following the above example configuration file, add the following line
+ directly after the ``allow from all`` / ``Require all granted`` line in the
+ ``<Directory`` section::
+
+ Satisfy Any
+
+* When using ssl, take special note on the ServerName. You should specify one in
+ the server configuration, as well as in the CommonName field of the
+ certificate. If you want your ownCloud to be reachable via the internet, then
+ set both of these to the domain you want to reach your ownCloud server.
+
+.. note:: By default, the certificates' CommonName will be set to the host name
+ at the time the ssl-cert package was installed.
+
+* Finally, restart Apache.
+
+ * On Ubuntu systems run::
+
+ service apache2 restart
+
+ * On systemd systems (Fedora, Arch Linux, OpenSUSE), run::
+
- systemctl restart httpd.service
-
-
-
++ systemctl restart httpd.service
+
+Other Web Servers
+-----------------
+
+**Microsoft Internet Information Server (IIS)**
+
+See :doc:`windows_installation` for further instructions.
+
+**Nginx Configuration**
+
+See :doc:`nginx_configuration`
+
+**Lighttpd Configuration**
+
+See :doc:`lighttpd_configuration`
+
+**Yaws Configuration**
+
+See :doc:`yaws_configuration`
+
+**Hiawatha Configuration**
+
+See :doc:`hiawatha_configuration`
diff --cc core/doc/admin/release/_sources/issues/index.txt
index 890bf31,0000000..68f09a9
mode 100644,000000..100644
--- a/core/doc/admin/release/_sources/issues/index.txt
+++ b/core/doc/admin/release/_sources/issues/index.txt
@@@ -1,234 -1,0 +1,240 @@@
+==========================
+Issues and Troubleshooting
+==========================
+
+If you have trouble installing, configuring or maintaining ownCloud, please refer to our community support channels:
+
+* `The ownCloud Forums`_
+
+.. note:: The ownCloud forums have a `FAQ page`_ where each topic corresponds to
+ typical mistakes or frequently occurring issues
+
+* `The ownCloud User mailing list`_
+* The ownCloud IRC chat channel ``irc://#owncloud@freenode.net`` on freenode.net, also
+ accessible via `webchat`_
+
+Please understand that all these channels essentially consist of users like you helping each other out. Consider helping others out where you can, to contribute back for the help you get. This is the only way to keep a community like ownCloud healthy and sustainable!
+
+If you are using ownCloud in a business or otherwise large scale deployment, note that ownCloud Inc. offers the `Enterprise Edition`_ with commercial support options.
+
+Bugs
+----
+
+If you think you have found a bug in ownCloud, please:
+
+* Search for a solution (see the options above)
+* Double check your configuration
+
+If you can't find a solution, please use our `bugtracker`_.
+
+
+.. _the ownCloud Forums: http://forum.owncloud.org
+.. _FAQ page: https://forum.owncloud.org/viewforum.php?f=17
+.. _the ownCloud User mailing list: https://mailman.owncloud.org/mailman/listinfo/user
+.. _webchat: http://webchat.freenode.net/?channels=owncloud
+.. _Enterprise Edition: https://owncloud.com/lp/community-or-enterprise/
+.. _bugtracker: http://doc.owncloud.org/server/7.0/developer_manual/bugtracker/index.html
+
+General Troubleshooting
+-----------------------
+
+Debugging the issue
+~~~~~~~~~~~~~~~~~~~
+
+In a standard ownCloud installation the log level is set to ``Normal``. To find any issues
+you need to raise the log level to ``All`` from the Admin page. Please see :doc:`../configuration/logging_configuration`
+for more informations on this log levels.
+
+Some logging - for example JavaScript console logging - needs manually editing the
+configuration file.
+Edit :file:`config/config.php` and add ``define('DEBUG', true);``::
+
+ <?php
+ define('DEBUG',true);
+ $CONFIG = array (
+ ... configuration goes here ...
+ );
+
+For JavaScript issues you will also need to view the javascript console. All major browsers
+have decent developer tools for viewing the console, and you usually access them by
+pressing F-12. For Firefox it is recommended to install the `Firebug extension <https://getfirebug.com/>`_.
+
+.. note:: The logfile of ownCloud is located in the datadirectory ``/var/www/owncloud/data/owncloud.log``.
+
+Debugging Sync-Issues
+~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: The data directory on the server is exclusive to ownCloud and must not be modified manually.
+
+Disregarding this can lead to unwanted behaviours like:
+
+* Problems with sync clients
+* Undetected changes due to caching in the database
+
+If you need to directly upload files from the same server please use a WebDAV command
+line client like ``cadaver`` to upload files to the WebDAV interface at:
+
+ https://example.org/owncloud/remote.php/webdav
+
+Common problems / error messages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Some common problems / error messages found in your logfiles as described above:
+
+* ``SQLSTATE[HY000] [1040] Too many connections`` -> You need to increase the
+ connection limit of your database, please refer to the manual of your database
+ for more informations.
+* ``SQLSTATE[HY000]: General error: 5 database is locked`` -> You're using ``SQLite``
+ which can't handle a lot of parallel requests. Please consider converting to
+ another database like described in :doc:`../maintenance/convert_db`.
+* ``SQLSTATE[HY000]: General error: 2006 MySQL server has gone away`` -> The database
+ request takes too long and therefore the MySQL server times out. Its also possible
+ that the server is dropping a too large packet. Please refer to the manual of your
+ database how to raise the config options ``wait_timeout`` and/or ``max_allowed_packet``.
+* ``SQLSTATE[HY000] [2002] No such file or directory`` -> There is a problem
+ accessing your SQLite database file in your datadirectory (``data/owncloud.db``).
+ Please check the permissions of this folder/file or if it exists at all. If you're
+ using MySQL please start your database.
+* ``Connection closed / Operation cancelled`` -> This could be caused by wrong ``KeepAlive``
+ settings within your Apache config. Make sure that ``KeepAlive`` is set to ``On`` and
+ also try to raise the limits of ``KeepAliveTimeout`` and ``MaxKeepAliveRequests``.
++* ``No basic authentication headers were found`` -> This error is shown in your
++ ``data/owncloud.log`` file. Some Apache modules like ``mod_fastcgi``, ``mod_fcgid``
++ or ``mod_proxy_fcgi`` are not passing the needed authentication headers to
++ PHP and so the login to ownCloud via WebDAV, CalDAV and CardDAV clients is
++ failing. Information on how to correctly configure your environment can be
++ found at the `forums <https://forum.owncloud.org/viewtopic.php?f=17&t=30646>`_.
+
+Troubleshooting Webserver and PHP problems
+------------------------------------------
+
+Logfiles
+~~~~~~~~
+
+When having issues the first step is to check the logfiles provided by PHP, the Webserver
+and ownCloud itself.
+
+.. note:: In the following the paths to the logfiles of a default Debian installation
+ running Apache2 with mod_php is assumed. On other webservers, linux distros or
+ operating systems they can differ.
+
+* The logfile of Apache2 is located in ``/var/log/apache2/error.log``.
+* The logfile of PHP can be configured in your ``/etc/php5/apache2/php.ini``.
+ You need to set the directive ``log_errors`` to ``On`` and choose the path
+ to store the logfile in the ``error_log`` directive. After those changes you
+ need to restart your Webserver.
+* The logfile of ownCloud is located in the datadirectory ``/var/www/owncloud/data/owncloud.log``.
+
+Webserver and PHP modules
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are some Webserver or PHP modules which are known to cause various problems
+like broken up-/downloads. The following shows a draft overview over this modules:
+
+1. Apache
+
+* mod_pagespeed
+* mod_evasive
+* mod_security
+* mod_reqtimeout
+* mod_deflate
+* libapache2-mod-php5filter (use libapache2-mod-php5 instead)
+* mod_spdy together with libapache2-mod-php5 / mod_php (use fcgi or php-fpm instead)
+* mod_dav
+* mod_xsendfile / X-Sendfile (causing broken downloads if not configured correctly)
+
+2. NginX
+
+* ngx_pagespeed
+* HttpDavModule
+* X-Sendfile (causing broken downloads if not configured correctly)
+
+3. Mac OS X server
+
+* mod_auth_apple
+* com.apple.webapp.webdavsharing
+
+4. LigHTTPd
+
+* ModWebDAV
+* X-Sendfile2 (causing broken downloads if not configured correctly)
+
+5. PHP
+
+* eAccelerator
+
+Troubleshooting WebDAV
+----------------------
+
+ownCloud uses SabreDAV, and the SabreDAV documentation is comprehensive and
+helpful. See:
+
+* `SabreDAV FAQ <http://sabre.io/dav/faq/>`_
+* `Webservers <http://sabre.io/dav/webservers>`_ (Lists lighttpd as not
+ recommended)
+* `Working with large files <http://sabre.io/dav/large-files/>`_ (Shows a PHP
+ bug in older SabreDAV versions and information for mod_security problems)
+* `0 byte files <http://sabre.io/dav/0bytes>`_ (Reasons for empty files on the
+ server)
+* `Clients <http://sabre.io/dav/clients/>`_ (A comprehensive list of WebDAV
+ clients, and possible problems with each one)
+* `Finder, OS X's built-in WebDAV client
+ <http://sabre.io/dav/clients/finder/>`_
+ (Describes problems with Finder on various webservers)
+
+There is also a well maintained FAQ thread available at the `ownCloud Forums <https://forum.owncloud.org/viewtopic.php?f=17&t=7536>`_
+which contains various additional informations about WebDAV problems.
+
+Troubleshooting Contacts & Calendar
+-----------------------------------
+
+Service discovery
+~~~~~~~~~~~~~~~~~
+
+Some clients - especially iOS - have problems finding the proper sync URL, even when explicitly
+configured to use it.
+
+There are several techniques to remedy this, which are described extensively at the
+`Sabre DAV website <http://sabre.io/dav/service-discovery/>`_.
+
+Apple iOS
+~~~~~~~~~
+
+Below is what have proven to work with iOS including iOS 7.
+
+If your ownCloud instance is installed in a subfolder under the web server's document root and
+the client has difficulties finding the Cal- or CardDAV end-points, configure your web server to
+redirect from a "well-know" URL to the one used by ownCloud.
+When using the Apache web server this is easily achieved using a :file:`.htaccess` file in the document
+root of your site.
+
+Say your instance is located in the ``owncloud`` folder, so the URL to it is ``ADDRESS/owncloud``,
+create or edit the :file:`.htaccess` file and add the following lines::
+
+ Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+ Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
+
+If you use lighttpd as web server, the setting looks something like::
+
+ url.redirect = (
+ "^/.well-known/carddav" => "/owncloud/remote.php/carddav",
+ "^/.well-known/caldav" => "/owncloud/remote.php/caldav",
+ )
+
+Now change the URL in the client settings to just use ``ADDRESS`` instead of e.g. ``ADDRESS/remote.php/carddav/principals/username``.
+
+This problem is being discussed in the `forum <http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197>`_.
+
+Unable to update Contacts or Events
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you get an error like ``PATCH https://ADDRESS/some_url HTTP/1.0 501 Not Implemented`` it is
+likely caused by one of the following reasons:
+
+Outdated lighttpd web server
+ lighttpd in debian wheezy (1.4.31) doesn't support the PATCH HTTP verb.
+ Upgrade to lighttpd >= 1.4.33.
+
+Using Pound reverse-proxy/load balancer
+ As of writing this Pound doesn't support the HTTP/1.1 verb.
+ Pound is easily `patched <http://www.apsis.ch/pound/pound_list/archive/2013/2013-08/1377264673000>`_ to support HTTP/1.1.
diff --cc core/doc/admin/release/configuration/big_file_upload_configuration.html
index 0f32843,0000000..936b9e2
mode 100644,000000..100644
--- a/core/doc/admin/release/configuration/big_file_upload_configuration.html
+++ b/core/doc/admin/release/configuration/big_file_upload_configuration.html
@@@ -1,293 -1,0 +1,293 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Uploading big files > 512MB (as set by default) — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Configuring the Collaborative Documents App" href="collaborative_documents_configuration.html" />
+ <link rel="prev" title="Defining Background Jobs" href="background_jobs_configuration.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html">Configuring the Activity App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a></li>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html">Automatic Configuration Setup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html">Defining Background Jobs</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Uploading big files > 512MB (as set by default)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#system-configuration">System Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#configuring-your-webserver">Configuring Your Webserver</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#configuring-php">Configuring PHP</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="collaborative_documents_configuration.html">Configuring the Collaborative Documents App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html">Config.php Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_client_configuration.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="database_configuration.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html">Email Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption_configuration.html">Encryption Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_storage_configuration_gui.html">Configuring External Storage (GUI)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_storage_configuration.html">Configuring External Storage (Configuration File)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="file_sharing_configuration.html">File Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files_locking_enabling.html">Files Locking App Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html">Hardening and Security Guidance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="knowledgebase_configuration.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="language_configuration.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="logging_configuration.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html">Using the occ Command</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tips.html">Performance Tips</a></li>
+<li class="toctree-l2"><a class="reference internal" href="previews_configuration.html">Previews Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_configuration.html">Configuring Server-to-Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="serving_static_files_configuration.html">Serving Static Files for Better Performance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="thirdparty_php_configuration.html">Using Third Party PHP Components</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ftp_smb_imap.html">User Authentication with IMAP, SMB, and FTP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ldap_cleanup.html">LDAP User Cleanup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_configuration.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reset_admin_password.html">Resetting a Lost Admin Password</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="uploading-big-files-512mb-as-set-by-default">
+<h1>Uploading big files > 512MB (as set by default)<a class="headerlink" href="#uploading-big-files-512mb-as-set-by-default" title="Permalink to this headline">¶</a></h1>
+<p>The default maximum file size for uploads is 512MB. You can increase this
+limit up to what your filesystem and operating system allows. There are certain
+hard limits that cannot be exceeded:</p>
+<ul class="simple">
+<li>< 2GB on 32Bit OS-architecture</li>
+<li>< 2GB with Server Version 4.5 or older</li>
+<li>< 2GB on Windows (32Bit and 64Bit)</li>
+<li>< 2GB with IE6 - IE8</li>
- <li>< 4GB with IE9 - IE10</li>
++<li>< 4GB with IE9 - IE11</li>
+</ul>
+<p>64-bit filesystems have much higher limits; consult the documentation for your
+filesystem.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The ownCloud sync client is not affected by this described upload limits
+as it is uploading files in smaller chunks.</p>
+</div>
+<div class="section" id="system-configuration">
+<h2>System Configuration<a class="headerlink" href="#system-configuration" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Make sure that the latest version of PHP (at least 5.4.9) is installed</li>
+<li>Disable user quotas, which makes them unlimited</li>
+<li>Your temp file or partition has to be big enough to hold multiple
+parallel uploads from multiple users; e.g. if the max upload size is 10GB and
+the average users uploading the same time is 100: temp space has to hold at
+least 10x100 GB</li>
+</ul>
+</div>
+<div class="section" id="configuring-your-webserver">
+<h2>Configuring Your Webserver<a class="headerlink" href="#configuring-your-webserver" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud comes with its own <tt class="docutils literal"><span class="pre">owncloud/.htaccess</span></tt> file. Set the following
+two parameters inside this <tt class="docutils literal"><span class="pre">.htaccess</span></tt> file:</p>
+<div class="highlight-python"><pre>php_value upload_max_filesize = 16G
+php_value post_max_size = 16G</pre>
+</div>
+<p>Adjust these values for your needs. If you see PHP timeouts in your logfiles,
+increase the timeout values, which are in seconds:</p>
+<div class="highlight-python"><pre>php_value max_input_time 3600
+php_value max_execution_time 3600</pre>
+</div>
+<p>The <a class="reference external" href="https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html">mod_reqtimeout</a>
+Apache module could also stop large uploads from completing. If you’re using this
+module and getting failed uploads of large files either disable it in your Apache
+config or raise the configured <tt class="docutils literal"><span class="pre">RequestReadTimeout</span></tt> timeouts.</p>
+<p>There are also several other configuration option in your webserver config which
+could prevent the upload of larger files. Please see the manual of your webserver
+how to configure those values correctly:</p>
+<div class="section" id="apache">
+<h3>Apache<a class="headerlink" href="#apache" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li><a class="reference external" href="https://httpd.apache.org/docs/current/en/mod/core.html#limitrequestbody">LimitRequestBody</a></li>
+<li><a class="reference external" href="https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslrenegbuffersize">SSLRenegBufferSize</a></li>
+</ul>
+</div>
+<div class="section" id="apache-with-mod-fcgid">
+<h3>Apache with mod_fcgid<a class="headerlink" href="#apache-with-mod-fcgid" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li><a class="reference external" href="https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#fcgidmaxrequestlen">FcgidMaxRequestLen</a></li>
+</ul>
+</div>
+<div class="section" id="nginx">
+<h3>NginX<a class="headerlink" href="#nginx" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li><a class="reference external" href="http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size">client_max_body_size</a></li>
+</ul>
+</div>
+<div class="section" id="iis">
+<h3>IIS<a class="headerlink" href="#iis" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li><a class="reference external" href="http://www.iis.net/configreference/system.webserver/security/requestfiltering/requestlimits#005">maxAllowedContentLength</a></li>
+</ul>
+</div>
+</div>
+<div class="section" id="configuring-php">
+<h2>Configuring PHP<a class="headerlink" href="#configuring-php" title="Permalink to this headline">¶</a></h2>
+<p>If you don’t want to use the ownCloud <tt class="docutils literal"><span class="pre">.htaccess</span></tt> file, you may
+configure PHP instead. Make sure to comment out any lines <tt class="docutils literal"><span class="pre">.htaccess</span></tt>
+pertaining to upload size, if you entered any.</p>
+<p>To view your current PHP configuration and to see the location of your
+<tt class="docutils literal"><span class="pre">php.ini</span></tt> file, create a plain text file named <tt class="docutils literal"><span class="pre">phpinfo.php</span></tt> with just this
+single line of code in it: <tt class="docutils literal"><span class="pre"><?php</span> <span class="pre">phpinfo();</span> <span class="pre">?></span></tt>. Place this file in your Web
+root, for example <tt class="docutils literal"><span class="pre">/var/www/html</span></tt>, and open it in your Web browser, for
+example <tt class="docutils literal"><span class="pre">http://localhost/phpinfo.php</span></tt>. This will display your complete
+current PHP configuration. Look for the <strong>Loaded Configuration File</strong> section
+to see which <tt class="docutils literal"><span class="pre">php.ini</span></tt> file your server is using. This is the one you want to
+edit.</p>
+<p>If you are running ownCloud on a 32-bit system, any <tt class="docutils literal"><span class="pre">open_basedir</span></tt> directive
+in your <tt class="docutils literal"><span class="pre">php.ini</span></tt> file needs to be commented out</p>
+<p>Set the following two parameters inside <tt class="docutils literal"><span class="pre">php.ini</span></tt>, using your own desired
+file size values:</p>
+<div class="highlight-python"><pre>upload_max_filesize = 16G
+post_max_size = 16G</pre>
+</div>
+<p>Tell PHP which temp file you want it to use:</p>
+<div class="highlight-python"><pre>upload_tmp_dir = /var/big_temp_file/</pre>
+</div>
+<p><strong>Output Buffering</strong> must be turned off in <tt class="docutils literal"><span class="pre">.htaccess</span></tt> or <tt class="docutils literal"><span class="pre">php.ini</span></tt>, or PHP
+will return memory-related errors:</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">output_buffering</span> <span class="pre">=</span> <span class="pre">0</span></tt></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/configuration/config_sample_php_parameters.html
index 9f2839d,0000000..e308714
mode 100644,000000..100644
--- a/core/doc/admin/release/configuration/config_sample_php_parameters.html
+++ b/core/doc/admin/release/configuration/config_sample_php_parameters.html
@@@ -1,918 -1,0 +1,923 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Config.php Parameters — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Custom Client Configuration" href="custom_client_configuration.html" />
+ <link rel="prev" title="Configuring the Collaborative Documents App" href="collaborative_documents_configuration.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html">Configuring the Activity App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a></li>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html">Automatic Configuration Setup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html">Defining Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="big_file_upload_configuration.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="collaborative_documents_configuration.html">Configuring the Collaborative Documents App</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Config.php Parameters</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#default-parameters">Default Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#default-config-php-examples">Default config.php Examples</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#user-experience">User Experience</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#mail-parameters">Mail Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#proxy-configurations">Proxy Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#deleted-items-trash-bin">Deleted Items (trash bin)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#owncloud-verifications">ownCloud Verifications</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#logging">Logging</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#alternate-code-locations">Alternate Code Locations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#apps">Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#previews">Previews</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#ldap">LDAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#maintenance">Maintenance</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#ssl">SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#miscellaneous">Miscellaneous</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#app-config-options">App config options</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="custom_client_configuration.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="database_configuration.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html">Email Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption_configuration.html">Encryption Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_storage_configuration_gui.html">Configuring External Storage (GUI)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_storage_configuration.html">Configuring External Storage (Configuration File)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="file_sharing_configuration.html">File Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files_locking_enabling.html">Files Locking App Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html">Hardening and Security Guidance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="knowledgebase_configuration.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="language_configuration.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="logging_configuration.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html">Using the occ Command</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tips.html">Performance Tips</a></li>
+<li class="toctree-l2"><a class="reference internal" href="previews_configuration.html">Previews Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_configuration.html">Configuring Server-to-Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="serving_static_files_configuration.html">Serving Static Files for Better Performance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="thirdparty_php_configuration.html">Using Third Party PHP Components</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ftp_smb_imap.html">User Authentication with IMAP, SMB, and FTP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ldap_cleanup.html">LDAP User Cleanup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_configuration.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reset_admin_password.html">Resetting a Lost Admin Password</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="config-php-parameters">
+<h1>Config.php Parameters<a class="headerlink" href="#config-php-parameters" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud uses the <tt class="docutils literal"><span class="pre">config/config.php</span></tt> file to control server operations.
+<tt class="docutils literal"><span class="pre">config/config.sample.php</span></tt> lists all the configurable parameters within
- ownCloud. This document provides a more detailed reference. Many options are
- configurable on your Admin page, so it is usually not necessary to edit
- <tt class="docutils literal"><span class="pre">config/config.php</span></tt>.</p>
++ownCloud, along with example or default values. This document provides a more
++detailed reference. Most options are configurable on your Admin page, so it
++is usually not necessary to edit <tt class="docutils literal"><span class="pre">config/config.php</span></tt>.</p>
++<div class="admonition note">
++<p class="first admonition-title">Note</p>
++<p class="last">The installer creates a configuration containing the essential parameters.
++Only manually add configuration parameters to <tt class="docutils literal"><span class="pre">config/config.php</span></tt> if you need to
++use a special value for a parameter. <strong>Do not copy everything from
++``config/config.sample.php``. Only enter the parameters you wish to modify!</strong></p>
++</div>
+<div class="section" id="default-parameters">
+<h2>Default Parameters<a class="headerlink" href="#default-parameters" title="Permalink to this headline">¶</a></h2>
+<p>These parameters are configured by the ownCloud installer, and are required
+for your ownCloud server to operate.</p>
+<div class="highlight-python"><pre>'instanceid' => '',</pre>
+</div>
+<p>This is a unique identifier for your ownCloud installation, created
+automatically by the installer. This example is for documentation only,
+and you should never use it because it will not work. A valid <tt class="docutils literal"><span class="pre">instanceid</span></tt>
+is created when you install ownCloud.</p>
+<p>‘instanceid’ => ‘d3c944a9a’,</p>
+<div class="highlight-python"><pre>'passwordsalt' => '',</pre>
+</div>
+<p>The salt used to hash all passwords, auto-generated by the ownCloud
+installer. (There are also per-user salts.) If you lose this salt you lose
+all your passwords. This example is for documentation only,
+and you should never use it.</p>
+<p>‘passwordsalt’ => ‘d3c944a9af095aa08f’,</p>
+<div class="highlight-python"><pre>'trusted_domains' =>
+ array (
+ 'demo.example.org',
+ 'otherdomain.example.org',
+ ),</pre>
+</div>
+<p>Your list of trusted domains that users can log into. Specifying trusted
+domains prevents host header poisoning. Do not remove this, as it performs
+necessary security checks.</p>
+<div class="highlight-python"><pre>'datadirectory' => '/var/www/owncloud/data',</pre>
+</div>
+<p>Where user files are stored; this defaults to <tt class="docutils literal"><span class="pre">data/</span></tt> in the ownCloud
+directory. The SQLite database is also stored here, when you use SQLite. (SQLite is
+available only in ownCloud Community Edition)</p>
+<div class="highlight-python"><pre>'version' => '',</pre>
+</div>
+<p>The current version number of your ownCloud installation. This is set up
+during installation and update, so you shouldn’t need to change it.</p>
+<div class="highlight-python"><pre>'dbtype' => 'sqlite',</pre>
+</div>
+<p>Identifies the database used with this installation. See also config option
+<tt class="docutils literal"><span class="pre">supportedDatabases</span></tt></p>
+<dl class="docutils">
+<dt>Available:</dt>
+<dd><ul class="first last simple">
+<li>sqlite (SQLite3 - Community Edition Only)</li>
+<li>mysql (MySQL/MariaDB)</li>
+<li>pgsql (PostgreSQL)</li>
+<li>oci (Oracle - Enterprise Edition Only)</li>
+<li>mssql (Microsoft SQL Server - Enterprise Edition Only)</li>
+</ul>
+</dd>
+</dl>
+<div class="highlight-python"><pre>'dbhost' => '',</pre>
+</div>
+<p>Your host server name, for example <tt class="docutils literal"><span class="pre">localhost</span></tt>, <tt class="docutils literal"><span class="pre">hostname</span></tt>,
+<tt class="docutils literal"><span class="pre">hostname.example.com</span></tt>, or the IP address. To specify a port use
+<tt class="docutils literal"><span class="pre">hostname:####</span></tt>; to specify a Unix socket use
+<tt class="docutils literal"><span class="pre">localhost:/path/to/socket</span></tt>.</p>
+<div class="highlight-python"><pre>'dbname' => 'owncloud',</pre>
+</div>
+<p>The name of the ownCloud database, which is set during installation. You
+should not need to change this.</p>
+<div class="highlight-python"><pre>'dbuser' => '',</pre>
+</div>
+<p>The user that ownCloud uses to write to the database. This must be unique
+across ownCloud instances using the same SQL database. This is set up during
+installation, so you shouldn’t need to change it.</p>
+<div class="highlight-python"><pre>'dbpassword' => '',</pre>
+</div>
+<p>The password for the database user. This is set up during installation, so
+you shouldn’t need to change it.</p>
+<div class="highlight-python"><pre>'dbtableprefix' => '',</pre>
+</div>
+<p>Prefix for the ownCloud tables in the database.</p>
+<div class="highlight-python"><pre>'dbdriveroptions' => array(
+ PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+),</pre>
+</div>
+<p>Additional driver options for the database connection, eg. to enable SSL
+encryption in MySQL.</p>
+<div class="highlight-python"><pre>'installed' => false,</pre>
+</div>
+<p>Indicates whether the ownCloud instance was installed successfully; <tt class="docutils literal"><span class="pre">true</span></tt>
+indicates a successful installation, and <tt class="docutils literal"><span class="pre">false</span></tt> indicates an unsuccessful
- installation.
- .. DEFAULT_SECTION_END
- .. Generated content above. Don’t change this.</p>
++installation.</p>
+</div>
+<div class="section" id="default-config-php-examples">
+<h2>Default config.php Examples<a class="headerlink" href="#default-config-php-examples" title="Permalink to this headline">¶</a></h2>
+<p>When you use SQLite as your ownCloud database, your <tt class="docutils literal"><span class="pre">config.php</span></tt> looks like
+this after installation. The SQLite database is stored in your ownCloud
+<tt class="docutils literal"><span class="pre">data/</span></tt> directory. SQLite is a simple, lightweight embedded database that
+is good for testing and for simple installations, but for production ownCloud
+systems you should use MySQL, MariaDB, or PosgreSQL.</p>
+<div class="highlight-python"><pre><?php
+$CONFIG = array (
+ 'instanceid' => 'occ6f7365735',
+ 'passwordsalt' => '2c5778476346786306303',
+ 'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'studio',
+ ),
+ 'datadirectory' => '/var/www/owncloud/data',
+ 'dbtype' => 'sqlite3',
+ 'version' => '7.0.2.1',
+ 'installed' => true,
+);</pre>
+</div>
+<p>This example is from a new ownCloud installation using MariaDB:</p>
+<div class="highlight-python"><pre><?php
+$CONFIG = array (
+ 'instanceid' => 'oc8c0fd71e03',
+ 'passwordsalt' => '515a13302a6b3950a9d0fdb970191a',
+ 'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'studio',
+ 2 => '192.168.10.155'
+ ),
+ 'datadirectory' => '/var/www/owncloud/data',
+ 'dbtype' => 'mysql',
+ 'version' => '7.0.2.1',
+ 'dbname' => 'owncloud',
+ 'dbhost' => 'localhost',
+ 'dbtableprefix' => 'oc_',
+ 'dbuser' => 'oc_carla',
+ 'dbpassword' => '67336bcdf7630dd80b2b81a413d07',
+ 'installed' => true,
+);</pre>
+</div>
+</div>
+<div class="section" id="user-experience">
+<h2>User Experience<a class="headerlink" href="#user-experience" title="Permalink to this headline">¶</a></h2>
+<p>These optional parameters control some aspects of the user interface. Default
+values, where present, are shown.</p>
+<div class="highlight-python"><pre>'default_language' => 'en',</pre>
+</div>
+<p>This sets the default language on your ownCloud server, using ISO_639-1
+language codes such as <tt class="docutils literal"><span class="pre">en</span></tt> for English, <tt class="docutils literal"><span class="pre">de</span></tt> for German, and <tt class="docutils literal"><span class="pre">fr</span></tt> for
+French. It overrides automatic language detection on public pages like login
+or shared items. User’s language preferences configured under “personal ->
+language” override this setting after they have logged in.</p>
+<div class="highlight-python"><pre>'defaultapp' => 'files',</pre>
+</div>
+<p>Set the default app to open on login. Use the app names as they appear in the
+URL after clicking them in the Apps menu, such as documents, calendar, and
+gallery. You can use a comma-separated list of app names, so if the first
+app is not enabled for a user then ownCloud will try the second one, and so
+on. If no enabled apps are found it defaults to the Files app.</p>
+<div class="highlight-python"><pre>'knowledgebaseenabled' => true,</pre>
+</div>
+<p><tt class="docutils literal"><span class="pre">true</span></tt> enables the Help menu item in the user menu (top right of the
+ownCloud Web interface). <tt class="docutils literal"><span class="pre">false</span></tt> removes the Help item.</p>
+<div class="highlight-python"><pre>'enable_avatars' => true,</pre>
+</div>
+<p><tt class="docutils literal"><span class="pre">true</span></tt> enables avatars, or user profile photos. These appear on the User
+page, on user’s Personal pages and are used by some apps (contacts, mail,
+etc). <tt class="docutils literal"><span class="pre">false</span></tt> disables them.</p>
+<div class="highlight-python"><pre>'allow_user_to_change_display_name' => true,</pre>
+</div>
+<p><tt class="docutils literal"><span class="pre">true</span></tt> allows users to change their display names (on their Personal
+pages), and <tt class="docutils literal"><span class="pre">false</span></tt> prevents them from changing their display names.</p>
+<div class="highlight-python"><pre>'remember_login_cookie_lifetime' => 60*60*24*15,</pre>
+</div>
+<p>Lifetime of the remember login cookie, which is set when the user clicks the
+<tt class="docutils literal"><span class="pre">remember</span></tt> checkbox on the login screen. The default is 15 days, expressed
+in seconds.</p>
+<div class="highlight-python"><pre>'session_lifetime' => 60 * 60 * 24,</pre>
+</div>
+<p>The lifetime of a session after inactivity; the default is 24 hours,
+expressed in seconds.</p>
+<div class="highlight-python"><pre>'session_keepalive' => true,</pre>
+</div>
+<p>Enable or disable session keep-alive when a user is logged in to the Web UI.</p>
+<p>Enabling this sends a “heartbeat” to the server to keep it from timing out.</p>
+<div class="highlight-python"><pre>'skeletondirectory' => '/path/to/owncloud/core/skeleton',</pre>
+</div>
+<p>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
+skeleton files.</p>
+<div class="highlight-python"><pre>'user_backends' => array(
+ array(
+ 'class' => 'OC_User_IMAP',
+ 'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
+ )
+),</pre>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">user_backends</span></tt> app (which needs to be enabled first) allows you to
+configure alternate authentication backends. Supported backends are:
+IMAP (OC_User_IMAP), SMB (OC_User_SMB), and FTP (OC_User_FTP).</p>
+</div>
+<div class="section" id="mail-parameters">
+<h2>Mail Parameters<a class="headerlink" href="#mail-parameters" title="Permalink to this headline">¶</a></h2>
+<p>These configure the email settings for ownCloud notifications and password
+resets.</p>
+<div class="highlight-python"><pre>'mail_domain' => 'example.com',</pre>
+</div>
+<p>The return address that you want to appear on emails sent by the ownCloud
+server, for example <tt class="docutils literal"><span class="pre">oc-admin@example.com</span></tt>, substituting your own domain,
+of course.</p>
+<div class="highlight-python"><pre>'mail_from_address' => 'owncloud',</pre>
+</div>
+<p>FROM address that overrides the built-in <tt class="docutils literal"><span class="pre">sharing-noreply</span></tt> and
+<tt class="docutils literal"><span class="pre">lostpassword-noreply</span></tt> FROM addresses.</p>
+<div class="highlight-python"><pre>'mail_smtpdebug' => false,</pre>
+</div>
+<p>Enable SMTP class debugging.</p>
+<div class="highlight-python"><pre>'mail_smtpmode' => 'sendmail',</pre>
+</div>
+<p>Which mode to use for sending mail: <tt class="docutils literal"><span class="pre">sendmail</span></tt>, <tt class="docutils literal"><span class="pre">smtp</span></tt>, <tt class="docutils literal"><span class="pre">qmail</span></tt> or
+<tt class="docutils literal"><span class="pre">php</span></tt>.</p>
+<p>If you are using local or remote SMTP, set this to <tt class="docutils literal"><span class="pre">smtp</span></tt>.</p>
+<p>If you are using PHP mail you must have an installed and working email system
+on the server. The program used to send email is defined in the <tt class="docutils literal"><span class="pre">php.ini</span></tt>
+file.</p>
+<p>For the <tt class="docutils literal"><span class="pre">sendmail</span></tt> option you need an installed and working email system on
+the server, with <tt class="docutils literal"><span class="pre">/usr/sbin/sendmail</span></tt> installed on your Unix system.</p>
+<p>For <tt class="docutils literal"><span class="pre">qmail</span></tt> the binary is /var/qmail/bin/sendmail, and it must be installed
+on your Unix system.</p>
+<div class="highlight-python"><pre>'mail_smtphost' => '127.0.0.1',</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpmode</span></tt>. Specified the IP address of your mail
+server host. This may contain multiple hosts separated by a semi-colon. If
+you need to specify the port number append it to the IP address separated by
+a colon, like this: <tt class="docutils literal"><span class="pre">127.0.0.1:24</span></tt>.</p>
+<div class="highlight-python"><pre>'mail_smtpport' => 25,</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpmode</span></tt>. Specify the port for sending mail.</p>
+<div class="highlight-python"><pre>'mail_smtptimeout' => 10,</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpmode</span></tt>. This set an SMTP server timeout, in
+seconds. You may need to increase this if you are running an anti-malware or
+spam scanner.</p>
+<div class="highlight-python"><pre>'mail_smtpsecure' => '',</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpmode</span></tt>. Specify when you are using <tt class="docutils literal"><span class="pre">ssl</span></tt> or
+<tt class="docutils literal"><span class="pre">tls</span></tt>, or leave empty for no encryption.</p>
+<div class="highlight-python"><pre>'mail_smtpauth' => false,</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpmode</span></tt>. Change this to <tt class="docutils literal"><span class="pre">true</span></tt> if your mail
+server requires authentication.</p>
+<div class="highlight-python"><pre>'mail_smtpauthtype' => 'LOGIN',</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpmode</span></tt>. If SMTP authentication is required, choose
+the authentication type as <tt class="docutils literal"><span class="pre">LOGIN</span></tt> (default) or <tt class="docutils literal"><span class="pre">PLAIN</span></tt>.</p>
+<div class="highlight-python"><pre>'mail_smtpname' => '',</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpauth</span></tt>. Specify the username for authenticating to
+the SMTP server.</p>
+<div class="highlight-python"><pre>'mail_smtppassword' => '',</pre>
+</div>
+<p>This depends on <tt class="docutils literal"><span class="pre">mail_smtpauth</span></tt>. Specify the password for authenticating to
+the SMTP server.</p>
+</div>
+<div class="section" id="proxy-configurations">
+<h2>Proxy Configurations<a class="headerlink" href="#proxy-configurations" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><pre>'overwritehost' => '',</pre>
+</div>
+<p>The automatic hostname detection of ownCloud can fail in certain reverse
+proxy and CLI/cron situations. This option allows you to manually override
+the automatic detection; for example <tt class="docutils literal"><span class="pre">www.example.com</span></tt>, or specify the port
+<tt class="docutils literal"><span class="pre">www.example.com:8080</span></tt>.</p>
+<div class="highlight-python"><pre>'overwriteprotocol' => '',</pre>
+</div>
+<p>When generating URLs, ownCloud attempts to detect whether the server is
+accessed via <tt class="docutils literal"><span class="pre">https</span></tt> or <tt class="docutils literal"><span class="pre">http</span></tt>. However, if ownCloud is behind a proxy
+and the proxy handles the <tt class="docutils literal"><span class="pre">https</span></tt> calls, ownCloud would not know that
+<tt class="docutils literal"><span class="pre">ssl</span></tt> is in use, which would result in incorrect URLs being generated.</p>
+<p>Valid values are <tt class="docutils literal"><span class="pre">http</span></tt> and <tt class="docutils literal"><span class="pre">https</span></tt>.</p>
+<div class="highlight-python"><pre>'overwritewebroot' => '',</pre>
+</div>
+<p>ownCloud attempts to detect the webroot for generating URLs automatically.</p>
+<p>For example, if <tt class="docutils literal"><span class="pre">www.example.com/owncloud</span></tt> is the URL pointing to the
+ownCloud instance, the webroot is <tt class="docutils literal"><span class="pre">/owncloud</span></tt>. When proxies are in use, it
+may be difficult for ownCloud to detect this parameter, resulting in invalid
+URLs.</p>
+<div class="highlight-python"><pre>'overwritecondaddr' => '',</pre>
+</div>
+<p>This option allows you to define a manual override condition as a regular
+expression for the remote IP address. For example, defining a range of IP
+addresses starting with <tt class="docutils literal"><span class="pre">10.0.0.</span></tt> and ending with 1 to 3:
+<tt class="docutils literal"><span class="pre">^10\.0\.0\.[1-3]$</span></tt></p>
+<div class="highlight-python"><pre>'overwrite.cli.url' => '',</pre>
+</div>
+<p>Use this configuration parameter to specify the base url for any urls which
+are generated within ownCloud using any kind of command line tools (cron or
+occ). The value should contain the full base URL:
+<tt class="docutils literal"><span class="pre">https://www.example.com/owncloud</span></tt></p>
+<div class="highlight-python"><pre>'proxy' => '',</pre>
+</div>
+<p>The URL of your proxy server, for example <tt class="docutils literal"><span class="pre">proxy.example.com:8081</span></tt>.</p>
+<div class="highlight-python"><pre>'proxyuserpwd' => '',</pre>
+</div>
+<p>The optional authentication for the proxy to use to connect to the internet.</p>
+<p>The format is: <tt class="docutils literal"><span class="pre">username:password</span></tt>.</p>
+</div>
+<div class="section" id="deleted-items-trash-bin">
+<h2>Deleted Items (trash bin)<a class="headerlink" href="#deleted-items-trash-bin" title="Permalink to this headline">¶</a></h2>
+<p>These parameters control the Deleted files app.</p>
+<div class="highlight-python"><pre>'trashbin_retention_obligation' => 30,</pre>
+</div>
+<p>When the trash bin app is enabled (default), this is the number of days a
+file will be kept in the trash bin. Default is 30 days.</p>
+<div class="highlight-python"><pre>'trashbin_auto_expire' => true,</pre>
+</div>
+<p>Disable or enable auto-expiration for the trash bin. By default
+auto-expiration is enabled.</p>
+</div>
+<div class="section" id="owncloud-verifications">
+<h2>ownCloud Verifications<a class="headerlink" href="#owncloud-verifications" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud performs several verification checks. There are two options,
+<tt class="docutils literal"><span class="pre">true</span></tt> and <tt class="docutils literal"><span class="pre">false</span></tt>.</p>
+<div class="highlight-python"><pre>'appcodechecker' => true,</pre>
+</div>
+<p>Check 3rd party apps to make sure they are using the private API and not the
+public API. If the app uses the private API it cannot be installed.</p>
+<div class="highlight-python"><pre>'updatechecker' => true,</pre>
+</div>
+<p>Check if ownCloud is up-to-date and shows a notification if a new version is
+available.</p>
+<div class="highlight-python"><pre>'has_internet_connection' => true,</pre>
+</div>
+<p>Is ownCloud connected to the Internet or running in a closed network?</p>
+<div class="highlight-python"><pre>'check_for_working_webdav' => true,</pre>
+</div>
+<p>Allows ownCloud to verify a working WebDAV connection. This is done by
+attempting to make a WebDAV request from PHP.</p>
+<div class="highlight-python"><pre>'check_for_working_htaccess' => true,</pre>
+</div>
+<p>This is a crucial security check on Apache servers that should always be set
+to <tt class="docutils literal"><span class="pre">true</span></tt>. This verifies that the <tt class="docutils literal"><span class="pre">.htaccess</span></tt> file is writable and works.</p>
+<p>If it is not, then any options controlled by <tt class="docutils literal"><span class="pre">.htaccess</span></tt>, such as large
+file uploads, will not work. It also runs checks on the <tt class="docutils literal"><span class="pre">data/</span></tt> directory,
+which verifies that it can’t be accessed directly through the web server.</p>
+<div class="highlight-python"><pre>'config_is_read_only' => false,</pre>
+</div>
+<p>In certain environments it is desired to have a read-only config file.</p>
+<p>When this switch is set to <tt class="docutils literal"><span class="pre">true</span></tt> ownCloud will not verify whether the
+configuration is writable. However, it will not be possible to configure
+all options via the web-interface. Furthermore, when updating ownCloud
+it is required to make the config file writable again for the update
+process.</p>
+</div>
+<div class="section" id="logging">
+<h2>Logging<a class="headerlink" href="#logging" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><pre>'log_type' => 'owncloud',</pre>
+</div>
+<p>By default the ownCloud logs are sent to the <tt class="docutils literal"><span class="pre">owncloud.log</span></tt> file in the
+default ownCloud data directory. If syslogging is desired, set this parameter
+to <tt class="docutils literal"><span class="pre">syslog</span></tt>.</p>
+<div class="highlight-python"><pre>'logfile' => 'owncloud.log',</pre>
+</div>
+<p>Change the ownCloud logfile name from <tt class="docutils literal"><span class="pre">owncloud.log</span></tt> to something else.</p>
+<div class="highlight-python"><pre>'loglevel' => 2,</pre>
+</div>
+<p>Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
+Warning, 3 = Error. The default value is Warning.</p>
+<div class="highlight-python"><pre>'logdateformat' => 'F d, Y H:i:s',</pre>
+</div>
+<p>This uses PHP.date formatting; see <a class="reference external" href="http://php.net/manual/en/function.date.php">http://php.net/manual/en/function.date.php</a></p>
+<div class="highlight-python"><pre>'logtimezone' => 'Europe/Berlin',</pre>
+</div>
+<p>The default timezone for logfiles is UTC. You may change this; see
+<a class="reference external" href="http://php.net/manual/en/timezones.php">http://php.net/manual/en/timezones.php</a></p>
+<div class="highlight-python"><pre>'log_query' => false,</pre>
+</div>
+<p>Append all database queries and parameters to the log file. Use this only for
+debugging, as your logfile will become huge.</p>
+<div class="highlight-python"><pre>'cron_log' => true,</pre>
+</div>
+<p>Log successful cron runs.</p>
+<div class="highlight-python"><pre>'log_rotate_size' => false,</pre>
+</div>
+<p>Enables log rotation and limits the total size of logfiles. The default is 0,
+or no rotation. Specify a size in bytes, for example 104857600 (100 megabytes
+= 100 * 1024 * 1024 bytes). A new logfile is created with a new name when the
+old logfile reaches your limit. The total size of all logfiles is double the
+<tt class="docutils literal"><span class="pre">log_rotate_sizerotation</span></tt> value.</p>
+</div>
+<div class="section" id="alternate-code-locations">
+<h2>Alternate Code Locations<a class="headerlink" href="#alternate-code-locations" title="Permalink to this headline">¶</a></h2>
+<p>Some of the ownCloud code may be stored in alternate locations.</p>
+<div class="highlight-python"><pre>'3rdpartyroot' => '',</pre>
+</div>
+<p>ownCloud uses some 3rd party PHP components to provide certain functionality.</p>
+<p>These components are shipped as part of the software package and reside in
+<tt class="docutils literal"><span class="pre">owncloud/3rdparty</span></tt>. Use this option to configure a different location.</p>
+<div class="highlight-python"><pre>'3rdpartyurl' => '',</pre>
+</div>
+<p>If you have an alternate <tt class="docutils literal"><span class="pre">3rdpartyroot</span></tt>, you must also configure the URL as
+seen by a Web browser.</p>
+<div class="highlight-python"><pre>'customclient_desktop' =>
+ 'http://owncloud.org/sync-clients/',
+'customclient_android' =>
+ 'https://play.google.com/store/apps/details?id=com.owncloud.android',
+'customclient_ios' =>
+ 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8',</pre>
+</div>
+<p>This section is for configuring the download links for ownCloud clients, as
+seen in the first-run wizard and on Personal pages.</p>
+</div>
+<div class="section" id="apps">
+<h2>Apps<a class="headerlink" href="#apps" title="Permalink to this headline">¶</a></h2>
+<p>Options for the Apps folder, Apps store, and App code checker.</p>
+<div class="highlight-python"><pre>'appstoreenabled' => true,</pre>
+</div>
+<p>When enabled, admins may install apps from the ownCloud app store.</p>
+<p>The app store is disabled by default for ownCloud Enterprise Edition</p>
+<div class="highlight-python"><pre>'appstoreurl' => 'https://api.owncloud.com/v1',</pre>
+</div>
+<p>The URL of the appstore to use.</p>
+<div class="highlight-python"><pre>'apps_paths' => array(
+ array(
+ 'path'=> '/var/www/owncloud/apps',
+ 'url' => '/apps',
+ 'writable' => true,
+ ),
+),</pre>
+</div>
+<p>Use the <tt class="docutils literal"><span class="pre">apps_paths</span></tt> parameter to set the location of the Apps directory,
+which should be scanned for available apps, and where user-specific apps
+should be installed from the Apps store. The <tt class="docutils literal"><span class="pre">path</span></tt> defines the absolute
+file system path to the app folder. The key <tt class="docutils literal"><span class="pre">url</span></tt> defines the HTTP web path
+to that folder, starting from the ownCloud web root. The key <tt class="docutils literal"><span class="pre">writable</span></tt>
+indicates if a web server can write files to that folder.</p>
+<div class="highlight-python"><pre>'appcodechecker' => true,</pre>
+</div>
+<p>Check 3rd party apps to make sure they are using the private API and not the
+public API. If the app uses the private API it cannot be installed.</p>
+</div>
+<div class="section" id="previews">
+<h2>Previews<a class="headerlink" href="#previews" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud supports previews of image files, the covers of MP3 files, and text
+files. These options control enabling and disabling previews, and thumbnail
+size.</p>
+<div class="highlight-python"><pre>'enable_previews' => true,</pre>
+</div>
+<p>By default, ownCloud can generate previews for the following filetypes:</p>
+<ul class="simple">
+<li>Images files</li>
+<li>Covers of MP3 files</li>
+<li>Text documents</li>
+</ul>
+<p>Valid values are <tt class="docutils literal"><span class="pre">true</span></tt>, to enable previews, or
+<tt class="docutils literal"><span class="pre">false</span></tt>, to disable previews</p>
+<div class="highlight-python"><pre>'preview_max_x' => null,</pre>
+</div>
+<p>The maximum width, in pixels, of a preview. A value of <tt class="docutils literal"><span class="pre">null</span></tt> means there
+is no limit.</p>
+<div class="highlight-python"><pre>'preview_max_y' => null,</pre>
+</div>
+<p>The maximum height, in pixels, of a preview. A value of <tt class="docutils literal"><span class="pre">null</span></tt> means there
+is no limit.</p>
+<div class="highlight-python"><pre>'preview_max_scale_factor' => 10,</pre>
+</div>
+<p>If a lot of small pictures are stored on the ownCloud instance and the
+preview system generates blurry previews, you might want to consider setting
+a maximum scale factor. By default, pictures are upscaled to 10 times the
+original size. A value of <tt class="docutils literal"><span class="pre">1</span></tt> or <tt class="docutils literal"><span class="pre">null</span></tt> disables scaling.</p>
+<div class="highlight-python"><pre>'preview_max_filesize_image' => 50,</pre>
+</div>
+<p>max file size for generating image previews with imagegd (default behaviour)
+If the image is bigger, it’ll try other preview generators,
+but will most likely show the default mimetype icon</p>
+<p>Value represents the maximum filesize in megabytes
+Default is 50
+Set to -1 for no limit</p>
+<div class="highlight-python"><pre>'preview_libreoffice_path' => '/usr/bin/libreoffice',</pre>
+</div>
+<p>custom path for LibreOffice/OpenOffice binary</p>
+<div class="highlight-python"><pre>'preview_office_cl_parameters' =>
+ ' --headless --nologo --nofirststartwizard --invisible --norestore '.
+ '-convert-to pdf -outdir ',</pre>
+</div>
+<p>Use this if LibreOffice/OpenOffice requires additional arguments.</p>
+<div class="highlight-python"><pre>'enabledPreviewProviders' => array(
+ 'OC\Preview\Image',
+ 'OC\Preview\MP3',
+ 'OC\Preview\TXT',
+ 'OC\Preview\MarkDown'
+),</pre>
+</div>
+<p>Only register providers that have been explicitly enabled</p>
+<p>The following providers are enabled by default:</p>
+<blockquote>
+<div><ul class="simple">
+<li>OC\Preview\Image</li>
+<li>OC\Preview\MarkDown</li>
+<li>OC\Preview\MP3</li>
+<li>OC\Preview\TXT</li>
+</ul>
+</div></blockquote>
+<p>The following providers are disabled by default due to performance or privacy
+concerns:</p>
+<blockquote>
+<div><ul class="simple">
+<li>OC\Preview\Movie</li>
+<li>OC\Preview\MSOffice2003</li>
+<li>OC\Preview\MSOffice2007</li>
+<li>OC\Preview\MSOfficeDoc</li>
+<li>OC\Preview\OpenDocument</li>
+<li>OC\Preview\PDF</li>
+<li>OC\Preview\StarOffice</li>
+<li>OC\Preview\SVG</li>
+</ul>
+</div></blockquote>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Troubleshooting steps for the MS Word previews are available
+at the <a class="reference internal" href="collaborative_documents_configuration.html"><em>Configuring the Collaborative Documents App</em></a> section
+of the Administrators Manual.</p>
+</div>
+<p>The following providers are not available in Microsoft Windows:</p>
+<blockquote>
+<div><ul class="simple">
+<li>OC\Preview\Movie</li>
+<li>OC\Preview\MSOfficeDoc</li>
+<li>OC\Preview\MSOffice2003</li>
+<li>OC\Preview\MSOffice2007</li>
+<li>OC\Preview\OpenDocument</li>
+<li>OC\Preview\StarOffice</li>
+</ul>
+</div></blockquote>
+</div>
+<div class="section" id="ldap">
+<h2>LDAP<a class="headerlink" href="#ldap" title="Permalink to this headline">¶</a></h2>
+<p>Global settings used by LDAP User and Group Backend</p>
+<div class="highlight-python"><pre>'ldapUserCleanupInterval' => 51,</pre>
+</div>
+<p>defines the interval in minutes for the background job that checks user
+existance and marks them as ready to be cleaned up. The number is always
+minutes. Setting it to 0 disables the feature.</p>
+<p>See command line (occ) methods <a class="reference external" href="ldap:show-remnants">ldap:show-remnants</a> and user:delete</p>
+</div>
+<div class="section" id="maintenance">
+<h2>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this headline">¶</a></h2>
+<p>These options are for halting user activity when you are performing server
+maintenance.</p>
+<div class="highlight-python"><pre>'maintenance' => false,</pre>
+</div>
+<p>Enable maintenance mode to disable ownCloud</p>
+<p>If you want to prevent users to login to ownCloud before you start doing some
+maintenance work, you need to set the value of the maintenance parameter to
+true. Please keep in mind that users who are already logged-in are kicked out
+of ownCloud instantly.</p>
+<div class="highlight-python"><pre>'singleuser' => false,</pre>
+</div>
+<p>When set to <tt class="docutils literal"><span class="pre">true</span></tt>, the ownCloud instance will be unavailable for all users
+who are not in the <tt class="docutils literal"><span class="pre">admin</span></tt> group.</p>
+</div>
+<div class="section" id="ssl">
+<h2>SSL<a class="headerlink" href="#ssl" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><pre>'forcessl' => false,</pre>
+</div>
+<p>Change this to <tt class="docutils literal"><span class="pre">true</span></tt> to require HTTPS for all connections, and to reject
+HTTP requests.</p>
+<div class="highlight-python"><pre>'openssl' => array(
+ 'config' => '/absolute/location/of/openssl.cnf',
+),</pre>
+</div>
+<p>Extra SSL options to be used for configuration.</p>
+</div>
+<div class="section" id="miscellaneous">
+<h2>Miscellaneous<a class="headerlink" href="#miscellaneous" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><pre>'blacklisted_files' => array('.htaccess'),</pre>
+</div>
+<p>Blacklist a specific file or files and disallow the upload of files
+with this name. <tt class="docutils literal"><span class="pre">.htaccess</span></tt> is blocked by default.</p>
+<p>WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING.</p>
+<div class="highlight-python"><pre>'share_folder' => '/',</pre>
+</div>
+<p>Define a default folder for shared files and folders other than root.</p>
+<div class="highlight-python"><pre>'theme' => '',</pre>
+</div>
+<p>If you are applying a theme to ownCloud, enter the name of the theme here.</p>
+<p>The default location for themes is <tt class="docutils literal"><span class="pre">owncloud/themes/</span></tt>.</p>
+<div class="highlight-python"><pre>'xframe_restriction' => true,</pre>
+</div>
+<p>X-Frame-Restriction is a header which prevents browsers from showing the site
+inside an iframe. This is be used to prevent clickjacking. It is risky to
+disable this, so leave it set at <tt class="docutils literal"><span class="pre">true</span></tt>.</p>
+<div class="highlight-python"><pre>'cipher' => 'AES-256-CFB',</pre>
+</div>
+<p>The default cipher for encrypting files. Currently AES-128-CFB and
+AES-256-CFB are supported.</p>
+<div class="highlight-python"><pre>'memcached_servers' => array(
+ // hostname, port and optional weight. Also see:
+ // http://www.php.net/manual/en/memcached.addservers.php
+ // http://www.php.net/manual/en/memcached.addserver.php
+ array('localhost', 11211),
+ //array('other.host.local', 11211),
+),</pre>
+</div>
+<p>Server details for one or more memcached servers to use for memory caching.</p>
+<p>Memcache is only used if other memory cache options (xcache, apc, apcu) are
+not available.</p>
+<div class="highlight-python"><pre>'cache_path' => '',</pre>
+</div>
+<p>Location of the cache folder, defaults to <tt class="docutils literal"><span class="pre">data/$user/cache</span></tt> where
+<tt class="docutils literal"><span class="pre">$user</span></tt> is the current user. When specified, the format will change to
+<tt class="docutils literal"><span class="pre">$cache_path/$user</span></tt> where <tt class="docutils literal"><span class="pre">$cache_path</span></tt> is the configured cache directory
+and <tt class="docutils literal"><span class="pre">$user</span></tt> is the user.</p>
+<div class="highlight-python"><pre>'quota_include_external_storage' => false,</pre>
+</div>
+<p>EXPERIMENTAL: option whether to include external storage in quota
+calculation, defaults to false.</p>
+<div class="highlight-python"><pre>'filesystem_check_changes' => 1,</pre>
+</div>
+<p>Specifies how often the filesystem is checked for changes made outside
+ownCloud.</p>
+<p>0 -> Never check the filesystem for outside changes, provides a performance
+increase when it’s certain that no changes are made directly to the
+filesystem</p>
+<p>1 -> Check each file or folder at most once per request, recommended for
+general use if outside changes might happen.</p>
+<p>2 -> Check every time the filesystem is used, causes a performance hit when
+using external storages, not recommended for regular use.</p>
+<div class="highlight-python"><pre>'asset-pipeline.enabled' => false,</pre>
+</div>
+<p>All css and js files will be served by the web server statically in one js
+file and one css file if this is set to <tt class="docutils literal"><span class="pre">true</span></tt>.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Test this thoroughly on production systems as it should work reliably
+with core apps, but you may encounter problems with community/third-party apps.</p>
+</div>
+<div class="highlight-python"><pre>'mount_file' => 'data/mount.json',</pre>
+</div>
+<p>Where <tt class="docutils literal"><span class="pre">mount.json</span></tt> file should be stored, defaults to <tt class="docutils literal"><span class="pre">data/mount.json</span></tt></p>
+<div class="highlight-python"><pre>'filesystem_cache_readonly' => false,</pre>
+</div>
+<p>When <tt class="docutils literal"><span class="pre">true</span></tt>, prevent ownCloud from changing the cache due to changes in the
+filesystem for all storage.</p>
+<div class="highlight-python"><pre>'objectstore' => array(
+ 'class' => 'OC\\Files\\ObjectStore\\Swift',
+ 'arguments' => array(
+ // trystack will user your facebook id as the user name
+ 'username' => 'facebook100000123456789',
+ // in the trystack dashboard go to user -> settings -> API Password to
+ // generate a password
+ 'password' => 'Secr3tPaSSWoRdt7',
+ // must already exist in the objectstore, name can be different
+ 'container' => 'owncloud',
+ // create the container if it does not exist. default is false
+ 'autocreate' => true,
+ // required, dev-/trystack defaults to 'RegionOne'
+ 'region' => 'RegionOne',
+ // The Identity / Keystone endpoint
+ 'url' => 'http://8.21.28.222:5000/v2.0',
+ // required on dev-/trystack
+ 'tenantName' => 'facebook100000123456789',
+ // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
+ // if omitted
+ 'serviceName' => 'swift',
+ ),
+),</pre>
+</div>
+<p>The example below shows how to configure ownCloud to store all files in a
+swift object storage.</p>
+<p>It is important to note that ownCloud in object store mode will expect
+exclusive access to the object store container because it only stores the
+binary data for each file. The metadata is currently kept in the local
+database for performance reasons.</p>
+<p>WARNING: The current implementation is incompatible with any app that uses
+direct file IO and circumvents our virtual filesystem. That includes
+Encryption and Gallery. Gallery will store thumbnails directly in the
+filesystem and encryption will cause severe overhead because key files need
+to be fetched in addition to any requested file.</p>
+<p>One way to test is applying for a trystack account at <a class="reference external" href="http://trystack.org/">http://trystack.org/</a></p>
+<div class="highlight-python"><pre>'supportedDatabases' => array(
+ 'sqlite',
+ 'mysql',
+ 'pgsql',
+ 'oci',
+ 'mssql'
+),</pre>
+</div>
+<p>Database types that are supported for installation.</p>
+<dl class="docutils">
+<dt>Available:</dt>
+<dd><ul class="first last simple">
+<li>sqlite (SQLite3 - Community Edition Only)</li>
+<li>mysql (MySQL)</li>
+<li>pgsql (PostgreSQL)</li>
+<li>oci (Oracle - Enterprise Edition Only)</li>
+<li>mssql (Microsoft SQL Server - Enterprise Edition Only)</li>
+</ul>
+</dd>
+</dl>
+<div class="highlight-python"><pre>'custom_csp_policy' =>
+ "default-src 'self'; script-src 'self' 'unsafe-eval'; ".
+ "style-src 'self' 'unsafe-inline'; frame-src *; img-src *; ".
+ "font-src 'self' data:; media-src *",</pre>
+</div>
+<p>Custom CSP policy, changing this will overwrite the standard policy</p>
+<div class="highlight-python"><pre>'secret' => 'ICertainlyShouldHaveChangedTheDefaultSecret',</pre>
+</div>
+<p>Secret used by ownCloud for various purposes, e.g. to encrypt data. If you
+lose this string there will be data corruption.</p>
+</div>
+<div class="section" id="app-config-options">
+<h2>App config options<a class="headerlink" href="#app-config-options" title="Permalink to this headline">¶</a></h2>
+<p>Retention for activities of the activity app:</p>
+<div class="highlight-python"><pre>'activity_expire_days' => 365,</pre>
+</div>
+<p>Every day a cron job is ran, which deletes all activities for all users
+which are older then the number of days that is set for <tt class="docutils literal"><span class="pre">activity_expire_days</span></tt></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/configuration/user_configuration.html
index 9314d5a,0000000..0512096
mode 100644,000000..100644
--- a/core/doc/admin/release/configuration/user_configuration.html
+++ b/core/doc/admin/release/configuration/user_configuration.html
@@@ -1,335 -1,0 +1,335 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>User Management — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Resetting a Lost Admin Password" href="reset_admin_password.html" />
+ <link rel="prev" title="LDAP User Cleanup" href="user_auth_ldap_cleanup.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html">Configuring the Activity App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a></li>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html">Automatic Configuration Setup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html">Defining Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="big_file_upload_configuration.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="collaborative_documents_configuration.html">Configuring the Collaborative Documents App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html">Config.php Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_client_configuration.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="database_configuration.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html">Email Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption_configuration.html">Encryption Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_storage_configuration_gui.html">Configuring External Storage (GUI)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_storage_configuration.html">Configuring External Storage (Configuration File)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="file_sharing_configuration.html">File Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files_locking_enabling.html">Files Locking App Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html">Hardening and Security Guidance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="knowledgebase_configuration.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="language_configuration.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="logging_configuration.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html">Using the occ Command</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tips.html">Performance Tips</a></li>
+<li class="toctree-l2"><a class="reference internal" href="previews_configuration.html">Previews Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_configuration.html">Configuring Server-to-Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="serving_static_files_configuration.html">Serving Static Files for Better Performance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="thirdparty_php_configuration.html">Using Third Party PHP Components</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ftp_smb_imap.html">User Authentication with IMAP, SMB, and FTP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user_auth_ldap_cleanup.html">LDAP User Cleanup</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">User Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-new-user">Creating a New User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#reset-a-user-s-password">Reset a User’s Password</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#renaming-a-user">Renaming a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#granting-administrator-privileges-to-a-user">Granting Administrator Privileges to a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#managing-groups">Managing Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#setting-storage-quotas">Setting Storage Quotas</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#deleting-users">Deleting users</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="reset_admin_password.html">Resetting a Lost Admin Password</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="user-management">
+<h1>User Management<a class="headerlink" href="#user-management" title="Permalink to this headline">¶</a></h1>
+<p>In ownCloud 7, the Users management page has been streamlined and improved. You
+can create new users, view all of your users in a single scrolling window,
+filter users by group, see what groups they belong to, edit their full names and
+passwords, see their data storage locations, view and set quotas, and, if you so
+desire, delete them with a single click.</p>
+<div class="figure">
+<img alt="../_images/users-config.png" src="../_images/users-config.png" />
+</div>
+<p>User accounts have the following properties:</p>
+<dl class="docutils">
+<dt><em>Login Name (Username)</em></dt>
+<dd>This is the unique ID of an ownCloud user, and it cannot be changed.</dd>
+<dt><em>Full Name</em></dt>
+<dd>The user’s display name that appears on file shares, the ownCloud Web
+interface, and emails. Admins and users may change the Full Name anytime. If
+the Full Name is not set it defaults to the login name.</dd>
+<dt><em>Password</em></dt>
+<dd>The admin sets the new user’s first password. Both the user and the admin can
+change the user’s password at anytime.</dd>
+<dt><em>Groups</em></dt>
+<dd>You may create groups, and assign group memberships to users. By default new
+users are not assigned to any groups.</dd>
+<dt><em>Group Admin</em></dt>
+<dd>Group admins are granted administrative privileges on specific groups, and
+can add and remove users from their groups.</dd>
+<dt><em>Quota</em></dt>
+<dd>The maximum disk space assigned to each user. Any user that exceeds the quota
+cannot upload or sync data. ownCloud 7 introduces a new feature, and that is
+the option to include external storage in user quotas.</dd>
+</dl>
+<div class="section" id="creating-a-new-user">
+<h2>Creating a New User<a class="headerlink" href="#creating-a-new-user" title="Permalink to this headline">¶</a></h2>
+<p>To create a user account:</p>
+<ul class="simple">
+<li>Enter the new user’s <strong>Login Name</strong> and their initial <strong>Password</strong></li>
+<li>Optionally, assign <strong>Groups</strong> memberships</li>
+<li>Click the <strong>Create</strong> button</li>
+</ul>
+<div class="figure">
+<img alt="../_images/users-create.png" src="../_images/users-create.png" />
+</div>
+<p>Login names may contain letters (a-z, A-Z), numbers (0-9), dashes (-),
- underscores (_), periods (.) and ampersands (@). After creating the user, you
++underscores (_), periods (.) and at signs (@). After creating the user, you
+may fill in their <strong>Full Name</strong> if it is different than the login name, or
+leave it for the user to complete.</p>
+<p>Remember to give your new users their logins and passwords.</p>
+</div>
+<div class="section" id="reset-a-user-s-password">
+<h2>Reset a User’s Password<a class="headerlink" href="#reset-a-user-s-password" title="Permalink to this headline">¶</a></h2>
+<p>You cannot recover a user’s password, but you can set a new one:</p>
+<ul class="simple">
+<li>Hover your cursor over the user’s <strong>Password</strong> field</li>
+<li>Click on the <strong>pencil icon</strong></li>
+<li>Enter the user’s new password in the password field, and remember to provide
+the user with their password</li>
+</ul>
+<p>If you have encryption enabled, there are special considerations for user
+password resets. Please see <a class="reference internal" href="encryption_configuration.html"><em>Encryption Configuration</em></a>.</p>
+</div>
+<div class="section" id="renaming-a-user">
+<h2>Renaming a User<a class="headerlink" href="#renaming-a-user" title="Permalink to this headline">¶</a></h2>
+<p>Each ownCloud user has two names: a unique <strong>Login Name</strong> used for
+authentication, and a <strong>Full Name</strong>, which is their display name. You can edit
+the display name of a user, but you cannot change the login name of any user.</p>
+<p>To set or change a user’s display name:</p>
+<ul class="simple">
+<li>Hover your cursor over the user’s <strong>Full Name</strong> field</li>
+<li>Click on the <strong>Pencil icon</strong></li>
+<li>Enter the user’s new display name</li>
+</ul>
+</div>
+<div class="section" id="granting-administrator-privileges-to-a-user">
+<h2>Granting Administrator Privileges to a User<a class="headerlink" href="#granting-administrator-privileges-to-a-user" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud has two types of administrators: <strong>Super Administrators</strong> and <strong>Group
+Administrators</strong>. Group administrators have the rights to create, edit and
+delete users in their assigned groups. Group administrators cannot access
+system settings, or add or modify users in the groups that they are not <strong>Group
+Administrators</strong> for. Use the dropdown menus in the <strong>Group Admin</strong> column to
+assign group admin privileges.</p>
+<div class="figure">
+<img alt="../_images/users-groups.png" src="../_images/users-groups.png" />
+</div>
+<p><strong>Super Administrators</strong> have full rights on your ownCloud server, and can
+access and modify all settings. To assign the <strong>Super Administrators</strong> role to
+a user, simply add them to the <tt class="docutils literal"><span class="pre">admin</span></tt> group.</p>
+</div>
+<div class="section" id="managing-groups">
+<h2>Managing Groups<a class="headerlink" href="#managing-groups" title="Permalink to this headline">¶</a></h2>
+<p>You can assign new users to groups when you create them, and create new groups
+when you create new users. You may also use the <strong>Add Group</strong> button at the top
+of the left pane to create new groups. New group members will immediately
+have access to file shares that belong to their new groups.</p>
+</div>
+<div class="section" id="setting-storage-quotas">
+<h2>Setting Storage Quotas<a class="headerlink" href="#setting-storage-quotas" title="Permalink to this headline">¶</a></h2>
+<p>Click the gear on the lower left pane to set a default storage quota. This is
+automatically applied to new users. You may assign a different quota to any user
+by selecting from the <strong>Quota</strong> dropdown, selecting either a preset value or
+entering a custom value. When you create custom quotas, use the normal
+abbreviations for your storage values such as 500 MB, 5 GB, 5 TB, and so on.</p>
+<p>You now have a configurable option in <tt class="docutils literal"><span class="pre">config.php</span></tt> that controls whether
+external storage is counted against user’s quotas. This is still
+experimental, and may not work as expected. The default is to not count
+external storage as part of user storage quotas. If you prefer to include it,
+then change the default <tt class="docutils literal"><span class="pre">false</span></tt> to <tt class="docutils literal"><span class="pre">true</span></tt>.:</p>
+<div class="highlight-python"><pre>'quota_include_external_storage' => false,</pre>
+</div>
+<p>Metadata (such as thumbnails, temporary files, and encryption keys) takes up
+about 10% of disk space, but is not counted against user quotas. Users can check
+their used and available space on their Personal pages. Only files that
+originate with users count against their quotas, and not files shared with them
+that originate from other users. For example, if you upload files to a
+different user’s share, those files count against your quota. If you re-share a
+file that another user shared with you, that file does not count against your
+quota, but the originating user’s.</p>
+<p>Encrypted files are a little larger than unencrypted files; the unencrypted size
+is calculated against the user’s quota.</p>
+<p>Deleted files that are still in the trash bin do not count against quotas. The
+trash bin is set at 50% of quota. Deleted file aging is set at 30 days. When
+deleted files exceed 50% of quota then the oldest files are removed until the
+total is below 50%.</p>
+<p>When version control is enabled, the older file versions are not counted
+against quotas.</p>
+<p>When a user creates a public share via URL, and allows uploads, any uploaded
+files count against that user’s quota.</p>
+</div>
+<div class="section" id="deleting-users">
+<h2>Deleting users<a class="headerlink" href="#deleting-users" title="Permalink to this headline">¶</a></h2>
+<p>Deleting a user is easy: hover your cursor over their name on the <strong>Users</strong> page
+until a trashcan icon appears at the far right. Click the trashcan, and they’re
+gone. You’ll see an undo button at the top of the page, which remains until you
+refresh the page. When the undo button is gone you cannot recover the deleted
+user.</p>
+<p>All of the files owned by the user are deleted as well, including all files they
+have shared. If you need to preserve the user’s files and shares, you must first
+download them from your ownCloud Files page, which compresses them into a zip
+file, or use a sync client to copy them to your local computer. See the “File
+Sharing” section of the Admin Manual to learn how to create persistent file
+shares that survive user deletions.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/contents.html
index a4986ab,0000000..f20d5f3
mode 100644,000000..100644
--- a/core/doc/admin/release/contents.html
+++ b/core/doc/admin/release/contents.html
@@@ -1,569 -1,0 +1,574 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>ownCloud documentation contents — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="index.html" />
+ <link rel="next" title="Introduction" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="#">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="#">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="index.html">Introduction</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="owncloud-documentation-contents">
+<span id="contents"></span><h1>ownCloud documentation contents<a class="headerlink" href="#owncloud-documentation-contents" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="index.html">Introduction</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="index.html#target-audience">Target Audience</a></li>
+<li class="toctree-l2"><a class="reference internal" href="index.html#owncloud-videos-and-blogs">ownCloud Videos and Blogs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="index.html#document-structure">Document Structure</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="index.html#installation">Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="index.html#configuration">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="index.html#maintenance">Maintenance</a></li>
+<li class="toctree-l3"><a class="reference internal" href="index.html#issues">Issues</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="videos.html">ownCloud Videos</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="videos.html#server-to-server-sharing-on-owncloud-7">Server to Server Sharing on ownCloud 7</a></li>
+<li class="toctree-l2"><a class="reference internal" href="videos.html#introducing-owncloud-7-enterprise-edition">Introducing ownCloud 7 Enterprise Edition</a></li>
+<li class="toctree-l2"><a class="reference internal" href="videos.html#owncloud-for-enterprise-file-sync-and-share">ownCloud for Enterprise File Sync and Share</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="whats_new_admin.html">What’s New for Admins in ownCloud 7</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#new-user-management">New User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#external-storage">External Storage</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#object-stores-as-primary-storage">Object Stores as Primary Storage</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#server-to-server-sharing">Server to Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#sharepoint-integration-enterprise-edition-only">SharePoint Integration (Enterprise Edition only)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#windows-network-drive-integration-enterprise-edition-only">Windows Network Drive Integration (Enterprise Edition only)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#sharing">Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#email-configuration-wizard">Email Configuration Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#editable-email-templates">Editable Email Templates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new_admin.html#active-directory-and-ldap-enhancements">Active Directory and LDAP Enhancements</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="release_notes.html">ownCloud 7.0 Release Notes</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#recommended-setup-for-running-owncloud">Recommended Setup for Running ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#supported-platforms">Supported Platforms</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#manual-ldap-port-configuration">Manual LDAP Port Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#ldap-search-performance-improved">LDAP Search Performance Improved</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#protecting-owncloud-on-iis-from-data-loss">Protecting ownCloud on IIS from Data Loss</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#antivirus-app-modes">Antivirus App Modes</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#enable-only-for-specific-groups-fails">“Enable Only for Specific Groups” Fails</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#changes-to-file-previews">Changes to File Previews</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#gb-limit-on-sftp-transfers">4GB Limit on SFTP Transfers</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#not-enough-space-available-on-file-upload">“Not Enough Space Available” on File Upload</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-more-expiration-date-on-local-shares">No More Expiration Date On Local Shares</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#zero-quota-not-read-only">Zero Quota Not Read-Only</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#enterprise-7-only">Enterprise 7 Only</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-federated-cloud-sharing-with-shibboleth">No Federated Cloud Sharing with Shibboleth</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#windows-network-drive">Windows Network Drive</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#sharepoint-drive-ssl">Sharepoint Drive SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#shibboleth-and-webdav-incompatible">Shibboleth and WebDAV Incompatible</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-sqlite">No SQLite</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-app-store">No App Store</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#ldap-home-connector-linux-only">LDAP Home Connector Linux Only</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation/linux_installation.html">Preferred Linux Installation Method</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/linux_installation.html#supported-distribution-packages">Supported Distribution Packages</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/linux_installation.html#additional-installation-guides-and-notes">Additional Installation Guides and Notes</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/appliance_installation.html">ownCloud Appliances</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/appliance_installation.html#software-appliances">Software Appliances</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/appliance_installation.html#owncloud-on-hardware-appliances">ownCloud on Hardware Appliances</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/apps_management_installation.html">Installing and Managing Apps</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#viewing-enabled-apps">Viewing Enabled Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#managing-apps">Managing Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#adding-third-party-apps">Adding Third Party Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#setting-app-parameters">Setting App Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#using-custom-app-directories">Using Custom App Directories</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#using-your-own-appstore">Using Your Own Appstore</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_wizard.html">Installation Wizard</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#required-settings">Required Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#storage-database">Storage & Database</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#database-choice">Database Choice</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#finish-installation">Finish Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#trusted-domains">Trusted Domains</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/lighttpd_configuration.html">Lighttpd Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/macos_installation.html">Mac OS X</a></li>
- <li class="toctree-l2"><a class="reference internal" href="installation/nginx_configuration.html">Nginx Configuration</a></li>
++<li class="toctree-l2"><a class="reference internal" href="installation/nginx_configuration.html">Nginx Configuration</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="installation/nginx_configuration.html#suppressing-log-messages">Suppressing Log Messages</a></li>
++<li class="toctree-l3"><a class="reference internal" href="installation/nginx_configuration.html#javascript-js-or-css-css-files-not-served-properly">JavaScript (.js) or CSS (.css) files not served properly</a></li>
++</ul>
++</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/others_installation.html">Other Installation Methods</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/others_installation.html#pagekite-configuration">PageKite Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/source_installation.html">Manual Installation on Linux</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#prerequisites">Prerequisites</a></li>
++<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#red-hat-enterprise-linux-6-centos-6-and-php-5-4">Red Hat Enterprise Linux 6, CentOS 6, and PHP 5.4</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#example-installation-on-ubuntu-14-04-lts-server">Example installation on Ubuntu 14.04 LTS Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#installation-wizard">Installation Wizard</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#selinux">SELinux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#configuration-notes-to-php-ini-files">Configuration notes to php.ini files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#apache-web-server-configuration">Apache Web Server Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#enabling-ssl">Enabling SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#configuring-owncloud">Configuring ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#other-web-servers">Other Web Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ucs_installation.html">Univention Corporate Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#pre-configuration">Pre configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#installation">Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#postconfiguration-optional">Postconfiguration (optional)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#using-owncloud">Using ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/windows_installation.html">Windows 7 and Windows Server 2008</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/windows_installation.html#activate-iis-with-cgi-support">Activate IIS with CGI Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/windows_installation.html#installing-php">Installing PHP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/windows_installation.html#installing-mysql">Installing MySQL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/windows_installation.html#installing-owncloud">Installing ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/windows_installation.html#ensure-proper-http-verb-handling">Ensure Proper HTTP-Verb Handling</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/windows_installation.html#configuring-owncloud-php-and-iis-for-large-file-uploads">Configuring ownCloud, PHP and IIS for Large File Uploads</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/selinux_configuration.html">SELinux Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-a-remote-database">Allow access to a remote database</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-ldap-server">Allow access to LDAP server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-remote-network">Allow access to remote network</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-smtp-sendmail">Allow access to SMTP/sendmail</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration/activity_configuration.html">Configuring the Activity App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/activity_configuration.html#enabling-the-activity-app">Enabling the Activity App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/activity_configuration.html#configuring-your-owncloud-for-the-activity-app">Configuring your ownCloud for the Activity App</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/antivirus_configuration.html#installing-clamav">Installing ClamAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/antivirus_configuration.html#enabling-the-antivirus-app-for-files">Enabling the Antivirus App for Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/antivirus_configuration.html#configuring-clamav-on-owncloud">Configuring ClamAV on ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/automatic_configuration.html">Automatic Configuration Setup</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/automatic_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/automatic_configuration.html#automatic-configurations-examples">Automatic Configurations Examples</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/background_jobs_configuration.html">Defining Background Jobs</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs_configuration.html#cron-jobs">Cron Jobs</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/big_file_upload_configuration.html">Uploading big files > 512MB (as set by default)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/big_file_upload_configuration.html#system-configuration">System Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/big_file_upload_configuration.html#configuring-your-webserver">Configuring Your Webserver</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/big_file_upload_configuration.html#configuring-php">Configuring PHP</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/collaborative_documents_configuration.html">Configuring the Collaborative Documents App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/collaborative_documents_configuration.html#enabling-the-documents-app">Enabling the Documents App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/collaborative_documents_configuration.html#enabling-and-testing-ms-word-support">Enabling and testing MS Word support</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/config_sample_php_parameters.html">Config.php Parameters</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#default-parameters">Default Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#default-config-php-examples">Default config.php Examples</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#user-experience">User Experience</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#mail-parameters">Mail Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#proxy-configurations">Proxy Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#deleted-items-trash-bin">Deleted Items (trash bin)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#owncloud-verifications">ownCloud Verifications</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#logging">Logging</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#alternate-code-locations">Alternate Code Locations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#apps">Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#previews">Previews</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#ldap">LDAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#maintenance">Maintenance</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#ssl">SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#miscellaneous">Miscellaneous</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/config_sample_php_parameters.html#app-config-options">App config options</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/custom_client_configuration.html">Custom Client Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_client_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/database_configuration.html">Database Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/database_configuration.html#requirements">Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/database_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/database_configuration.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/email_configuration.html">Email Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/email_configuration.html#configuring-an-smtp-server">Configuring an SMTP Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/email_configuration.html#configuring-php-and-sendmail">Configuring PHP and Sendmail</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/email_configuration.html#using-email-templates">Using Email Templates</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/email_configuration.html#setting-mail-server-parameters-in-config-php">Setting Mail Server Parameters in config.php</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/email_configuration.html#send-a-test-email">Send a Test Email</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/email_configuration.html#troubleshooting">Troubleshooting</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/email_configuration.html#enabling-debug-mode">Enabling Debug Mode</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/encryption_configuration.html">Encryption Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/encryption_configuration.html#enabling-the-encryption-app">Enabling the Encryption App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/encryption_configuration.html#sharing-encrypted-files">Sharing Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/encryption_configuration.html#decrypting-encrypted-files">Decrypting Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/encryption_configuration.html#enabling-a-file-recovery-key">Enabling a File Recovery Key</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/encryption_configuration.html#files-not-encrypted">Files Not Encrypted</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/encryption_configuration.html#ldap-and-other-external-user-back-ends">LDAP and Other External User Back-ends</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/encryption_configuration.html#missing-requirements-message-on-windows-servers">“Missing requirements” Message on Windows Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/external_storage_configuration_gui.html">Configuring External Storage (GUI)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#supported-mounts">Supported mounts</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#enabling-external-storage-support">Enabling External Storage Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#using-self-signed-certificates">Using self-signed certificates</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#adding-files-to-external-storages">Adding files to external storages</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#local-storage">Local Storage</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#amazon-s3">Amazon S3</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#dropbox">Dropbox</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#ftp-ftps-sftp">FTP/FTPS/SFTP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#google-drive">Google Drive</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#smb-cifs">SMB/CIFS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#smb-cifs-using-oc-login">SMB/CIFS using OC login</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#owncloud-and-webdav">ownCloud and WebDAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#openstack-object-storage">OpenStack Object Storage</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration_gui.html#configuration-file">Configuration File</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/external_storage_configuration.html">Configuring External Storage (Configuration File)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration.html#using-self-signed-certificates">Using self-signed certificates</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration.html#adding-files-to-external-storages">Adding files to external storages</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration.html#example">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration.html#priorities">Priorities</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration.html#backends">Backends</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/external_storage_configuration.html#external-storage-password-management">External Storage Password Management</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/file_sharing_configuration.html">File Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/file_sharing_configuration.html#creating-persistent-file-shares">Creating Persistent File Shares</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/files_locking_enabling.html">Files Locking App Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/harden_server.html">Hardening and Security Guidance</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/harden_server.html#limit-on-password-length">Limit on Password Length</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/harden_server.html#operating-system">Operating system</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/harden_server.html#deployment">Deployment</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/harden_server.html#use-https">Use HTTPS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/harden_server.html#use-a-dedicated-domain-for-owncloud">Use a dedicated domain for ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/harden_server.html#serve-security-related-headers-by-the-web-server">Serve security related Headers by the web server</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/js_css_asset_management_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/knowledgebase_configuration.html">Knowledge Base Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/knowledgebase_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/language_configuration.html">Language Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/language_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/logging_configuration.html">Logging Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/logging_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/occ_command.html">Using the occ Command</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/occ_command.html#maintenance-commands">Maintenance Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/occ_command.html#user-commands">User Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/occ_command.html#apps-commands">Apps Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/occ_command.html#upgrade-command">Upgrade Command</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/occ_command.html#database-conversion">Database Conversion</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/occ_command.html#ldap-commands">LDAP Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/occ_command.html#file-scanning">File Scanning</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/performance_tips.html">Performance Tips</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#ssl-encryption-app">SSL / Encryption App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#opcache-extension">OPcache Extension</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#object-caching">Object Caching</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#enable-the-spdy-protocol">Enable the SPDY protocol</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#serving-static-files-via-web-server">Serving static files via web server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#using-cron-to-perform-background-jobs">Using cron to perform background jobs</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#using-mysql-instead-of-sqlite">Using MySQL instead of SQLite</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#improve-slow-performance-with-mysql-on-windows">Improve slow performance with MySQL on Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/performance_tips.html#nginx-caching-owncloud-gallery-thumbnails-with-fastcgi-cache-purge">Nginx: caching ownCloud gallery thumbnails with fastcgi_cache_purge</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/previews_configuration.html">Previews Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/previews_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/reverse_proxy_configuration.html">Reverse Proxy Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/reverse_proxy_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/reverse_proxy_configuration.html#example">Example</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/server_to_server_configuration.html">Configuring Server-to-Server Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/server_to_server_configuration.html#notes">Notes</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/serving_static_files_configuration.html">Serving Static Files for Better Performance</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/serving_static_files_configuration.html#apache2-x-sendfile">Apache2 (X-Sendfile)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/serving_static_files_configuration.html#lighttpd-x-sendfile2">LigHTTPd (X-Sendfile2)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/serving_static_files_configuration.html#nginx-x-accel-redirect">Nginx (X-Accel-Redirect)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/serving_static_files_configuration.html#how-to-check-if-it-s-working">How to check if it’s working?</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/thirdparty_php_configuration.html">Using Third Party PHP Components</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/thirdparty_php_configuration.html#managing-third-party-parameters">Managing Third Party Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/user_auth_ftp_smb_imap.html">User Authentication with IMAP, SMB, and FTP</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ftp_smb_imap.html#imap">IMAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ftp_smb_imap.html#smb">SMB</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ftp_smb_imap.html#ftp">FTP</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/user_auth_ldap.html">User Authentication with LDAP</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#configuration">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#advanced-settings">Advanced Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#expert-settings">Expert Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#testing-the-configuration">Testing the configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#owncloud-avatar-integration">ownCloud Avatar integration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#troubleshooting-tips-and-tricks">Troubleshooting, Tips and Tricks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#ssl-certificate-verification-ldaps-tls">SSL Certificate Verification (LDAPS, TLS)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#microsoft-active-directory">Microsoft Active Directory</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#duplicating-server-configurations">Duplicating Server Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#owncloud-ldap-internals">ownCloud LDAP Internals</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#user-and-group-mapping">User and Group Mapping</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#caching">Caching</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap.html#handling-with-backup-server">Handling with Backup Server</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/user_auth_ldap_cleanup.html">LDAP User Cleanup</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_auth_ldap_cleanup.html#deleting-local-owncloud-users">Deleting Local ownCloud Users</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/user_configuration.html">User Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_configuration.html#creating-a-new-user">Creating a New User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_configuration.html#reset-a-user-s-password">Reset a User’s Password</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_configuration.html#renaming-a-user">Renaming a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_configuration.html#granting-administrator-privileges-to-a-user">Granting Administrator Privileges to a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_configuration.html#managing-groups">Managing Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_configuration.html#setting-storage-quotas">Setting Storage Quotas</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/user_configuration.html#deleting-users">Deleting users</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/reset_admin_password.html">Resetting a Lost Admin Password</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/enable_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/backup.html">Backing up ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-folders">Backup Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-database">Backup Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/update.html">Updating ownCloud with the Updater App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/update.html#setting-strong-permissions">Setting Strong Permissions</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/upgrade.html">Upgrading Your ownCloud Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#preferred-upgrade-method">Preferred Upgrade Method</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#upgrading-with-your-linux-package-manager">Upgrading With Your Linux Package Manager</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#manual-upgrade-procedure">Manual Upgrade Procedure</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#setting-strong-permissions">Setting Strong Permissions</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/restore.html">Restoring ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-folders">Restore Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-database">Restore Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/migrating.html">Migrating ownCloud Installations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/convert_db.html">Converting From SQLite to MySQL, MariaDB, or PostgreSQL</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/convert_db.html#running-the-conversion">Running the Conversion</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/convert_db.html#conversion-options">Conversion Options</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/convert_db.html#unconvertible-tables">Unconvertible Tables</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues and Troubleshooting</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#bugs">Bugs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#general-troubleshooting">General Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#debugging-the-issue">Debugging the issue</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#debugging-sync-issues">Debugging Sync-Issues</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#common-problems-error-messages">Common problems / error messages</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#troubleshooting-webserver-and-php-problems">Troubleshooting Webserver and PHP problems</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#logfiles">Logfiles</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#webserver-and-php-modules">Webserver and PHP modules</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#troubleshooting-webdav">Troubleshooting WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#troubleshooting-contacts-calendar">Troubleshooting Contacts & Calendar</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#service-discovery">Service discovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#apple-ios">Apple iOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#unable-to-update-contacts-or-events">Unable to update Contacts or Events</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/installation/index.html
index dc3a1f4,0000000..a590d69
mode 100644,000000..100644
--- a/core/doc/admin/release/installation/index.html
+++ b/core/doc/admin/release/installation/index.html
@@@ -1,242 -1,0 +1,247 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Installation — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="next" title="Preferred Linux Installation Method" href="linux_installation.html" />
+ <link rel="prev" title="ownCloud 7.0 Release Notes" href="../release_notes.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html">Preferred Linux Installation Method</a></li>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html">ownCloud Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html">Installing and Managing Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html">Installation Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="lighttpd_configuration.html">Lighttpd Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="macos_installation.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="nginx_configuration.html">Nginx Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="others_installation.html">Other Installation Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html">Manual Installation on Linux</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html">SELinux Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="installation">
+<h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="linux_installation.html">Preferred Linux Installation Method</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html#supported-distribution-packages">Supported Distribution Packages</a></li>
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html#additional-installation-guides-and-notes">Additional Installation Guides and Notes</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="appliance_installation.html">ownCloud Appliances</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html#software-appliances">Software Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html#owncloud-on-hardware-appliances">ownCloud on Hardware Appliances</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="apps_management_installation.html">Installing and Managing Apps</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html#viewing-enabled-apps">Viewing Enabled Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html#managing-apps">Managing Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html#adding-third-party-apps">Adding Third Party Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html#setting-app-parameters">Setting App Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html#using-custom-app-directories">Using Custom App Directories</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html#using-your-own-appstore">Using Your Own Appstore</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_wizard.html">Installation Wizard</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html#required-settings">Required Settings</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html#storage-database">Storage & Database</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html#database-choice">Database Choice</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html#finish-installation">Finish Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html#trusted-domains">Trusted Domains</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="lighttpd_configuration.html">Lighttpd Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="macos_installation.html">Mac OS X</a></li>
- <li class="toctree-l1"><a class="reference internal" href="nginx_configuration.html">Nginx Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="nginx_configuration.html">Nginx Configuration</a><ul>
++<li class="toctree-l2"><a class="reference internal" href="nginx_configuration.html#suppressing-log-messages">Suppressing Log Messages</a></li>
++<li class="toctree-l2"><a class="reference internal" href="nginx_configuration.html#javascript-js-or-css-css-files-not-served-properly">JavaScript (.js) or CSS (.css) files not served properly</a></li>
++</ul>
++</li>
+<li class="toctree-l1"><a class="reference internal" href="others_installation.html">Other Installation Methods</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="others_installation.html#pagekite-configuration">PageKite Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="source_installation.html">Manual Installation on Linux</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#prerequisites">Prerequisites</a></li>
++<li class="toctree-l2"><a class="reference internal" href="source_installation.html#red-hat-enterprise-linux-6-centos-6-and-php-5-4">Red Hat Enterprise Linux 6, CentOS 6, and PHP 5.4</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#example-installation-on-ubuntu-14-04-lts-server">Example installation on Ubuntu 14.04 LTS Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#installation-wizard">Installation Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#selinux">SELinux</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#configuration-notes-to-php-ini-files">Configuration notes to php.ini files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#apache-web-server-configuration">Apache Web Server Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#enabling-ssl">Enabling SSL</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#configuring-owncloud">Configuring ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html#other-web-servers">Other Web Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="ucs_installation.html">Univention Corporate Server</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html#pre-configuration">Pre configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html#installation">Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html#postconfiguration-optional">Postconfiguration (optional)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html#using-owncloud">Using ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="windows_installation.html">Windows 7 and Windows Server 2008</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html#activate-iis-with-cgi-support">Activate IIS with CGI Support</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html#installing-php">Installing PHP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html#installing-mysql">Installing MySQL</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html#installing-owncloud">Installing ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html#ensure-proper-http-verb-handling">Ensure Proper HTTP-Verb Handling</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html#configuring-owncloud-php-and-iis-for-large-file-uploads">Configuring ownCloud, PHP and IIS for Large File Uploads</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="selinux_configuration.html">SELinux Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html#allow-access-to-a-remote-database">Allow access to a remote database</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html#allow-access-to-ldap-server">Allow access to LDAP server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html#allow-access-to-remote-network">Allow access to remote network</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html#allow-access-to-smtp-sendmail">Allow access to SMTP/sendmail</a></li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/installation/installation_wizard.html
index eed137b,0000000..2c8e769
mode 100644,000000..100644
--- a/core/doc/admin/release/installation/installation_wizard.html
+++ b/core/doc/admin/release/installation/installation_wizard.html
@@@ -1,360 -1,0 +1,361 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Installation Wizard — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Lighttpd Configuration" href="lighttpd_configuration.html" />
+ <link rel="prev" title="Hiawatha Configuration" href="hiawatha_configuration.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html">Preferred Linux Installation Method</a></li>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html">ownCloud Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html">Installing and Managing Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Installation Wizard</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#required-settings">Required Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#storage-database">Storage & Database</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#database-choice">Database Choice</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#finish-installation">Finish Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#trusted-domains">Trusted Domains</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="lighttpd_configuration.html">Lighttpd Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="macos_installation.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="nginx_configuration.html">Nginx Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="others_installation.html">Other Installation Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html">Manual Installation on Linux</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html">SELinux Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="installation-wizard">
+<h1>Installation Wizard<a class="headerlink" href="#installation-wizard" title="Permalink to this headline">¶</a></h1>
+<p>When ownCloud prerequisites are fulfilled and all ownCloud files are installed
+on the server, the last step to complete the installation is
+running the Installation Wizard. Open your Web browser to your new ownCloud
+installation.</p>
+<blockquote>
+<div><ul class="simple">
+<li>If you are installing ownCloud on the same machine as you are accessing the
+install wizard from, the URL will be <tt class="docutils literal"><span class="pre">http://localhost/owncloud</span></tt>, or <tt class="docutils literal"><span class="pre">https://localhost/owncloud</span></tt> if you have enabled SSL.</li>
+<li>If you are installing ownCloud on a different machine, you’ll have to access
+it by its hostname or IP address, e.g. <tt class="docutils literal"><span class="pre">http://example.com/owncloud</span></tt>.</li>
+<li>If you are using a self-signed certificate, you will be presented with a
+security warning about the issuer of the certificate not being trusted which
+you can ignore.</li>
+</ul>
+</div></blockquote>
+<ul class="simple">
+<li>You will be presented with the setup screen:</li>
+</ul>
+<a class="reference internal image-reference" href="../_images/install-wizard.png"><img alt="../_images/install-wizard.png" src="../_images/install-wizard.png" style="width: 261.75px; height: 418.5px;" /></a>
+<div class="section" id="required-settings">
+<h2>Required Settings<a class="headerlink" href="#required-settings" title="Permalink to this headline">¶</a></h2>
+<p>Under <tt class="docutils literal"><span class="pre">create</span> <span class="pre">an</span> <span class="pre">admin</span> <span class="pre">account</span></tt> you must enter a username and
+password for the administrative user account. You may choose any username and
+password that you want.</p>
+</div>
+<div class="section" id="storage-database">
+<h2>Storage & Database<a class="headerlink" href="#storage-database" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Click <tt class="docutils literal"><span class="pre">Storage</span> <span class="pre">&</span> <span class="pre">Database</span></tt> to see all of your database options, and to
+optionally change the default data storage directory.</li>
+<li>The database you want to use must already be installed, and you must have a
+database admin user and password.</li>
+<li>Enter any arbitrary name for the Database name. This must be a database that
+does not already exist.</li>
+<li>If you are not using Apache as the web server, it is highly
+recommended to configure the data directory to a location outside of
+the document root. Otherwise all user data is potentially publicly
+visible!</li>
+</ul>
+<a class="reference internal image-reference" href="../_images/install-wizard-advanced.png"><img alt="../_images/install-wizard-advanced.png" src="../_images/install-wizard-advanced.png" style="width: 329.25px; height: 541.5px;" /></a>
+</div>
+<div class="section" id="database-choice">
+<h2>Database Choice<a class="headerlink" href="#database-choice" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>For a guideline on which database system to choose, and on pointers how to
+set them up for being available for PHP/ownCloud, see
+<a class="reference internal" href="../configuration/database_configuration.html"><em>Database Configuration</em></a></li>
+<li>Note that you will only be able to choose among the PHP database connectors
+which are actually installed on the system.</li>
+<li>It is not easily possible to migrate to another database system once you have
+set up your ownCloud to use a specific one. So make sure to carefully
+consider which database system to use.</li>
+<li>When using MySQL/MariaDB or PostgreSQL you have two options regarding the database
+name and user account you specify:<ul>
+<li>You can specify either an admin or the root user, and the name of a database
+which does not yet exist. This lets ownCloud create its own database; it
+will also create a database user account with restricted rights (with the
+same username as you specified for the administrative user, plus an
+<tt class="docutils literal"><span class="pre">oc_</span></tt> prefix) and will use that for all subsequent database access.</li>
+<li>There are restrictions as to what characters a database name may or may
+not contain; see the
+<a class="reference external" href="http://dev.mysql.com/doc/refman/5.5/en/identifiers.html">MySQL Schema Object Names documentation</a> for details);</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="finish-installation">
+<h2>Finish Installation<a class="headerlink" href="#finish-installation" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Once you’ve entered all settings, click “Finish Setup”</li>
+<li>ownCloud will set up your cloud according to the given settings</li>
+<li>When it’s finished, it will log you in as administrative user and present the
+“Welcome to ownCloud” screen.</li>
+</ul>
+</div>
+<div class="section" id="setting-strong-directory-permissions">
+<h2>Setting Strong Directory Permissions<a class="headerlink" href="#setting-strong-directory-permissions" title="Permalink to this headline">¶</a></h2>
+<p>For hardened security we recommend setting the permissions on your ownCloud
+directory as strictly as possible. This should be done immediately after the
+initial installation. Your HTTP user must own the <tt class="docutils literal"><span class="pre">config/</span></tt>, <tt class="docutils literal"><span class="pre">data/</span></tt> and
+<tt class="docutils literal"><span class="pre">apps/</span></tt> directories in your ownCloud directory so that you can configure
+ownCloud, create, modify and delete your data files, and install apps via the
+ownCloud Web interface.</p>
+<p>You can find your HTTP user in your HTTP server configuration files. Or you can
+create a PHP page to find it for you. To do this, create a plain text file with
+the following lines in it:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="k">echo</span> <span class="s2">"User: "</span> <span class="o">.</span> <span class="nb">exec</span><span class="p">(</span><span class="s1">'whoami'</span><span class="p">);</span>
+<span class="k">echo</span> <span class="s2">"Group: "</span> <span class="o">.</span> <span class="nb">exec</span><span class="p">(</span><span class="s1">'groups'</span><span class="p">);</span>
+<span class="cp">?></span><span class="x"></span>
+</pre></div>
+</div>
+<p>If the exec php function is disabled (getting a white page with the script above)
+you can also try to use a script like:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$processUser</span> <span class="o">=</span> <span class="nb">posix_getpwuid</span><span class="p">(</span><span class="nb">posix_geteuid</span><span class="p">());</span>
+<span class="k">echo</span> <span class="s2">"User: "</span> <span class="o">.</span> <span class="nv">$processUser</span><span class="p">[</span><span class="s1">'name'</span><span class="p">];</span>
+<span class="nv">$processGroup</span> <span class="o">=</span> <span class="nb">posix_getgrgid</span><span class="p">(</span><span class="nv">$processUser</span><span class="p">[</span><span class="s1">'gid'</span><span class="p">]);</span>
+<span class="k">echo</span> <span class="s2">" Group: "</span> <span class="o">.</span> <span class="nv">$processGroup</span><span class="p">[</span><span class="s1">'name'</span><span class="p">];</span>
+<span class="cp">?></span><span class="x"></span>
+</pre></div>
+</div>
+<p>Name it <tt class="docutils literal"><span class="pre">whoami.php</span></tt> and place it in your <tt class="docutils literal"><span class="pre">/var/www/html</span></tt> directory, and
+then open it in a Web browser, for example <tt class="docutils literal"><span class="pre">http://localhost/whoami.php</span></tt>. You
+should see a single line in your browser page with the HTTP user name.</p>
+<ul class="simple">
+<li>The HTTP user and group in Debian/Ubuntu is <tt class="docutils literal"><span class="pre">www-data</span></tt>.</li>
+<li>The HTTP user and group in Fedora/CentOS is <tt class="docutils literal"><span class="pre">apache</span></tt>.</li>
+<li>The HTTP user and group in Arch Linux is <tt class="docutils literal"><span class="pre">http</span></tt>.</li>
+<li>The HTTP user in openSUSE is <tt class="docutils literal"><span class="pre">wwwrun</span></tt>, and the HTTP group is <tt class="docutils literal"><span class="pre">www</span></tt>.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">When using an NFS mount for the data directory, do not change its
+ownership from the default. The simple act of mounting the drive will set
+proper permissions for ownCloud to write to the directory. Changing
+ownership as above could result in some issues if the NFS mount is
+lost.</p>
+</div>
+<p>The easy way to set the correct permissions is to copy and run this script. Replace the <tt class="docutils literal"><span class="pre">ocpath</span></tt> variable with the path to your ownCloud directory, and replace the <tt class="docutils literal"><span class="pre">htuser</span></tt> and <tt class="docutils literal"><span class="pre">htgroup</span></tt> variables with your HTTP user and group:</p>
+<div class="highlight-python"><pre>#!/bin/bash
+ocpath='/var/www/owncloud'
+htuser='www-data'
+htgroup='www-data'
++rootuser='root' # On QNAP this is admin
+
+find ${ocpath}/ -type f -print0 | xargs -0 chmod 0640
+find ${ocpath}/ -type d -print0 | xargs -0 chmod 0750
+
- chown -R root:${htuser} ${ocpath}/
++chown -R ${rootuser}:${htgroup} ${ocpath}/
+chown -R ${htuser}:${htgroup} ${ocpath}/apps/
+chown -R ${htuser}:${htgroup} ${ocpath}/config/
+chown -R ${htuser}:${htgroup} ${ocpath}/data/
+chown -R ${htuser}:${htgroup} ${ocpath}/themes/
+
- chown root:${htuser} ${ocpath}/.htaccess
- chown root:${htuser} ${ocpath}/data/.htaccess
++chown ${rootuser}:${htgroup} ${ocpath}/.htaccess
++chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess
+
+chmod 0644 ${ocpath}/.htaccess
+chmod 0644 ${ocpath}/data/.htaccess</pre>
+</div>
+<p>If you have customized your ownCloud installation and your filepaths are
+different than the standard installation, then modify this script accordingly.</p>
+<p>This lists the recommended modes and ownership for your ownCloud directories
+and files:</p>
+<ul class="simple">
+<li>All files should be read-write for the file owner, read-only for the
+group owner, and zero for the world</li>
+<li>All directories should be executable (because directories always need the
+executable bit set), read-write for the directory owner, and read-only for
+the group owner</li>
+<li>The <tt class="file docutils literal"><span class="pre">/</span></tt> directory should be owned by <tt class="docutils literal"><span class="pre">root:[HTTP</span> <span class="pre">group]</span></tt></li>
+<li>The <tt class="file docutils literal"><span class="pre">apps/</span></tt> directory should be owned by <tt class="docutils literal"><span class="pre">[HTTP</span> <span class="pre">user]:[HTTP</span> <span class="pre">group]</span></tt></li>
+<li>The <tt class="file docutils literal"><span class="pre">config/</span></tt> directory should be owned by <tt class="docutils literal"><span class="pre">[HTTP</span> <span class="pre">user]:[HTTP</span> <span class="pre">group]</span></tt></li>
+<li>The <tt class="file docutils literal"><span class="pre">themes/</span></tt> directory should be owned by <tt class="docutils literal"><span class="pre">[HTTP</span> <span class="pre">user]:[HTTP</span> <span class="pre">group]</span></tt></li>
+<li>The <tt class="file docutils literal"><span class="pre">data/</span></tt> directory should be owned by <tt class="docutils literal"><span class="pre">[HTTP</span> <span class="pre">user]:[HTTP</span> <span class="pre">group]</span></tt></li>
+<li>The <tt class="file docutils literal"><span class="pre">[ocpath]/.htaccess</span></tt> file should be owned by <tt class="docutils literal"><span class="pre">root:[HTTP</span> <span class="pre">group]</span></tt></li>
+<li>The <tt class="file docutils literal"><span class="pre">data/.htaccess</span></tt> file should be owned by <tt class="docutils literal"><span class="pre">root:[HTTP</span> <span class="pre">group]</span></tt></li>
+<li>Both <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> files are read-write file owner, read-only group and
+world</li>
+</ul>
+</div>
+<div class="section" id="trusted-domains">
+<h2>Trusted Domains<a class="headerlink" href="#trusted-domains" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud will take the URL used to access the Installation Wizard and insert
+that into the <tt class="docutils literal"><span class="pre">config.php</span></tt> file for the <tt class="docutils literal"><span class="pre">trusted_domains</span></tt> setting.
+All needed domain names of the ownCloud server go into the
+<tt class="docutils literal"><span class="pre">trusted_domains</span></tt> setting. Users will only be able to log into ownCloud when they point their browsers to a domain name listed in the <tt class="docutils literal"><span class="pre">trusted_domains</span></tt> setting. An IPv4 address can be
+specified instead of a domain name. A typical configuration looks like this:</p>
+<div class="highlight-python"><pre>'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'server1',
+ 2 => '192.168.1.50',
+),</pre>
+</div>
+<p>In the event that a load balancer is in place there will be no issues as long
+as it sends the correct X-Forwarded-Host header.</p>
+<p>The loopback address, <tt class="docutils literal"><span class="pre">127.0.0.1</span></tt>, is whitelisted and
+therefore users on the ownCloud server who access ownCloud with the loopback
+interface will be able to successfully login.
+In the event that an improper URL is used, the
+following error will appear:</p>
+<a class="reference internal image-reference" href="../_images/untrusted-domain.png"><img alt="../_images/untrusted-domain.png" src="../_images/untrusted-domain.png" style="width: 725.25px; height: 272.25px;" /></a>
+<p>For configuration examples, refer to the <tt class="file docutils literal"><span class="pre">config/config.sample.php</span></tt>
+document.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/installation/nginx_configuration.html
index 43ce02c,0000000..30d486d
mode 100644,000000..100644
--- a/core/doc/admin/release/installation/nginx_configuration.html
+++ b/core/doc/admin/release/installation/nginx_configuration.html
@@@ -1,284 -1,0 +1,313 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Nginx Configuration — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Other Installation Methods" href="others_installation.html" />
+ <link rel="prev" title="Mac OS X" href="macos_installation.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html">Preferred Linux Installation Method</a></li>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html">ownCloud Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html">Installing and Managing Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html">Installation Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="lighttpd_configuration.html">Lighttpd Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="macos_installation.html">Mac OS X</a></li>
- <li class="toctree-l2 current"><a class="current reference internal" href="">Nginx Configuration</a></li>
++<li class="toctree-l2 current"><a class="current reference internal" href="">Nginx Configuration</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#suppressing-log-messages">Suppressing Log Messages</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#javascript-js-or-css-css-files-not-served-properly">JavaScript (.js) or CSS (.css) files not served properly</a></li>
++</ul>
++</li>
+<li class="toctree-l2"><a class="reference internal" href="others_installation.html">Other Installation Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html">Manual Installation on Linux</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html">SELinux Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="nginx-configuration">
+<h1>Nginx Configuration<a class="headerlink" href="#nginx-configuration" title="Permalink to this headline">¶</a></h1>
+<ul class="simple">
+<li>You need to insert the following code into <strong>your nginx config file.</strong></li>
+<li>The config assumes that ownCloud is installed in /var/www/owncloud and
+that it is accessed via http(s)://cloud.example.com.</li>
+<li>Adjust <strong>server_name</strong>, <strong>root</strong>, <strong>ssl_certificate</strong> and
+<strong>ssl_certificate_key</strong> to suit your needs.</li>
+<li>Make sure your SSL certificates are readable by the server (see <a class="reference external" href="http://wiki.nginx.org/HttpSslModule">Nginx HTTP
+SSL Module documentation</a>).</li>
+</ul>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The following example assumes that your ownCloud is installed in
+your webroot. If you’re using a subfolder you need to adjust the configuration
+accordingly.</p>
+</div>
+</div></blockquote>
+<div class="highlight-python"><pre>upstream php-handler {
+ server 127.0.0.1:9000;
+ #server unix:/var/run/php5-fpm.sock;
- }
++}
+
+server {
+ listen 80;
+ server_name cloud.example.com;
+ # enforce https
+ return 301 https://$server_name$request_uri;
- }
++}
+
+server {
+ listen 443 ssl;
+ server_name cloud.example.com;
+
+ ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
+ ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
+
+ # Path to the root of your installation
+ root /var/www/owncloud/;
+ # set max upload size
+ client_max_body_size 10G;
+ fastcgi_buffers 64 4K;
+
+ # Disable gzip to avoid the removal of the ETag header
+ gzip off;
+
+ # Uncomment if your server is build with the ngx_pagespeed module
+ # This module is currently not supported.
+ #pagespeed off;
+
+ rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
+ rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
+ rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
+
+ index index.php;
+ error_page 403 /core/templates/403.php;
+ error_page 404 /core/templates/404.php;
+
+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
- }
++ }
+
+ location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){
+ deny all;
- }
++ }
+
+ location / {
- # The following 2 rules are only needed with webfinger
- rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
- rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
-
- rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
- rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
-
- rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
-
- try_files $uri $uri/ /index.php;
- }
-
- location ~ \.php(?:$|/) {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param PATH_INFO $fastcgi_path_info;
- fastcgi_param HTTPS on;
- fastcgi_pass php-handler;
- }
-
- # Optional: set long EXPIRES header on static assets
- location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
- expires 30d;
- # Optional: Don't log access to assets
- access_log off;
- }
-
- }</pre>
++ # The following 2 rules are only needed with webfinger
++ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
++ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
++
++ rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
++ rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
++
++ rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
++
++ try_files $uri $uri/ /index.php;
++ }
++
++ location ~ \.php(?:$|/) {
++ fastcgi_split_path_info ^(.+\.php)(/.+)$;
++ include fastcgi_params;
++ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
++ fastcgi_param PATH_INFO $fastcgi_path_info;
++ fastcgi_param HTTPS on;
++ fastcgi_pass php-handler;
++ }
++
++ # Optional: set long EXPIRES header on static assets
++ location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
++ expires 30d;
++ # Optional: Don't log access to assets
++ access_log off;
++ }
++}</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can use ownCloud over plain http, but we strongly encourage you to
+use SSL/TLS to encrypt all of your server traffic, and to protect
+user’s logins and data in transit.</p>
+</div>
+<ul class="simple">
+<li>Remove the server block containing the redirect</li>
+<li>Change <strong>listen 443 ssl</strong> to <strong>listen 80;</strong></li>
+<li>Remove <strong>ssl_certificate</strong> and <strong>ssl_certificate_key</strong>.</li>
+<li>Remove <strong>fastcgi_params HTTPS on;</strong></li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you want to effectively increase maximum upload size you will also
+have to modify your <strong>php-fpm configuration</strong> (<strong>usually at
+/etc/php5/fpm/php.ini</strong>) and increase <strong>upload_max_filesize</strong> and
+<strong>post_max_size</strong> values. You’ll need to restart php5-fpm and nginx
+services in order these changes to be applied.</p>
+</div>
++<div class="section" id="suppressing-log-messages">
++<h2>Suppressing Log Messages<a class="headerlink" href="#suppressing-log-messages" title="Permalink to this headline">¶</a></h2>
++<p>If you’re seeing meaningless messages in your logfile, for example <a class="reference external" href="https://forum.owncloud.org/viewtopic.php?f=17&t=20217">client
++denied by server configuration: /var/www/data/htaccesstest.txt</a>, add this section to
++your Nginx configuration to suppress them:</p>
++<div class="highlight-python"><pre>location = /data/htaccesstest.txt {
++ allow all;
++ log_not_found off;
++ access_log off;
++}</pre>
++</div>
++</div>
++<div class="section" id="javascript-js-or-css-css-files-not-served-properly">
++<h2>JavaScript (.js) or CSS (.css) files not served properly<a class="headerlink" href="#javascript-js-or-css-css-files-not-served-properly" title="Permalink to this headline">¶</a></h2>
++<p>A common issue with custom nginx configs is that JavaScript (.js)
++or CSS (.css) files are not served properly leading to a 404 (File not found)
++error on those files and a broken webinterface.</p>
++<p>This could be caused by the:</p>
++<div class="highlight-python"><pre>location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {</pre>
++</div>
++<p>block shown above not located <strong>below</strong> the:</p>
++<div class="highlight-python"><pre>location ~ \.php(?:$|/) {</pre>
++</div>
++<p>block. Other custom configurations like caching JavaScript (.js)
++or CSS (.css) files via gzip could also cause such issues.</p>
++</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/installation/source_installation.html
index 4fbc988,0000000..91baeab
mode 100644,000000..100644
--- a/core/doc/admin/release/installation/source_installation.html
+++ b/core/doc/admin/release/installation/source_installation.html
@@@ -1,550 -1,0 +1,616 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Manual Installation on Linux — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Univention Corporate Server" href="ucs_installation.html" />
+ <link rel="prev" title="Other Installation Methods" href="others_installation.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html">Preferred Linux Installation Method</a></li>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html">ownCloud Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html">Installing and Managing Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html">Installation Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="lighttpd_configuration.html">Lighttpd Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="macos_installation.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="nginx_configuration.html">Nginx Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="others_installation.html">Other Installation Methods</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Manual Installation on Linux</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#prerequisites">Prerequisites</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#red-hat-enterprise-linux-6-centos-6-and-php-5-4">Red Hat Enterprise Linux 6, CentOS 6, and PHP 5.4</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-installation-on-ubuntu-14-04-lts-server">Example installation on Ubuntu 14.04 LTS Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#installation-wizard">Installation Wizard</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#selinux">SELinux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#configuration-notes-to-php-ini-files">Configuration notes to php.ini files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#apache-web-server-configuration">Apache Web Server Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#enabling-ssl">Enabling SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#configuring-owncloud">Configuring ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#other-web-servers">Other Web Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="windows_installation.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html">SELinux Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="manual-installation-on-linux">
+<h1>Manual Installation on Linux<a class="headerlink" href="#manual-installation-on-linux" title="Permalink to this headline">¶</a></h1>
- <p>Installing ownCloud on Linux from the openSUSE Build Service packages is the preferred method (see <a class="reference internal" href="linux_installation.html"><em>Preferred Linux Installation Method</em></a>). These are maintained by ownCloud engineers, and you can use your package manager to keep your ownCloud server up-to-date.</p>
- <p>If there are no packages for your Linux distribution, or you prefer installing from sources, you can setup ownCloud from scratch using a classic LAMP stack (Linux, Apache, MySQL/MariaDB, PHP). This document provides a complete walk-through for installing ownCloud on Ubuntu
++<p>Installing ownCloud on Linux from the openSUSE Build Service packages is the
++preferred method (see <a class="reference internal" href="linux_installation.html"><em>Preferred Linux Installation Method</em></a>). These are maintained by
++ownCloud engineers, and you can use your package manager to keep your ownCloud
++server up-to-date. If there are no packages for your Linux distribution, or you
++prefer installing from sources, you can setup ownCloud from scratch using a
++classic LAMP stack (Linux, Apache, MySQL/MariaDB, PHP). This document provides a
++complete walk-through for installing ownCloud on Ubuntu
+14.04 LTS Server with Apache and MySQL.</p>
+<div class="section" id="prerequisites">
+<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This tutorial assumes you have terminal access to the machine you want
+to install ownCloud on. Although this is not an absolute requirement,
+installation without it is likely to require contacting your
- hoster (e.g. for installing required modules). Consult the <a class="reference external" href="http://php.net/manual/en/extensions.php">PHP manual</a> for information on modules. Your Linux distribution should have packages for all required modules.</p>
++hoster (e.g. for installing required modules). Consult the <a class="reference external" href="http://php.net/manual/en/extensions.php">PHP manual</a> for information on
++modules.Your Linux distribution should have packages for all
++required modules.</p>
+</div>
+<p>To run ownCloud, your web server must have the following installed:</p>
+<ul class="simple">
- <li>php5 (>= 5.3.8, minimum recommended 5.4)</li>
++<li>php5 (>= 5.3.8, we highly recommended 5.4+ as 5.3 is old and has many
++problems. See <a class="reference internal" href="#label-rhel6-php54"><em>Red Hat Enterprise Linux 6, CentOS 6, and PHP 5.4</em></a>)</li>
+<li>PHP module ctype</li>
+<li>PHP module dom</li>
+<li>PHP module GD</li>
+<li>PHP module iconv</li>
+<li>PHP module JSON</li>
+<li>PHP module libxml</li>
+<li>PHP module mb multibyte</li>
+<li>PHP module SimpleXML</li>
+<li>PHP module XMLWriter</li>
+<li>PHP module zip</li>
+<li>PHP module zlib</li>
+</ul>
+<p>Database connectors (pick at least one):</p>
+<ul class="simple">
+<li>PHP module sqlite (>= 3, usually not recommended for performance reasons)</li>
+<li>PHP module mysql</li>
+<li>PHP module pgsql (requires PostgreSQL >= 9.0)</li>
+</ul>
+<p><em>Recommended</em> packages:</p>
+<ul class="simple">
+<li>PHP module curl (highly recommended, some functionality, e.g. http user
+authentication, depends on this)</li>
+<li>PHP module fileinfo (highly recommended, enhances file analysis performance)</li>
+<li>PHP module bz2 (recommended, required for extraction of apps)</li>
+<li>PHP module intl (increases language translation performance and fixes sorting
+of non-ASCII characters)</li>
+<li>PHP module mcrypt (increases file encryption performance)</li>
+<li>PHP module openssl (required for accessing HTTPS resources)</li>
+</ul>
+<p>Required for specific apps:</p>
+<ul class="simple">
+<li>PHP module ldap (for LDAP integration)</li>
+<li>smbclient (for SMB storage / external user authentication)</li>
+<li>PHP module ftp (for FTP storage / external user authentication)</li>
+<li>PHP module imap (for external user authentication)</li>
+</ul>
+<p>Recommended for specific apps (<em>optional</em>):</p>
+<ul class="simple">
+<li>PHP module exif (for image rotation in pictures app)</li>
+<li>PHP module gmp (for SFTP storage)</li>
+</ul>
+<p>For enhanced server performance (<em>optional</em> / select only one of the following):</p>
+<ul class="simple">
+<li>PHP module apc</li>
+<li>PHP module apcu</li>
+<li>PHP module xcache</li>
+</ul>
+<p>For preview generation (<em>optional</em>):</p>
- <ul class="simple">
- <li>PHP module imagick</li>
- <li>avconv or ffmpeg</li>
- <li>OpenOffice or LibreOffice</li>
- </ul>
- <p><strong>Remarks:</strong></p>
+<ul>
++<li><p class="first">PHP module imagick</p>
++</li>
++<li><p class="first">avconv or ffmpeg</p>
++</li>
++<li><p class="first">OpenOffice or LibreOffice</p>
++</li>
+<li><p class="first">Please check your distribution, operating system or hosting partner
+documentation on how to install and enable these modules.</p>
+</li>
+<li><p class="first">Make sure your distribution’s PHP version fulfills the version requirements
+specified above. If it doesn’t, there might be custom repositories you can
+use. If you are e.g. running Ubuntu 10.04 LTS, you can update your PHP using
+a custom <a class="reference external" href="https://launchpad.net/~ondrej/+archive/php5">PHP PPA</a>:</p>
+<div class="highlight-python"><pre>sudo add-apt-repository ppa:ondrej/php5
+sudo apt-get update
+sudo apt-get install php5</pre>
+</div>
+</li>
+<li><p class="first">You don’t need the WebDAV module for your web server (i.e. Apache’s
+<tt class="docutils literal"><span class="pre">mod_webdav</span></tt>) to access your ownCloud data via WebDAV. ownCloud has a built-in
+WebDAV server of its own, SabreDAV.</p>
+</li>
+</ul>
+</div>
++<div class="section" id="red-hat-enterprise-linux-6-centos-6-and-php-5-4">
++<span id="label-rhel6-php54"></span><h2>Red Hat Enterprise Linux 6, CentOS 6, and PHP 5.4<a class="headerlink" href="#red-hat-enterprise-linux-6-centos-6-and-php-5-4" title="Permalink to this headline">¶</a></h2>
++<p>RHEL 6 and CentOS still ship with PHP 5.3.x. It is highly recommended to
++upgrade to 5.4 because 5.3.x has many deprecated functions, and will cause
++problems with your ownCloud installation. To upgrade to PHP 5.4 without
++violating your RHEL support agreement you must use the Software Collections
++(SCL) repository. Follow these steps on RHEL 6:</p>
++<div class="highlight-python"><pre>subscription-manager repos --enable rhel-server-rhscl-6-eus-rpms</pre>
++</div>
++<p>Then install PHP 5.4 and these modules:</p>
++<div class="highlight-python"><pre>yum install php54 php54-php php54-php-gd php54-php-mbstring</pre>
++</div>
++<p>You must also install the updated database module for your database. This
++installs the new PHP 5.4 module for MySQL/MariaDB:</p>
++<div class="highlight-python"><pre>yum install php54-php-mysqlnd</pre>
++</div>
++<p>Activate the new PHP version permanently:</p>
++<div class="highlight-python"><div class="highlight"><pre><span class="n">source</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">rh</span><span class="o">/</span><span class="n">php54</span><span class="o">/</span><span class="n">enable</span>
++</pre></div>
++</div>
++<p>Disable loading the old PHP 5.3 Apache module:</p>
++<div class="highlight-python"><div class="highlight"><pre><span class="n">mv</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">httpd</span><span class="o">/</span><span class="n">conf</span><span class="o">.</span><span class="n">d</span><span class="o">/</span><span class="n">php</span><span class="o">.</span><span class="n">conf</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">httpd</span><s [...]
++</pre></div>
++</div>
++<p>You should have a <tt class="docutils literal"><span class="pre">/etc/httpd/conf.d/php54-php.conf</span></tt> file, which loads the
++correct PHP 5.4 module for Apache.</p>
++<p>Then restart Apache:</p>
++<div class="highlight-python"><pre>service httpd restart</pre>
++</div>
++<p>Verify with <tt class="docutils literal"><span class="pre">phpinfo</span></tt> that your Apache server is using PHP 5.4 and loading
++the correct modules.</p>
++<p>The steps for CentOS 6 are slightly different. First install the SCL repo:</p>
++<div class="highlight-python"><pre>yum install centos-release-SCL</pre>
++</div>
++<p>Then install PHP 5.4 and these modules:</p>
++<div class="highlight-python"><pre>yum install php54 php54-php php54-php-gd php54-php-mbstring</pre>
++</div>
++<p>You must also install the updated database module. This installs the new PHP 5.4
++module for MySQL/MariaDB:</p>
++<div class="highlight-python"><pre>yum install php54-php-mysqlnd</pre>
++</div>
++<p>Activate the new PHP version permanently:</p>
++<div class="highlight-python"><div class="highlight"><pre><span class="n">source</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">rh</span><span class="o">/</span><span class="n">php54</span><span class="o">/</span><span class="n">enable</span>
++</pre></div>
++</div>
++<p>Disable loading the old PHP 5.3 Apache module:</p>
++<div class="highlight-python"><div class="highlight"><pre><span class="n">mv</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">httpd</span><span class="o">/</span><span class="n">conf</span><span class="o">.</span><span class="n">d</span><span class="o">/</span><span class="n">php</span><span class="o">.</span><span class="n">conf</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">httpd</span><s [...]
++</pre></div>
++</div>
++<p>You should now have a /etc/httpd/conf.d/php54-php.conf file, which loads the
++correct PHP 5.4 module for Apache.</p>
++<p>Finally, restart Apache:</p>
++<div class="highlight-python"><pre>service httpd restart</pre>
++</div>
++<p>Verify with <tt class="docutils literal"><span class="pre">phpinfo</span></tt> that your Apache server is using PHP 5.4 and loading
++the correct module.</p>
++</div>
+<div class="section" id="example-installation-on-ubuntu-14-04-lts-server">
+<h2>Example installation on Ubuntu 14.04 LTS Server<a class="headerlink" href="#example-installation-on-ubuntu-14-04-lts-server" title="Permalink to this headline">¶</a></h2>
+<p>On a machine running a pristine Ubuntu 14.04 LTS server, install the
+required and recommended modules for a typical ownCloud installation, using
+Apache and MariaDB, by issuing the following commands in a terminal:</p>
+<div class="highlight-python"><pre>apt-get install apache2 mariadb-server libapache2-mod-php5
+apt-get install php5-gd php5-json php5-mysql php5-curl
+apt-get install php5-intl php5-mcrypt php5-imagick</pre>
+</div>
+<ul class="simple">
+<li>This installs the packages for the ownCloud core system. If you are planning
+on running additional apps, keep in mind that they might require additional
+packages. See the Prerequisites section (above) for details.</li>
+<li>At the execution of each of the above commands you might be prompted whether
+you want to continue; press “Y” for Yes (that is if your system language is
+English. You might have to press a different key if you have a different
+system language).</li>
+<li>At the installation of the MySQL server, you will be prompted to create a root
+password. Be sure to remember the password you enter there for later use
+as you will need it during ownCloud database setup.</li>
+</ul>
+<p>Now download the archive of the latest ownCloud version:</p>
+<ul>
+<li><p class="first">Go to the <a class="reference external" href="http://owncloud.org/install">ownCloud Installation Page</a>.</p>
+</li>
+<li><p class="first">Click the <strong>Archive file for server owners</strong> button.</p>
+</li>
+<li><p class="first">Click <strong>Download Unix</strong>.</p>
+</li>
+<li><p class="first">This downloads a file named owncloud-x.y.z.tar.bz2 (where
+x.y.z is the version number of the current latest version).</p>
+</li>
+<li><p class="first">Save this file on the machine you want to install ownCloud on.</p>
+</li>
+<li><p class="first">Verify the MD5 or SHA256 sum:</p>
+<div class="highlight-python"><pre>md5sum owncloud-x.y.z.tar.bz2
+sha256sum owncloud-x.y.z.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">You may also verify the PGP signature:</p>
+<div class="highlight-python"><pre>wget https://download.owncloud.org/community/owncloud-x.y.z.tar.bz2.asc
+wget https://www.owncloud.org/owncloud.asc
+gpg --import owncloud.asc
+gpg --verify owncloud-x.y.z.tar.bz2.asc owncloud-x.y.z.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">Now you can extract the archive contents. Open a terminal, navigate to your
+download directory, and run:</p>
+<div class="highlight-python"><pre>tar -xjf owncloud-x.y.z.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">Copy the ownCloud files to their final destination in the document root of
+your web server:</p>
+<div class="highlight-python"><pre>cp -r owncloud /path/to/webserver/document-root</pre>
+</div>
+<p>where <tt class="docutils literal"><span class="pre">/path/to/webserver/document-root</span></tt> is replaced by the
+document root of your Web server. On Ubuntu systems this
+<tt class="docutils literal"><span class="pre">/var/www/owncloud</span></tt>, so your copying command is:</p>
+<div class="highlight-python"><pre>cp -r owncloud /var/www/</pre>
+</div>
+</li>
+</ul>
+</div>
+<div class="section" id="installation-wizard">
+<h2>Installation Wizard<a class="headerlink" href="#installation-wizard" title="Permalink to this headline">¶</a></h2>
+<p>Finish setting up your ownCloud server by following
+the <a class="reference internal" href="installation_wizard.html"><em>Installation Wizard</em></a>.</p>
+<p>After running the Installation Wizard your ownCloud installation is complete.
+However, you should perform the following steps to improve your server’s
+security.</p>
+</div>
+<div class="section" id="setting-strong-directory-permissions">
+<h2>Setting Strong Directory Permissions<a class="headerlink" href="#setting-strong-directory-permissions" title="Permalink to this headline">¶</a></h2>
+<p>We recommend setting the directory permissions in your ownCloud installation as
+strictly as possible for stronger security. Please refer to the <tt class="docutils literal"><span class="pre">Setting</span>
+<span class="pre">Strong</span> <span class="pre">Directory</span> <span class="pre">Permissions</span></tt> section of <a class="reference internal" href="installation_wizard.html"><em>Installation Wizard</em></a>.</p>
+</div>
+<div class="section" id="selinux">
+<h2>SELinux<a class="headerlink" href="#selinux" title="Permalink to this headline">¶</a></h2>
+<p>See <a class="reference internal" href="selinux_configuration.html"><em>SELinux Configuration</em></a> for a suggested configuration for SELinux-enabled distributions such as Fedora and CentOS.</p>
+<p>Apache is the recommended Web server.</p>
+</div>
+<div class="section" id="configuration-notes-to-php-ini-files">
+<h2>Configuration notes to php.ini files<a class="headerlink" href="#configuration-notes-to-php-ini-files" title="Permalink to this headline">¶</a></h2>
+<p>Keep in mind that changes to php.ini may have to be done on more than one ini file. This can be the case, as example, for the <tt class="docutils literal"><span class="pre">date.timezone</span></tt> setting.</p>
+<p><strong>php.ini - used by the webserver:</strong></p>
+<div class="highlight-python"><pre> /etc/php5/apache2/php.ini
+or
+ /etc/php5/fpm/php.ini
+or ...</pre>
+</div>
+<p><strong>php.ini - used by the php-cli and so by ownCloud CRON jobs:</strong></p>
+<div class="highlight-python"><pre>/etc/php5/cli/php.ini</pre>
+</div>
+</div>
+<div class="section" id="apache-web-server-configuration">
+<h2>Apache Web Server Configuration<a class="headerlink" href="#apache-web-server-configuration" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can use ownCloud over plain http, but we strongly encourage you to
+use SSL/TLS to encrypt all of your server traffic, and to protect
+user’s logins and data in transit.</p>
+</div>
+</div>
+<div class="section" id="enabling-ssl">
+<h2>Enabling SSL<a class="headerlink" href="#enabling-ssl" title="Permalink to this headline">¶</a></h2>
+<p>An Apache installed under Ubuntu comes already set-up with a simple
+self-signed certificate. All you have to do is to enable the ssl module and
+the according site. Open a terminal and run:</p>
+<div class="highlight-python"><pre>a2enmod ssl
+a2ensite default-ssl
+service apache2 reload</pre>
+</div>
+<p>If you are using a different distribution, check your documentation on how to
+enable SSL.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Self-signed certificates have their drawbacks - especially when you
+plan to make your ownCloud server publicly accessible. You might want
+to consider getting a certificate signed by commercial signing
+authority. Check with your domain name registrar or hosting service,
+if you’re using one, for good deals on commercial certificates.</p>
+</div>
+</div>
+<div class="section" id="configuring-owncloud">
+<h2>Configuring ownCloud<a class="headerlink" href="#configuring-owncloud" title="Permalink to this headline">¶</a></h2>
+<p>Since there was a change in the way versions 2.2 and 2.4 are configured,
+you’ll have to find out which Apache version you are using.</p>
+<p>Usually you can do this by running one of the following commands:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">apachectl</span> <span class="o">-</span><span class="n">v</span>
+<span class="n">apache2</span> <span class="o">-</span><span class="n">v</span>
+</pre></div>
+</div>
+<p>Example output:</p>
+<div class="highlight-python"><pre>Server version: Apache/2.4.7 (Ubuntu)
+Server built: Jul 22 2014 14:36:38</pre>
+</div>
+<p>Example config for Apache 2.2:</p>
+<div class="highlight-xml"><pre><Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ allow from all
+</Directory></pre>
+</div>
+<p>Example config for Apache 2.4:</p>
+<div class="highlight-xml"><pre><Directory /path/to/owncloud>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Require all granted
+</Directory></pre>
+</div>
+<ul>
+<li><p class="first">This configuration entry needs to go into the configuration file of the
+“site” you want to use.</p>
+</li>
+<li><p class="first">On a Ubuntu system, this typically is the “default-ssl” site (to be found in
+the <tt class="file docutils literal"><span class="pre">/etc/apache2/sites-available/default-ssl.conf</span></tt>).</p>
+</li>
+<li><p class="first">Add the entry shown above immediately before the line containing:</p>
+<div class="highlight-python"><pre></VirtualHost></pre>
+</div>
+<p>(this should be one of the last lines in the file).</p>
+</li>
+<li><p class="first">A minimal site configuration file on Ubuntu 14.04 might look like this:</p>
+</li>
+</ul>
+<div class="highlight-xml"><pre><IfModule mod_ssl.c>
+<VirtualHost _default_:443>
+ ServerName YourServerName
+ ServerAdmin webmaster at localhost
+ DocumentRoot /var/www
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /var/www/>
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ LogLevel warn
+ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+ <Directory /var/www/owncloud>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Allow from all
+ Require all granted
+ Dav Off
+ Satisfy Any
+ </Directory>
+</VirtualHost>
+</IfModule></pre>
+</div>
+<ul>
+<li><p class="first">For ownCloud to work correctly, we need the module <tt class="docutils literal"><span class="pre">mod_rewrite</span></tt>. Enable it
+by running:</p>
+<div class="highlight-python"><pre>a2enmod rewrite</pre>
+</div>
+</li>
+<li><p class="first">In distributions that do not come with <tt class="docutils literal"><span class="pre">a2enmod</span></tt>, the module needs to be
+enabled manually by editing the Apache config files, usually
+<tt class="file docutils literal"><span class="pre">/etc/httpd/httpd.conf</span></tt>. Consult the Apache documentation or your Linux
+distribution’s documentation.</p>
+</li>
+<li><p class="first">In order for the maximum upload size to be configurable, the
+<tt class="file docutils literal"><span class="pre">.htaccess</span></tt> in the ownCloud folder needs to be made writable by the
+server (this should already be done, see section <tt class="docutils literal"><span class="pre">Set</span> <span class="pre">the</span> <span class="pre">Directory</span>
+<span class="pre">Permissions</span></tt>).</p>
+</li>
+<li><p class="first">You should make sure that any built-in WebDAV module of your web server is
+disabled (at least for the ownCloud directory), as it will interfere with
+ownCloud’s built-in WebDAV support.</p>
+<p>If you need the WebDAV support in the rest of your configuration, you can turn
+it off specifically for the ownCloud entry by adding the following line in
+the <tt class="docutils literal"><span class="pre"><Directory</span></tt> section for your ownCloud server. Add the following line
+directly after the <tt class="docutils literal"><span class="pre">allow</span> <span class="pre">from</span> <span class="pre">all</span></tt> / <tt class="docutils literal"><span class="pre">Require</span> <span class="pre">all</span> <span class="pre">granted</span></tt> line:</p>
+<div class="highlight-python"><pre>Dav Off</pre>
+</div>
+</li>
+<li><p class="first">You must disable any server-configured authentication for ownCloud, as it
+uses Basic authentication internally for DAV services. If you have turned on
+authentication on a parent folder (via e.g. an <tt class="docutils literal"><span class="pre">AuthType</span> <span class="pre">Basic</span></tt>
+directive), you can turn off the authentication specifically for the ownCloud
+entry. Following the above example configuration file, add the following line
+directly after the <tt class="docutils literal"><span class="pre">allow</span> <span class="pre">from</span> <span class="pre">all</span></tt> / <tt class="docutils literal"><span class="pre">Require</span> <span class="pre">all</span> <span class="pre">granted</span></tt> line in the
+<tt class="docutils literal"><span class="pre"><Directory</span></tt> section:</p>
+<div class="highlight-python"><pre>Satisfy Any</pre>
+</div>
+</li>
+<li><p class="first">When using ssl, take special note on the ServerName. You should specify one in
+the server configuration, as well as in the CommonName field of the
+certificate. If you want your ownCloud to be reachable via the internet, then
+set both of these to the domain you want to reach your ownCloud server.</p>
+</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">By default, the certificates’ CommonName will be set to the host name
+at the time the ssl-cert package was installed.</p>
+</div>
+<ul>
+<li><p class="first">Finally, restart Apache.</p>
+<ul>
+<li><p class="first">On Ubuntu systems run:</p>
+<div class="highlight-python"><pre>service apache2 restart</pre>
+</div>
+</li>
+<li><p class="first">On systemd systems (Fedora, Arch Linux, OpenSUSE), run:</p>
+<div class="highlight-python"><pre>systemctl restart httpd.service</pre>
+</div>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="other-web-servers">
+<h2>Other Web Servers<a class="headerlink" href="#other-web-servers" title="Permalink to this headline">¶</a></h2>
+<p><strong>Microsoft Internet Information Server (IIS)</strong></p>
+<p>See <a class="reference internal" href="windows_installation.html"><em>Windows 7 and Windows Server 2008</em></a> for further instructions.</p>
+<p><strong>Nginx Configuration</strong></p>
+<p>See <a class="reference internal" href="nginx_configuration.html"><em>Nginx Configuration</em></a></p>
+<p><strong>Lighttpd Configuration</strong></p>
+<p>See <a class="reference internal" href="lighttpd_configuration.html"><em>Lighttpd Configuration</em></a></p>
+<p><strong>Yaws Configuration</strong></p>
+<p>See <a class="reference internal" href="yaws_configuration.html"><em>Yaws Configuration</em></a></p>
+<p><strong>Hiawatha Configuration</strong></p>
+<p>See <a class="reference internal" href="hiawatha_configuration.html"><em>Hiawatha Configuration</em></a></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/issues/index.html
index 9d4b75e,0000000..42add51
mode 100644,000000..100644
--- a/core/doc/admin/release/issues/index.html
+++ b/core/doc/admin/release/issues/index.html
@@@ -1,392 -1,0 +1,398 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Issues and Troubleshooting — ownCloud Administrators Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 7.0 documentation" href="../index.html" />
+ <link rel="prev" title="Converting From SQLite to MySQL, MariaDB, or PostgreSQL" href="../maintenance/convert_db.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">Introduction</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../videos.html">ownCloud Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 7.0 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Issues and Troubleshooting</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#bugs">Bugs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#general-troubleshooting">General Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#debugging-the-issue">Debugging the issue</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#debugging-sync-issues">Debugging Sync-Issues</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#common-problems-error-messages">Common problems / error messages</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#troubleshooting-webserver-and-php-problems">Troubleshooting Webserver and PHP problems</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#logfiles">Logfiles</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#webserver-and-php-modules">Webserver and PHP modules</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#troubleshooting-webdav">Troubleshooting WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#troubleshooting-contacts-calendar">Troubleshooting Contacts & Calendar</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#service-discovery">Service discovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#apple-ios">Apple iOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#unable-to-update-contacts-or-events">Unable to update Contacts or Events</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="issues-and-troubleshooting">
+<h1>Issues and Troubleshooting<a class="headerlink" href="#issues-and-troubleshooting" title="Permalink to this headline">¶</a></h1>
+<p>If you have trouble installing, configuring or maintaining ownCloud, please refer to our community support channels:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://forum.owncloud.org">The ownCloud Forums</a></li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The ownCloud forums have a <a class="reference external" href="https://forum.owncloud.org/viewforum.php?f=17">FAQ page</a> where each topic corresponds to
+typical mistakes or frequently occurring issues</p>
+</div>
+<ul class="simple">
+<li><a class="reference external" href="https://mailman.owncloud.org/mailman/listinfo/user">The ownCloud User mailing list</a></li>
+<li>The ownCloud IRC chat channel <tt class="docutils literal"><span class="pre">irc://#owncloud@freenode.net</span></tt> on freenode.net, also
+accessible via <a class="reference external" href="http://webchat.freenode.net/?channels=owncloud">webchat</a></li>
+</ul>
+<p>Please understand that all these channels essentially consist of users like you helping each other out. Consider helping others out where you can, to contribute back for the help you get. This is the only way to keep a community like ownCloud healthy and sustainable!</p>
+<p>If you are using ownCloud in a business or otherwise large scale deployment, note that ownCloud Inc. offers the <a class="reference external" href="https://owncloud.com/lp/community-or-enterprise/">Enterprise Edition</a> with commercial support options.</p>
+<div class="section" id="bugs">
+<h2>Bugs<a class="headerlink" href="#bugs" title="Permalink to this headline">¶</a></h2>
+<p>If you think you have found a bug in ownCloud, please:</p>
+<ul class="simple">
+<li>Search for a solution (see the options above)</li>
+<li>Double check your configuration</li>
+</ul>
+<p>If you can’t find a solution, please use our <a class="reference external" href="http://doc.owncloud.org/server/7.0/developer_manual/bugtracker/index.html">bugtracker</a>.</p>
+</div>
+<div class="section" id="general-troubleshooting">
+<h2>General Troubleshooting<a class="headerlink" href="#general-troubleshooting" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="debugging-the-issue">
+<h3>Debugging the issue<a class="headerlink" href="#debugging-the-issue" title="Permalink to this headline">¶</a></h3>
+<p>In a standard ownCloud installation the log level is set to <tt class="docutils literal"><span class="pre">Normal</span></tt>. To find any issues
+you need to raise the log level to <tt class="docutils literal"><span class="pre">All</span></tt> from the Admin page. Please see <a class="reference internal" href="../configuration/logging_configuration.html"><em>Logging Configuration</em></a>
+for more informations on this log levels.</p>
+<p>Some logging - for example JavaScript console logging - needs manually editing the
+configuration file.
+Edit <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> and add <tt class="docutils literal"><span class="pre">define('DEBUG',</span> <span class="pre">true);</span></tt>:</p>
+<div class="highlight-python"><pre><?php
+define('DEBUG',true);
+$CONFIG = array (
+ ... configuration goes here ...
+);</pre>
+</div>
+<p>For JavaScript issues you will also need to view the javascript console. All major browsers
+have decent developer tools for viewing the console, and you usually access them by
+pressing F-12. For Firefox it is recommended to install the <a class="reference external" href="https://getfirebug.com/">Firebug extension</a>.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The logfile of ownCloud is located in the datadirectory <tt class="docutils literal"><span class="pre">/var/www/owncloud/data/owncloud.log</span></tt>.</p>
+</div>
+</div>
+<div class="section" id="debugging-sync-issues">
+<h3>Debugging Sync-Issues<a class="headerlink" href="#debugging-sync-issues" title="Permalink to this headline">¶</a></h3>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The data directory on the server is exclusive to ownCloud and must not be modified manually.</p>
+</div>
+<p>Disregarding this can lead to unwanted behaviours like:</p>
+<ul class="simple">
+<li>Problems with sync clients</li>
+<li>Undetected changes due to caching in the database</li>
+</ul>
+<p>If you need to directly upload files from the same server please use a WebDAV command
+line client like <tt class="docutils literal"><span class="pre">cadaver</span></tt> to upload files to the WebDAV interface at:</p>
+<blockquote>
+<div><a class="reference external" href="https://example.org/owncloud/remote.php/webdav">https://example.org/owncloud/remote.php/webdav</a></div></blockquote>
+</div>
+<div class="section" id="common-problems-error-messages">
+<h3>Common problems / error messages<a class="headerlink" href="#common-problems-error-messages" title="Permalink to this headline">¶</a></h3>
+<p>Some common problems / error messages found in your logfiles as described above:</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">SQLSTATE[HY000]</span> <span class="pre">[1040]</span> <span class="pre">Too</span> <span class="pre">many</span> <span class="pre">connections</span></tt> -> You need to increase the
+connection limit of your database, please refer to the manual of your database
+for more informations.</li>
+<li><tt class="docutils literal"><span class="pre">SQLSTATE[HY000]:</span> <span class="pre">General</span> <span class="pre">error:</span> <span class="pre">5</span> <span class="pre">database</span> <span class="pre">is</span> <span class="pre">locked</span></tt> -> You’re using <tt class="docutils literal"><span class="pre">SQLite</span></tt>
+which can’t handle a lot of parallel requests. Please consider converting to
+another database like described in <a class="reference internal" href="../maintenance/convert_db.html"><em>Converting From SQLite to MySQL, MariaDB, or PostgreSQL</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">SQLSTATE[HY000]:</span> <span class="pre">General</span> <span class="pre">error:</span> <span class="pre">2006</span> <span class="pre">MySQL</span> <span class="pre">server</span> <span class="pre">has</span> <span class="pre">gone</span> <span class="pre">away</span></tt> -> The database
+request takes too long and therefore the MySQL server times out. Its also possible
+that the server is dropping a too large packet. Please refer to the manual of your
+database how to raise the config options <tt class="docutils literal"><span class="pre">wait_timeout</span></tt> and/or <tt class="docutils literal"><span class="pre">max_allowed_packet</span></tt>.</li>
+<li><tt class="docutils literal"><span class="pre">SQLSTATE[HY000]</span> <span class="pre">[2002]</span> <span class="pre">No</span> <span class="pre">such</span> <span class="pre">file</span> <span class="pre">or</span> <span class="pre">directory</span></tt> -> There is a problem
+accessing your SQLite database file in your datadirectory (<tt class="docutils literal"><span class="pre">data/owncloud.db</span></tt>).
+Please check the permissions of this folder/file or if it exists at all. If you’re
+using MySQL please start your database.</li>
+<li><tt class="docutils literal"><span class="pre">Connection</span> <span class="pre">closed</span> <span class="pre">/</span> <span class="pre">Operation</span> <span class="pre">cancelled</span></tt> -> This could be caused by wrong <tt class="docutils literal"><span class="pre">KeepAlive</span></tt>
+settings within your Apache config. Make sure that <tt class="docutils literal"><span class="pre">KeepAlive</span></tt> is set to <tt class="docutils literal"><span class="pre">On</span></tt> and
+also try to raise the limits of <tt class="docutils literal"><span class="pre">KeepAliveTimeout</span></tt> and <tt class="docutils literal"><span class="pre">MaxKeepAliveRequests</span></tt>.</li>
++<li><tt class="docutils literal"><span class="pre">No</span> <span class="pre">basic</span> <span class="pre">authentication</span> <span class="pre">headers</span> <span class="pre">were</span> <span class="pre">found</span></tt> -> This error is shown in your
++<tt class="docutils literal"><span class="pre">data/owncloud.log</span></tt> file. Some Apache modules like <tt class="docutils literal"><span class="pre">mod_fastcgi</span></tt>, <tt class="docutils literal"><span class="pre">mod_fcgid</span></tt>
++or <tt class="docutils literal"><span class="pre">mod_proxy_fcgi</span></tt> are not passing the needed authentication headers to
++PHP and so the login to ownCloud via WebDAV, CalDAV and CardDAV clients is
++failing. Information on how to correctly configure your environment can be
++found at the <a class="reference external" href="https://forum.owncloud.org/viewtopic.php?f=17&t=30646">forums</a>.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="troubleshooting-webserver-and-php-problems">
+<h2>Troubleshooting Webserver and PHP problems<a class="headerlink" href="#troubleshooting-webserver-and-php-problems" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="logfiles">
+<h3>Logfiles<a class="headerlink" href="#logfiles" title="Permalink to this headline">¶</a></h3>
+<p>When having issues the first step is to check the logfiles provided by PHP, the Webserver
+and ownCloud itself.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">In the following the paths to the logfiles of a default Debian installation
+running Apache2 with mod_php is assumed. On other webservers, linux distros or
+operating systems they can differ.</p>
+</div>
+<ul class="simple">
+<li>The logfile of Apache2 is located in <tt class="docutils literal"><span class="pre">/var/log/apache2/error.log</span></tt>.</li>
+<li>The logfile of PHP can be configured in your <tt class="docutils literal"><span class="pre">/etc/php5/apache2/php.ini</span></tt>.
+You need to set the directive <tt class="docutils literal"><span class="pre">log_errors</span></tt> to <tt class="docutils literal"><span class="pre">On</span></tt> and choose the path
+to store the logfile in the <tt class="docutils literal"><span class="pre">error_log</span></tt> directive. After those changes you
+need to restart your Webserver.</li>
+<li>The logfile of ownCloud is located in the datadirectory <tt class="docutils literal"><span class="pre">/var/www/owncloud/data/owncloud.log</span></tt>.</li>
+</ul>
+</div>
+<div class="section" id="webserver-and-php-modules">
+<h3>Webserver and PHP modules<a class="headerlink" href="#webserver-and-php-modules" title="Permalink to this headline">¶</a></h3>
+<p>There are some Webserver or PHP modules which are known to cause various problems
+like broken up-/downloads. The following shows a draft overview over this modules:</p>
+<ol class="arabic simple">
+<li>Apache</li>
+</ol>
+<ul class="simple">
+<li>mod_pagespeed</li>
+<li>mod_evasive</li>
+<li>mod_security</li>
+<li>mod_reqtimeout</li>
+<li>mod_deflate</li>
+<li>libapache2-mod-php5filter (use libapache2-mod-php5 instead)</li>
+<li>mod_spdy together with libapache2-mod-php5 / mod_php (use fcgi or php-fpm instead)</li>
+<li>mod_dav</li>
+<li>mod_xsendfile / X-Sendfile (causing broken downloads if not configured correctly)</li>
+</ul>
+<ol class="arabic simple" start="2">
+<li>NginX</li>
+</ol>
+<ul class="simple">
+<li>ngx_pagespeed</li>
+<li>HttpDavModule</li>
+<li>X-Sendfile (causing broken downloads if not configured correctly)</li>
+</ul>
+<ol class="arabic simple" start="3">
+<li>Mac OS X server</li>
+</ol>
+<ul class="simple">
+<li>mod_auth_apple</li>
+<li>com.apple.webapp.webdavsharing</li>
+</ul>
+<ol class="arabic simple" start="4">
+<li>LigHTTPd</li>
+</ol>
+<ul class="simple">
+<li>ModWebDAV</li>
+<li>X-Sendfile2 (causing broken downloads if not configured correctly)</li>
+</ul>
+<ol class="arabic simple" start="5">
+<li>PHP</li>
+</ol>
+<ul class="simple">
+<li>eAccelerator</li>
+</ul>
+</div>
+</div>
+<div class="section" id="troubleshooting-webdav">
+<h2>Troubleshooting WebDAV<a class="headerlink" href="#troubleshooting-webdav" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud uses SabreDAV, and the SabreDAV documentation is comprehensive and
+helpful. See:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://sabre.io/dav/faq/">SabreDAV FAQ</a></li>
+<li><a class="reference external" href="http://sabre.io/dav/webservers">Webservers</a> (Lists lighttpd as not
+recommended)</li>
+<li><a class="reference external" href="http://sabre.io/dav/large-files/">Working with large files</a> (Shows a PHP
+bug in older SabreDAV versions and information for mod_security problems)</li>
+<li><a class="reference external" href="http://sabre.io/dav/0bytes">0 byte files</a> (Reasons for empty files on the
+server)</li>
+<li><a class="reference external" href="http://sabre.io/dav/clients/">Clients</a> (A comprehensive list of WebDAV
+clients, and possible problems with each one)</li>
+<li><a class="reference external" href="http://sabre.io/dav/clients/finder/">Finder, OS X’s built-in WebDAV client</a>
+(Describes problems with Finder on various webservers)</li>
+</ul>
+<p>There is also a well maintained FAQ thread available at the <a class="reference external" href="https://forum.owncloud.org/viewtopic.php?f=17&t=7536">ownCloud Forums</a>
+which contains various additional informations about WebDAV problems.</p>
+</div>
+<div class="section" id="troubleshooting-contacts-calendar">
+<h2>Troubleshooting Contacts & Calendar<a class="headerlink" href="#troubleshooting-contacts-calendar" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="service-discovery">
+<h3>Service discovery<a class="headerlink" href="#service-discovery" title="Permalink to this headline">¶</a></h3>
+<p>Some clients - especially iOS - have problems finding the proper sync URL, even when explicitly
+configured to use it.</p>
+<p>There are several techniques to remedy this, which are described extensively at the
+<a class="reference external" href="http://sabre.io/dav/service-discovery/">Sabre DAV website</a>.</p>
+</div>
+<div class="section" id="apple-ios">
+<h3>Apple iOS<a class="headerlink" href="#apple-ios" title="Permalink to this headline">¶</a></h3>
+<p>Below is what have proven to work with iOS including iOS 7.</p>
+<p>If your ownCloud instance is installed in a subfolder under the web server’s document root and
+the client has difficulties finding the Cal- or CardDAV end-points, configure your web server to
+redirect from a “well-know” URL to the one used by ownCloud.
+When using the Apache web server this is easily achieved using a <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> file in the document
+root of your site.</p>
+<p>Say your instance is located in the <tt class="docutils literal"><span class="pre">owncloud</span></tt> folder, so the URL to it is <tt class="docutils literal"><span class="pre">ADDRESS/owncloud</span></tt>,
+create or edit the <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> file and add the following lines:</p>
+<div class="highlight-python"><pre>Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav</pre>
+</div>
+<p>If you use lighttpd as web server, the setting looks something like:</p>
+<div class="highlight-python"><pre>url.redirect = (
+ "^/.well-known/carddav" => "/owncloud/remote.php/carddav",
+ "^/.well-known/caldav" => "/owncloud/remote.php/caldav",
+)</pre>
+</div>
+<p>Now change the URL in the client settings to just use <tt class="docutils literal"><span class="pre">ADDRESS</span></tt> instead of e.g. <tt class="docutils literal"><span class="pre">ADDRESS/remote.php/carddav/principals/username</span></tt>.</p>
+<p>This problem is being discussed in the <a class="reference external" href="http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197">forum</a>.</p>
+</div>
+<div class="section" id="unable-to-update-contacts-or-events">
+<h3>Unable to update Contacts or Events<a class="headerlink" href="#unable-to-update-contacts-or-events" title="Permalink to this headline">¶</a></h3>
+<p>If you get an error like <tt class="docutils literal"><span class="pre">PATCH</span> <span class="pre">https://ADDRESS/some_url</span> <span class="pre">HTTP/1.0</span> <span class="pre">501</span> <span class="pre">Not</span> <span class="pre">Implemented</span></tt> it is
+likely caused by one of the following reasons:</p>
+<dl class="docutils">
+<dt>Outdated lighttpd web server</dt>
+<dd>lighttpd in debian wheezy (1.4.31) doesn’t support the PATCH HTTP verb.
+Upgrade to lighttpd >= 1.4.33.</dd>
+<dt>Using Pound reverse-proxy/load balancer</dt>
+<dd>As of writing this Pound doesn’t support the HTTP/1.1 verb.
+Pound is easily <a class="reference external" href="http://www.apsis.ch/pound/pound_list/archive/2013/2013-08/1377264673000">patched</a> to support HTTP/1.1.</dd>
+</dl>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/release/objects.inv
index 8f9ac82,0000000..f2a48d3
mode 100644,000000..100644
--- a/core/doc/admin/release/objects.inv
+++ b/core/doc/admin/release/objects.inv
@@@ -1,5 -1,0 +1,7 @@@
+# Sphinx inventory version 2
+# Project: ownCloud Administrators Manual
+# Version: 7.0
+# The remainder of this file is compressed using zlib.
- x�u�Ak!���+ګ
��r(���?`�:�:.:�����Ҟ��ޛyo
�<�������hA��Pdi�d�i�T� /gv��ƀP�)l`X�
i���ڴ���� ��H�o�@Ux�,VSDԹ��YUOE0���JQ"�b��e��]�Vu:�_!
���
-s���bp&�Lb�IC�$I�.�Z2���/�_<���`��w4�y��Ѧ-�����I��*�L��7�����c
++x�}P�j�0��+�c�PHr��Rh��?�����+!�h���-��K�I��cG�<��>u�Փ� h@<�������6���\lz
��=T
!����b�
ߣ9��k�ѷx��
�$��: �h�g8<@��o�8IRP�*�ovE��I�y}o�f_x
�b��
++�}��ٯVE��(��m����̮3��
&�ӊ܍ȂEdz��r��>柗��2k��ަǡ t �;�ԩB���6:%��Y/.�u��� ���"Lf��Ʋ]�/*��
++�m㐐)�/���~�T
diff --cc core/doc/user/_sources/files/files.txt
index e4ba3c4,0000000..1c91b7e
mode 100644,000000..100644
--- a/core/doc/user/_sources/files/files.txt
+++ b/core/doc/user/_sources/files/files.txt
@@@ -1,386 -1,0 +1,448 @@@
+Accessing ownCloud Files Using WebDAV
+=====================================
+
+ownCloud fully supports the WebDAV protocol, and you can
+connect and synchronize with your ownCloud files over WebDAV. In this
+chapter you will learn how to connect Linux, Mac OS X, Windows, and mobile
+devices to your ownCloud server via WebDAV. Before we get into configuring
+WebDAV, let's take a quick look at the recommended way of connecting client
+devices to your ownCloud servers.
+
+ownCloud Desktop and Mobile Clients
+-----------------------------------
+
+The recommended method for keeping your desktop PC synchronized with your
+ownCloud server is by using the `ownCloud Desktop Client
+<http://doc.owncloud.org/desktop/1.7/>`_. You can configure the ownCloud client
+to save files in any local directory you want, and you choose which directories
+on the ownCloud server to sync with. The client displays the current connection
+status and logs all activity, so you always know which remote files have been
+downloaded to your PC, and you can verify that files created and updated on your
+local PC are properly synchronized with the server.
+
+The recommended method for syncing your ownCloud server with Android and
+Apple iOS devices is by using the `ownCloud mobile apps
+<http://owncloud.org/install/#mobile>`_.
+
+To connect to your ownCloud server with the **ownCloud** mobile apps, use the
+base URL and folder only::
+
+ example.org/owncloud
+
+In addition to the mobile apps provided by ownCloud, you can use other apps to
+connect to ownCloud from your mobile device using WebDAV. `WebDAV Navigator`_ is
+a good (proprietary) app for `Android devices`_, `iPhones`_, and `BlackBerry
+devices`_. The URL to use on these is::
+
+ example.org/owncloud/remote.php/webdav
+
+WebDAV Configuration
+--------------------
+
+If you prefer, you may also connect your desktop PC to your ownCloud server by
+using the WebDAV protocol rather than using a special client application. Web
+Distributed Authoring and Versioning (WebDAV) is a Hypertext Transfer Protocol
+(HTTP) extension that makes it easy to create, read, and edit files on Web
+servers. With WebDAV you can access your ownCloud shares on Linux, Mac OS X and
+Windows in the same way as any remote network share, and stay synchronized.
+
+.. note:: In the following examples, You must adjust **example.org/** to the
+ URL of your ownCloud server installation.
+
+Accessing Files Using Linux
+---------------------------
+
+You can access files in Linux operating systems using the following methods:
+
+Accessing Files with GNOME and Nautilus File Manager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use the ``davs://`` protocol to connect the Nautilus file manager to your
+ownCloud share::
+
+ davs://example.org/owncloud/remote.php/webdav
+
+.. note:: If your server connection is not HTTPS-secured, use `dav://` instead of `davs://`.
+
+.. image:: ../images/webdav_gnome3_nautilus.png
+
+Accessing Files with KDE and Dolphin File Manager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To access your ownCloud files using the Dolphin file manager in KDE, use
+the ``webdav://`` protocol::
+
+ webdav://example.org/owncloud/remote.php/webdav
+
+.. image:: ../images/webdav_dolphin.png
+
+You can create a permanent link to your ownCloud server:
+
+1. Open Dolphin and click "Network" in the left hand "Places" column.
+2. Click on the icon labeled **Add a Network Folder**.
+ The resulting dialog should appear with WebDAV already selected.
+3. If WebDAV is not selected, select it.
+4. Click **Next**.
+5. Enter the following settings:
+
+ * Name: The name you want to see in the **Places** bookmark, for example ownCloud.
+
+ * User: The ownCloud username you used to log in, for example admin.
+
+ * Server: The ownCloud domain name, for example **example.org** (without
+ **http://** before or directories afterwards).
+ * Folder -- Enter the path ``owncloud/remote.php/webdav``.
+6. (Optional) Check the "Create icon checkbox" for a bookmark to appear in the
+ Places column.
+7. (Optional) Provide any special settings or an SSL certificate in the "Port &
+ Encrypted" checkbox.
+
+Creating WebDAV Mounts on the Linux Command Line
+------------------------------------------------
+
+You can create WebDAV mounts from the Linux command line. This is useful if you
+prefer to access ownCloud the same way as any other remote filesystem mount.
+The following example shows how to create a personal mount and have it mounted
+automatically every time you log in to your Linux computer.
+
+1. Install the ``davfs2`` WebDAV filesystem driver, which allows you to mount
+ WebDAV shares just like any other remote filesystem. Use this command to
+ install it on Debian/Ubuntu::
+
+ # apt-get install davfs2
+
+2. Use this command to install it on CentOS, Fedora, and openSUSE::
+
+ # yum install davfs2
+
+3. Add yourself to the ``davfs2`` group::
+
+ # usermod -aG davfs2 <username>
+
+3. Then create an ``owncloud`` directory in your home directory for the
+ mountpoint, and ``.davfs2/`` for your personal configuration file::
+
+ $ mkdir ~/owncloud
+ $ mkdir ~/.davfs2
+
+4. Copy ``/etc/davfs2/secrets`` to ``~/.davfs2`` ::
+
+ # cp /etc/davfs2/secrets ~/.davfs2/secrets
+
+5. Set yourself as the owner and make the permissions read-write owner only::
+
+ # chown <username>:<username> ~/.davfs2/secrets
+ # chmod 600 ~/.davfs2/secrets
+
+6. Add your ownCloud login credentials to the end of the ``secrets`` file,
+ using your ownCloud server URL and your ownCloud username and password::
+
+ example.org/owncloud/remote.php/webdav <username> <password>
+
+7. Add the mount information to ``/etc/fstab``::
+
+ example.org/owncloud/remote.php/webdav /home/<username>/owncloud
+ davfs user,rw,auto 0 0
+
+8. Then test that it mounts and authenticates by running the following
+ command. If you set it up correctly you won't need root permissions::
+
+ $ mount ~/owncloud
+
+9. You should also be able to unmount it::
+
+ $ umount ~/owncloud
+
+Now every time you login to your Linux system your ownCloud share should
+automatically mount via WebDAV in your ``~/owncloud`` directory. If you
+prefer to mount it manually, change ``auto`` to ``noauto`` in
+``/etc/fstab``.
+
+Known Issues
+~~~~~~~~~~~~
+
+**Problem:** Resource temporarily unavailable
+
+**Solution:** If you experience trouble when you create a file in the directory,
+edit ``/etc/davfs2/davfs2.conf`` and add::
+
+ use_locks 0
+
+**Problem:** Certificate warnings
+
+**Solution:** If you use a self-signed certificate, you will get a warning. To
+change this, you need to configure ``davfs2`` to recognize your certificate.
+Copy ``mycertificate.pem`` to ``/etc/davfs2/certs/``. Then edit
+``/etc/davfs2/davfs2.conf`` and uncomment the line ``servercert``. Now add the
+path of your certificate as in this example::
+
+ servercert /etc/davfs2/certs/mycertificate.pem
+
+Accessing Files Using Mac OS X
+------------------------------
+
+.. note:: The Mac OS X Finder suffers from a `series of implementation problems
+ <http://sabre.io/dav/clients/finder/>`_ and should only be used if the
+ ownCloud server runs on **Apache** and **mod_php**.
+
+To access files through the Mac OS X Finder:
+
+1. Choose **Go > Connect to Server**.
+
+ The "Connect to Server" window opens.
+
+2. Specify the address of the server in the **Server Address** field.
+
+ .. image:: ../images/osx_webdav1.png
+
+ For example, the URL used to connect to the ownCloud server
+ from the Mac OS X Finder is::
+
+ http://example.org/owncloud/remote.php/webdav
+
+ .. image:: ../images/osx_webdav2.png
+
+3. Click **Connect**.
+
+ The device connects to the server.
+
+For added details about how to connect to an external server using Mac OS X,
+check the `vendor documentation
+<http://docs.info.apple.com/article.html?path=Mac/10.6/en/8160.html>`_
+
+Accessing Files Using Microsoft Windows
+---------------------------------------
+
+It is best to use a suitable WebDAV client from the
+`WebDAV Project page <http://www.webdav.org/projects/>`_ .
+
+If you must use the native Windows implementation, you can map ownCloud to a new
+drive. Mapping to a drive enables you to browse files stored on an ownCloud
+server the way you would files stored in a mapped network drive.
+
+Using this feature requires network connectivity. If you want to store your
+files offline, use the ownCloud Desktop Client to sync all files on your
+ownCloud to one or more directories of your local hard drive.
+
+.. note:: Prior to mapping your drive, you must permit the use of Basic
+ Authentication in the Windows Registry. The procedure is documented in
+ KB841215_ and differs between Windows XP/Server 2003 and Windows Vista/7.
+ Please follow the Knowledge Base article before proceeding, and follow the
+ Vista instructions if you run Windows 7.
+
+.. _KB841215: http://support.microsoft.com/kb/841215
+
+Mapping Drives With the Command Line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following example shows how to map a drive using the command line. To map
+the drive:
+
+1. Open a command prompt in Windows.
+2. Enter the following line in the command prompt to map to the computer Z
+ drive::
+
+ net use Z: https://<drive_path>/remote.php/webdav /user:youruser
+ yourpassword
+
+ where <drive_path> is the URL to your ownCloud server.
+
+For example: ``net use Z: https://example.org/owncloud/remote.php/webdav
+/user:youruser yourpassword``
+
+ The computer maps the files of your ownCloud account to the drive letter Z.
+
+.. note:: Though not recommended, you can also mount the ownCloud server
+ using HTTP, leaving the connection unencrypted. If you plan to use HTTP
+ connections on devices while in public place, we strongly recommend using a
+ VPN tunnel to provide the necessary security.
+
+An alternative command syntax is::
+
+ net use Z: \\example.org at ssl\owncloud\remote.php\webdav /user:youruser
+ yourpassword
+
+You can also mount your ownCloud via HTTP, leaving the connection unencrypted.
+
+Mapping Drives With Windows Explorer
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To map a drive using the Microsoft Windows Explorer:
+
+1. Migrate to your computer in Windows Explorer.
+2. Right-click on **Computer** entry and select **Map network drive...** from
+ the drop-down menu.
+3. Choose a local network drive to which you want to map ownCloud.
+4. Specify the address to your ownCloud instance, followed by
+ **/remote.php/webdav**.
+
+ For example::
+
+ https://example.org/owncloud/remote.php/webdav
+
+.. note:: For SSL protected servers, check **Reconnect at logon** to ensure
+ that the mapping is persistent upon subsequent reboots. If you want to
+ connect to the ownCloud server as a different user, check **Connect using
+ different credentials**.
+
+.. figure:: ../images/explorer_webdav.png
+ :scale: 80%
+
+ **Mapping WebDAV on Windows Explorer**
+
+5. Click the ``Finish`` button.
+
+ Windows Explorer maps the network drive, making your ownCloud instance
+ available.
+
+Accessing Files Using Cyberduck
+-------------------------------
+
+`Cyberduck <https://cyberduck.io/?l=en>`_ is an open source FTP and SFTP,
+WebDAV, OpenStack Swift, and Amazon S3 browser designed for file transfers on
+Mac OS X and Windows.
+
+.. note:: This example uses Cyberduck version 4.2.1.
+
+To use Cyberduck:
+
+1. Specify a server without any leading protocol information. For example:
+
+ ``example.org``
+
+2. Specify the appropriate port. The port you choose depends on whether or not
+your ownCloud server supports SSL. Cyberduck requires that you select a
+different connection type if you plan to use SSL. For example:
+
+ 80 (for WebDAV)
+
+ 443 (for WebDAV (HTTPS/SSL))
+
+3. Use the 'More Options' drop-down menu to add the rest of your WebDAV URL into
+the 'Path' field. For example:
+
+ ``remote.php/webdav``
+
+Now Cyberduck enables file access to the ownCloud server.
+
+Known Problems
+~~~~~~~~~~~~~~
+
+**Problem**
+ Windows does not connect using HTTPS.
+
+**Solution 1**
+ The Windows WebDAV Client might not support Server Name Indication (SNI) on
+ encrypted connections. If you encounter an error mounting an SSL-encrypted
+ ownCloud instance, contact your provider about assigning a dedicated IP
+ address for your SSL-based server.
+
+**Solution 2**
+ The Windows WebDAV Client might not support TSLv1.1 / TSLv1.2 connections.
+ If you have restricted your server config to only provide TLSv1.1 and above
+ the connection to your server might fail. Please refer to the WinHTTP_
+ documentation for further information.
+
+.. _WinHTTP: https://msdn.microsoft.com/en-us/library/windows/desktop/aa382925.aspx#WinHTTP_5.1_Features
+
+**Problem**
+ You receive the following error message:
+ **Error 0x800700DF: The file size exceeds the limit allowed and cannot be
+ saved.**
+
+**Solution**
+ Windows limits the maximum size a file transferred from or to a WebDAV share
+ may have. You can increase the value **FileSizeLimitInBytes** in
+ **HKEY_LOCAL_MacHINE\SYSTEM\CurrentControlSet\Services\WebClient\Parameters**
+ by clicking on **Modify**.
+
+ To increase the limit to the maximum value of 4GB, select **Decimal**, enter
+ a value of **4294967295**, and reboot Windows or restart the **WebClient**
+ service.
+
+**Problem**
+ Accessing your files from Microsoft Office via WebDAV fails.
+
+**Solution**
+ Known problems and their solutions are documented in the KB2123563_ article.
+
+**Problem**
+ You cannot download more than 50 MB or upload large Files when the upload takes
+ longer than 30 minutes using Web Client in Windows 7.
+
+**Solution**
+ Workarounds are documented in the KB2668751_ article.
+
++
++Accessing Files Using cURL
++--------------------------
++
++Since WebDAV is an extension of HTTP cURL can be used to script file operations.
++
++To create a folder with the current date as name:
++
++.. code-block:: bash
++
++ $ curl -u user:pass -X MKCOL "http://example.org/owncloud/remote.php/webdav/$(date '+%d-%b-%Y')"
++
++To upload a file ``error.log`` into that directory:
++
++.. code-block:: bash
++
++ $ curl -u user:pass -T error.log "http://example.org/owncloud/remote.php/webdav/$(date '+%d-%b-%Y')/error.log"
++
++To move a file:
++
++.. code-block:: bash
++
++ $ curl -u user:pass -X MOVE --header 'Destination: http://example.org/owncloud/remote.php/webdav/target.jpg' http://example.org/owncloud/remote.php/webdav/source.jpg
++
++To get the properties of files in the root folder:
++
++.. code-block:: bash
++
++ $ curl -X PROPFIND -H "Depth: 1" -u user:pass http://example.org/owncloud/remote.php/webdav/ | xml_pp
++ <?xml version="1.0" encoding="utf-8"?>
++ <d:multistatus xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns" xmlns:s="http://sabredav.org/ns">
++ <d:response>
++ <d:href>/owncloud/remote.php/webdav/</d:href>
++ <d:propstat>
++ <d:prop>
++ <d:getlastmodified>Tue, 13 Oct 2015 17:07:45 GMT</d:getlastmodified>
++ <d:resourcetype>
++ <d:collection/>
++ </d:resourcetype>
++ <d:quota-used-bytes>163</d:quota-used-bytes>
++ <d:quota-available-bytes>11802275840</d:quota-available-bytes>
++ <d:getetag>"561d3a6139d05"</d:getetag>
++ </d:prop>
++ <d:status>HTTP/1.1 200 OK</d:status>
++ </d:propstat>
++ </d:response>
++ <d:response>
++ <d:href>/owncloud/remote.php/webdav/welcome.txt</d:href>
++ <d:propstat>
++ <d:prop>
++ <d:getlastmodified>Tue, 13 Oct 2015 17:07:35 GMT</d:getlastmodified>
++ <d:getcontentlength>163</d:getcontentlength>
++ <d:resourcetype/>
++ <d:getetag>"47465fae667b2d0fee154f5e17d1f0f1"</d:getetag>
++ <d:getcontenttype>text/plain</d:getcontenttype>
++ </d:prop>
++ <d:status>HTTP/1.1 200 OK</d:status>
++ </d:propstat>
++ </d:response>
++ </d:multistatus>
++
++
+.. _KB2668751: https://support.microsoft.com/kb/2668751
+.. _KB2123563: https://support.microsoft.com/kb/2123563
+.. _in your file manager: http://en.wikipedia.org/wiki/Webdav#WebDAV_client_applications
+.. _ownCloud sync clients: http://doc.owncloud.org/desktop/1.7/
+.. _Mount ownCloud to a local folder without sync: http://owncloud.org/use/webdav/
+.. _ownCloud Mirall repository: https://github.com/owncloud/mirall
+.. _Android: http://github.com/owncloud/android
+.. _WebDAV Navigator: http://seanashton.net/webdav/
+.. _Android devices: https://play.google.com/store/apps/details?id=com.schimera.webdavnavlite
+.. _iPhones: https://itunes.apple.com/app/webdav-navigator/id382551345
+.. _BlackBerry devices: http://appworld.blackberry.com/webstore/content/46816
diff --cc core/doc/user/contents.html
index 1b064d8,0000000..d9667cb
mode 100644,000000..100644
--- a/core/doc/user/contents.html
+++ b/core/doc/user/contents.html
@@@ -1,280 -1,0 +1,281 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>ownCloud User Manual — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="index.html" />
+ <link rel="next" title="ownCloud 7.0 User Documentation" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="#">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="#">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="whats_new.html">What’s New for Users in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Collaborative Document Editing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Setting Your Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="owncloud-user-manual">
+<span id="contents"></span><h1>ownCloud User Manual<a class="headerlink" href="#owncloud-user-manual" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+</div>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="whats_new.html">What’s New for Users in ownCloud 7</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#no-more-shared-folder">No More Shared Folder</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#selective-sync">Selective Sync</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#server-to-server-sharing">Server to Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#file-and-activity-notifications">File and Activity Notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#owncloud-documents-with-word-conversion">ownCloud Documents with Word Conversion</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#mobile-web-browser-support">Mobile Web Browser Support</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#lazy-loading-files">Lazy Loading Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="whats_new.html#change-in-share-expiration-date">Change in Share Expiration Date</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="webinterface.html#accessing-the-owncloud-web-interface">Accessing the ownCloud Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="webinterface.html#navigating-the-main-user-interface">Navigating the Main User Interface</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="files/filesweb.html">Accessing your Files Using the Web Interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#previewing-files">Previewing Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#navigating-inside-your-owncloud">Navigating Inside Your ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#overlay-icons-show-sharing-status">Overlay Icons Show Sharing Status</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#creating-or-uploading-files-and-directories">Creating or Uploading Files and Directories</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#selecting-files-or-folders">Selecting Files or Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#filtering-the-file-application-view">Filtering the File Application View</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#moving-files">Moving Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#sharing-files-locally">Sharing Files Locally</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#creating-a-public-share">Creating a Public Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#change-in-share-expiration-date">Change in Share Expiration Date</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/files.html">Accessing ownCloud Files Using WebDAV</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#owncloud-desktop-and-mobile-clients">ownCloud Desktop and Mobile Clients</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#webdav-configuration">WebDAV Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-linux">Accessing Files Using Linux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#creating-webdav-mounts-on-the-linux-command-line">Creating WebDAV Mounts on the Linux Command Line</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-mac-os-x">Accessing Files Using Mac OS X</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-microsoft-windows">Accessing Files Using Microsoft Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-cyberduck">Accessing Files Using Cyberduck</a></li>
++<li class="toctree-l3"><a class="reference internal" href="files/files.html#accessing-files-using-curl">Accessing Files Using cURL</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/server_to_server_using.html">Using Server-to-Server Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/server_to_server_using.html#creating-a-new-share">Creating a New Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/server_to_server_using.html#connecting-to-a-remote-share">Connecting to a Remote Share</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/deletedfiles.html">Managing Deleted Files</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/deletedfiles.html#quotas">Quotas</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/deletedfiles.html#what-happens-when-shared-files-are-deleted">What Happens When Shared Files Are Deleted</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/deletedfiles.html#how-the-deleted-files-app-manages-storage-space">How the Deleted Files app Manages Storage Space</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/encryption.html">Encrypting Your ownCloud Files</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#using-encryption">Using Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#sharing-encrypted-files">Sharing Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#removing-encryption">Removing Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#files-not-encrypted">Files Not Encrypted</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="pim/contacts.html">Using the Contacts App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#adding-contacts">Adding Contacts</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#managing-address-books">Managing Address Books</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#adding-an-address-book">Adding an Address Book</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#synchronizing-address-books">Synchronizing Address Books</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#special-carddav-urls">Special CardDAV URLs</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/calendar.html">Using the Calendar App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#creating-a-new-calendar">Creating a New Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#managing-calendar-settings">Managing Calendar Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#synchronizing-calendars-using-caldav">Synchronizing Calendars Using CalDAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#creating-events">Creating Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#sharing-events">Sharing Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#exporting-and-importing-events">Exporting and Importing Events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#deleting-an-event">Deleting an Event</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#special-caldav-urls">Special CalDAV URLs</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#calendar-app-faq">Calendar App FAQ</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_ios.html">iOS - Synchronize iPhone/iPad</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_ios.html#calendar">Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_ios.html#address-book">Address book</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_thunderbird.html#addressbook">Addressbook</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="pim/troubleshooting.html">Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/troubleshooting.html#blackberry-os-10-2">BlackBerry OS 10.2</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Collaborative Document Editing</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="documents.html#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#create-or-upload-a-document">Create or Upload a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#edit-a-document">Edit a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#delete-a-document">Delete a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#share-a-document">Share a Document</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="bookmarks.html#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#add-a-bookmark">Add a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#edit-delete-a-bookmark">Edit/Delete a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#search">Search</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="bookmarks.html#the-bookmarklet">The Bookmarklet</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Setting Your Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/files.html
index 60f69fe,0000000..b99708c
mode 100644,000000..100644
--- a/core/doc/user/files/files.html
+++ b/core/doc/user/files/files.html
@@@ -1,531 -1,0 +1,583 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Accessing ownCloud Files Using WebDAV — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Version Control" href="versioncontrol.html" />
+ <link rel="prev" title="Accessing your Files Using the Web Interface" href="filesweb.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new.html">What’s New for Users in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files Using the Web Interface</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Accessing ownCloud Files Using WebDAV</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#owncloud-desktop-and-mobile-clients">ownCloud Desktop and Mobile Clients</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#webdav-configuration">WebDAV Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-linux">Accessing Files Using Linux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-webdav-mounts-on-the-linux-command-line">Creating WebDAV Mounts on the Linux Command Line</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-mac-os-x">Accessing Files Using Mac OS X</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-microsoft-windows">Accessing Files Using Microsoft Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-cyberduck">Accessing Files Using Cyberduck</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#accessing-files-using-curl">Accessing Files Using cURL</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_using.html">Using Server-to-Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Managing Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Encrypting Your ownCloud Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Collaborative Document Editing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Setting Your Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="accessing-owncloud-files-using-webdav">
+<h1>Accessing ownCloud Files Using WebDAV<a class="headerlink" href="#accessing-owncloud-files-using-webdav" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud fully supports the WebDAV protocol, and you can
+connect and synchronize with your ownCloud files over WebDAV. In this
+chapter you will learn how to connect Linux, Mac OS X, Windows, and mobile
+devices to your ownCloud server via WebDAV. Before we get into configuring
+WebDAV, let’s take a quick look at the recommended way of connecting client
+devices to your ownCloud servers.</p>
+<div class="section" id="owncloud-desktop-and-mobile-clients">
+<h2>ownCloud Desktop and Mobile Clients<a class="headerlink" href="#owncloud-desktop-and-mobile-clients" title="Permalink to this headline">¶</a></h2>
+<p>The recommended method for keeping your desktop PC synchronized with your
+ownCloud server is by using the <a class="reference external" href="http://doc.owncloud.org/desktop/1.7/">ownCloud Desktop Client</a>. You can configure the ownCloud client
+to save files in any local directory you want, and you choose which directories
+on the ownCloud server to sync with. The client displays the current connection
+status and logs all activity, so you always know which remote files have been
+downloaded to your PC, and you can verify that files created and updated on your
+local PC are properly synchronized with the server.</p>
+<p>The recommended method for syncing your ownCloud server with Android and
+Apple iOS devices is by using the <a class="reference external" href="http://owncloud.org/install/#mobile">ownCloud mobile apps</a>.</p>
+<p>To connect to your ownCloud server with the <strong>ownCloud</strong> mobile apps, use the
+base URL and folder only:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">example</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">owncloud</span>
+</pre></div>
+</div>
+<p>In addition to the mobile apps provided by ownCloud, you can use other apps to
+connect to ownCloud from your mobile device using WebDAV. <a class="reference external" href="http://seanashton.net/webdav/">WebDAV Navigator</a> is
+a good (proprietary) app for <a class="reference external" href="https://play.google.com/store/apps/details?id=com.schimera.webdavnavlite">Android devices</a>, <a class="reference external" href="https://itunes.apple.com/app/webdav-navigator/id382551345">iPhones</a>, and <a class="reference external" href="http://appworld.blackberry.com/webstore/content/46816">BlackBerry
+devices</a>. The URL to use on these is:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">example</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">owncloud</span><span class="o">/</span><span class="n">remote</span><span class="o">.</span><span class="n">php</span><span class="o">/</span><span class="n">webdav</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="webdav-configuration">
+<h2>WebDAV Configuration<a class="headerlink" href="#webdav-configuration" title="Permalink to this headline">¶</a></h2>
+<p>If you prefer, you may also connect your desktop PC to your ownCloud server by
+using the WebDAV protocol rather than using a special client application. Web
+Distributed Authoring and Versioning (WebDAV) is a Hypertext Transfer Protocol
+(HTTP) extension that makes it easy to create, read, and edit files on Web
+servers. With WebDAV you can access your ownCloud shares on Linux, Mac OS X and
+Windows in the same way as any remote network share, and stay synchronized.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">In the following examples, You must adjust <strong>example.org/</strong> to the
+URL of your ownCloud server installation.</p>
+</div>
+</div>
+<div class="section" id="accessing-files-using-linux">
+<h2>Accessing Files Using Linux<a class="headerlink" href="#accessing-files-using-linux" title="Permalink to this headline">¶</a></h2>
+<p>You can access files in Linux operating systems using the following methods:</p>
+<div class="section" id="accessing-files-with-gnome-and-nautilus-file-manager">
+<h3>Accessing Files with GNOME and Nautilus File Manager<a class="headerlink" href="#accessing-files-with-gnome-and-nautilus-file-manager" title="Permalink to this headline">¶</a></h3>
+<p>Use the <tt class="docutils literal"><span class="pre">davs://</span></tt> protocol to connect the Nautilus file manager to your
+ownCloud share:</p>
+<div class="highlight-python"><pre>davs://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If your server connection is not HTTPS-secured, use <cite>dav://</cite> instead of <cite>davs://</cite>.</p>
+</div>
+<img alt="../_images/webdav_gnome3_nautilus.png" src="../_images/webdav_gnome3_nautilus.png" />
+</div>
+<div class="section" id="accessing-files-with-kde-and-dolphin-file-manager">
+<h3>Accessing Files with KDE and Dolphin File Manager<a class="headerlink" href="#accessing-files-with-kde-and-dolphin-file-manager" title="Permalink to this headline">¶</a></h3>
+<p>To access your ownCloud files using the Dolphin file manager in KDE, use
+the <tt class="docutils literal"><span class="pre">webdav://</span></tt> protocol:</p>
+<div class="highlight-python"><pre>webdav://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<img alt="../_images/webdav_dolphin.png" src="../_images/webdav_dolphin.png" />
+<p>You can create a permanent link to your ownCloud server:</p>
+<ol class="arabic simple">
+<li>Open Dolphin and click “Network” in the left hand “Places” column.</li>
+<li>Click on the icon labeled <strong>Add a Network Folder</strong>.
+The resulting dialog should appear with WebDAV already selected.</li>
+<li>If WebDAV is not selected, select it.</li>
+<li>Click <strong>Next</strong>.</li>
+<li>Enter the following settings:<ul>
+<li>Name: The name you want to see in the <strong>Places</strong> bookmark, for example ownCloud.</li>
+<li>User: The ownCloud username you used to log in, for example admin.</li>
+<li>Server: The ownCloud domain name, for example <strong>example.org</strong> (without
+<strong>http://</strong> before or directories afterwards).</li>
+<li>Folder – Enter the path <tt class="docutils literal"><span class="pre">owncloud/remote.php/webdav</span></tt>.</li>
+</ul>
+</li>
+<li>(Optional) Check the “Create icon checkbox” for a bookmark to appear in the
+Places column.</li>
+<li>(Optional) Provide any special settings or an SSL certificate in the “Port &
+Encrypted” checkbox.</li>
+</ol>
+</div>
+</div>
+<div class="section" id="creating-webdav-mounts-on-the-linux-command-line">
+<h2>Creating WebDAV Mounts on the Linux Command Line<a class="headerlink" href="#creating-webdav-mounts-on-the-linux-command-line" title="Permalink to this headline">¶</a></h2>
+<p>You can create WebDAV mounts from the Linux command line. This is useful if you
+prefer to access ownCloud the same way as any other remote filesystem mount.
+The following example shows how to create a personal mount and have it mounted
+automatically every time you log in to your Linux computer.</p>
+<ol class="arabic">
+<li><p class="first">Install the <tt class="docutils literal"><span class="pre">davfs2</span></tt> WebDAV filesystem driver, which allows you to mount
+WebDAV shares just like any other remote filesystem. Use this command to
+install it on Debian/Ubuntu:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># apt-get install davfs2</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Use this command to install it on CentOS, Fedora, and openSUSE:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># yum install davfs2</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Add yourself to the <tt class="docutils literal"><span class="pre">davfs2</span></tt> group:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># usermod -aG davfs2 <username></span>
+</pre></div>
+</div>
+</li>
+</ol>
+<ol class="arabic" start="3">
+<li><p class="first">Then create an <tt class="docutils literal"><span class="pre">owncloud</span></tt> directory in your home directory for the
+mountpoint, and <tt class="docutils literal"><span class="pre">.davfs2/</span></tt> for your personal configuration file:</p>
+<div class="highlight-python"><pre>$ mkdir ~/owncloud
+$ mkdir ~/.davfs2</pre>
+</div>
+</li>
+<li><p class="first">Copy <tt class="docutils literal"><span class="pre">/etc/davfs2/secrets</span></tt> to <tt class="docutils literal"><span class="pre">~/.davfs2</span></tt></p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># cp /etc/davfs2/secrets ~/.davfs2/secrets</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Set yourself as the owner and make the permissions read-write owner only:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># chown <username>:<username> ~/.davfs2/secrets</span>
+<span class="c"># chmod 600 ~/.davfs2/secrets</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Add your ownCloud login credentials to the end of the <tt class="docutils literal"><span class="pre">secrets</span></tt> file,
+using your ownCloud server URL and your ownCloud username and password:</p>
+<div class="highlight-python"><pre>example.org/owncloud/remote.php/webdav <username> <password></pre>
+</div>
+</li>
+<li><p class="first">Add the mount information to <tt class="docutils literal"><span class="pre">/etc/fstab</span></tt>:</p>
+<div class="highlight-python"><pre>example.org/owncloud/remote.php/webdav /home/<username>/owncloud
+davfs user,rw,auto 0 0</pre>
+</div>
+</li>
+<li><p class="first">Then test that it mounts and authenticates by running the following
+command. If you set it up correctly you won’t need root permissions:</p>
+<div class="highlight-python"><pre>$ mount ~/owncloud</pre>
+</div>
+</li>
+<li><p class="first">You should also be able to unmount it:</p>
+<div class="highlight-python"><pre>$ umount ~/owncloud</pre>
+</div>
+</li>
+</ol>
+<p>Now every time you login to your Linux system your ownCloud share should
+automatically mount via WebDAV in your <tt class="docutils literal"><span class="pre">~/owncloud</span></tt> directory. If you
+prefer to mount it manually, change <tt class="docutils literal"><span class="pre">auto</span></tt> to <tt class="docutils literal"><span class="pre">noauto</span></tt> in
+<tt class="docutils literal"><span class="pre">/etc/fstab</span></tt>.</p>
+<div class="section" id="known-issues">
+<h3>Known Issues<a class="headerlink" href="#known-issues" title="Permalink to this headline">¶</a></h3>
+<p><strong>Problem:</strong> Resource temporarily unavailable</p>
+<p><strong>Solution:</strong> If you experience trouble when you create a file in the directory,
+edit <tt class="docutils literal"><span class="pre">/etc/davfs2/davfs2.conf</span></tt> and add:</p>
+<div class="highlight-python"><pre>use_locks 0</pre>
+</div>
+<p><strong>Problem:</strong> Certificate warnings</p>
+<p><strong>Solution:</strong> If you use a self-signed certificate, you will get a warning. To
+change this, you need to configure <tt class="docutils literal"><span class="pre">davfs2</span></tt> to recognize your certificate.
+Copy <tt class="docutils literal"><span class="pre">mycertificate.pem</span></tt> to <tt class="docutils literal"><span class="pre">/etc/davfs2/certs/</span></tt>. Then edit
+<tt class="docutils literal"><span class="pre">/etc/davfs2/davfs2.conf</span></tt> and uncomment the line <tt class="docutils literal"><span class="pre">servercert</span></tt>. Now add the
+path of your certificate as in this example:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">servercert</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">davfs2</span><span class="o">/</span><span class="n">certs</span><span class="o">/</span><span class="n">mycertificate</span><span class="o">.</span><span class="n">pem</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="accessing-files-using-mac-os-x">
+<h2>Accessing Files Using Mac OS X<a class="headerlink" href="#accessing-files-using-mac-os-x" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The Mac OS X Finder suffers from a <a class="reference external" href="http://sabre.io/dav/clients/finder/">series of implementation problems</a> and should only be used if the
+ownCloud server runs on <strong>Apache</strong> and <strong>mod_php</strong>.</p>
+</div>
+<p>To access files through the Mac OS X Finder:</p>
+<ol class="arabic simple">
+<li>Choose <strong>Go > Connect to Server</strong>.</li>
+</ol>
+<blockquote>
+<div>The “Connect to Server” window opens.</div></blockquote>
+<ol class="arabic simple" start="2">
+<li>Specify the address of the server in the <strong>Server Address</strong> field.</li>
+</ol>
+<blockquote>
+<div><img alt="../_images/osx_webdav1.png" src="../_images/osx_webdav1.png" />
+<p>For example, the URL used to connect to the ownCloud server
+from the Mac OS X Finder is:</p>
+<div class="highlight-python"><pre>http://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<img alt="../_images/osx_webdav2.png" src="../_images/osx_webdav2.png" />
+</div></blockquote>
+<ol class="arabic simple" start="3">
+<li>Click <strong>Connect</strong>.</li>
+</ol>
+<blockquote>
+<div>The device connects to the server.</div></blockquote>
+<p>For added details about how to connect to an external server using Mac OS X,
+check the <a class="reference external" href="http://docs.info.apple.com/article.html?path=Mac/10.6/en/8160.html">vendor documentation</a></p>
+</div>
+<div class="section" id="accessing-files-using-microsoft-windows">
+<h2>Accessing Files Using Microsoft Windows<a class="headerlink" href="#accessing-files-using-microsoft-windows" title="Permalink to this headline">¶</a></h2>
+<p>It is best to use a suitable WebDAV client from the
+<a class="reference external" href="http://www.webdav.org/projects/">WebDAV Project page</a> .</p>
+<p>If you must use the native Windows implementation, you can map ownCloud to a new
+drive. Mapping to a drive enables you to browse files stored on an ownCloud
+server the way you would files stored in a mapped network drive.</p>
+<p>Using this feature requires network connectivity. If you want to store your
+files offline, use the ownCloud Desktop Client to sync all files on your
+ownCloud to one or more directories of your local hard drive.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Prior to mapping your drive, you must permit the use of Basic
+Authentication in the Windows Registry. The procedure is documented in
+<a class="reference external" href="http://support.microsoft.com/kb/841215">KB841215</a> and differs between Windows XP/Server 2003 and Windows Vista/7.
+Please follow the Knowledge Base article before proceeding, and follow the
+Vista instructions if you run Windows 7.</p>
+</div>
+<div class="section" id="mapping-drives-with-the-command-line">
+<h3>Mapping Drives With the Command Line<a class="headerlink" href="#mapping-drives-with-the-command-line" title="Permalink to this headline">¶</a></h3>
+<p>The following example shows how to map a drive using the command line. To map
+the drive:</p>
+<ol class="arabic">
+<li><p class="first">Open a command prompt in Windows.</p>
+</li>
+<li><p class="first">Enter the following line in the command prompt to map to the computer Z
+drive:</p>
+<div class="highlight-python"><pre>net use Z: https://<drive_path>/remote.php/webdav /user:youruser
+yourpassword</pre>
+</div>
+</li>
+</ol>
+<blockquote>
+<div>where <drive_path> is the URL to your ownCloud server.</div></blockquote>
+<p>For example: <tt class="docutils literal"><span class="pre">net</span> <span class="pre">use</span> <span class="pre">Z:</span> <span class="pre">https://example.org/owncloud/remote.php/webdav</span>
+<span class="pre">/user:youruser</span> <span class="pre">yourpassword</span></tt></p>
+<blockquote>
+<div>The computer maps the files of your ownCloud account to the drive letter Z.</div></blockquote>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Though not recommended, you can also mount the ownCloud server
+using HTTP, leaving the connection unencrypted. If you plan to use HTTP
+connections on devices while in public place, we strongly recommend using a
+VPN tunnel to provide the necessary security.</p>
+</div>
+<p>An alternative command syntax is:</p>
+<div class="highlight-python"><pre>net use Z: \\example.org at ssl\owncloud\remote.php\webdav /user:youruser
+yourpassword</pre>
+</div>
+<p>You can also mount your ownCloud via HTTP, leaving the connection unencrypted.</p>
+</div>
+<div class="section" id="mapping-drives-with-windows-explorer">
+<h3>Mapping Drives With Windows Explorer<a class="headerlink" href="#mapping-drives-with-windows-explorer" title="Permalink to this headline">¶</a></h3>
+<p>To map a drive using the Microsoft Windows Explorer:</p>
+<ol class="arabic simple">
+<li>Migrate to your computer in Windows Explorer.</li>
+<li>Right-click on <strong>Computer</strong> entry and select <strong>Map network drive...</strong> from
+the drop-down menu.</li>
+<li>Choose a local network drive to which you want to map ownCloud.</li>
+<li>Specify the address to your ownCloud instance, followed by
+<strong>/remote.php/webdav</strong>.</li>
+</ol>
+<blockquote>
+<div><p>For example:</p>
+<div class="highlight-python"><pre>https://example.org/owncloud/remote.php/webdav</pre>
+</div>
+</div></blockquote>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">For SSL protected servers, check <strong>Reconnect at logon</strong> to ensure
+that the mapping is persistent upon subsequent reboots. If you want to
+connect to the ownCloud server as a different user, check <strong>Connect using
+different credentials</strong>.</p>
+</div>
+<div class="figure">
+<a class="reference internal image-reference" href="../_images/explorer_webdav.png"><img alt="../_images/explorer_webdav.png" src="../_images/explorer_webdav.png" style="width: 502.4px; height: 366.4px;" /></a>
+<p class="caption"><strong>Mapping WebDAV on Windows Explorer</strong></p>
+</div>
+<ol class="arabic simple" start="5">
+<li>Click the <tt class="docutils literal"><span class="pre">Finish</span></tt> button.</li>
+</ol>
+<blockquote>
+<div>Windows Explorer maps the network drive, making your ownCloud instance
+available.</div></blockquote>
+</div>
+</div>
+<div class="section" id="accessing-files-using-cyberduck">
+<h2>Accessing Files Using Cyberduck<a class="headerlink" href="#accessing-files-using-cyberduck" title="Permalink to this headline">¶</a></h2>
+<p><a class="reference external" href="https://cyberduck.io/?l=en">Cyberduck</a> is an open source FTP and SFTP,
+WebDAV, OpenStack Swift, and Amazon S3 browser designed for file transfers on
+Mac OS X and Windows.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This example uses Cyberduck version 4.2.1.</p>
+</div>
+<p>To use Cyberduck:</p>
+<ol class="arabic simple">
+<li>Specify a server without any leading protocol information. For example:</li>
+</ol>
+<blockquote>
+<div><tt class="docutils literal"><span class="pre">example.org</span></tt></div></blockquote>
+<p>2. Specify the appropriate port. The port you choose depends on whether or not
+your ownCloud server supports SSL. Cyberduck requires that you select a
+different connection type if you plan to use SSL. For example:</p>
+<blockquote>
+<div><p>80 (for WebDAV)</p>
+<p>443 (for WebDAV (HTTPS/SSL))</p>
+</div></blockquote>
+<p>3. Use the ‘More Options’ drop-down menu to add the rest of your WebDAV URL into
+the ‘Path’ field. For example:</p>
+<blockquote>
+<div><tt class="docutils literal"><span class="pre">remote.php/webdav</span></tt></div></blockquote>
+<p>Now Cyberduck enables file access to the ownCloud server.</p>
+<div class="section" id="known-problems">
+<h3>Known Problems<a class="headerlink" href="#known-problems" title="Permalink to this headline">¶</a></h3>
+<dl class="docutils">
+<dt><strong>Problem</strong></dt>
+<dd>Windows does not connect using HTTPS.</dd>
+<dt><strong>Solution 1</strong></dt>
+<dd>The Windows WebDAV Client might not support Server Name Indication (SNI) on
+encrypted connections. If you encounter an error mounting an SSL-encrypted
+ownCloud instance, contact your provider about assigning a dedicated IP
+address for your SSL-based server.</dd>
+<dt><strong>Solution 2</strong></dt>
+<dd>The Windows WebDAV Client might not support TSLv1.1 / TSLv1.2 connections.
+If you have restricted your server config to only provide TLSv1.1 and above
+the connection to your server might fail. Please refer to the <a class="reference external" href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa382925.aspx#WinHTTP_5.1_Features">WinHTTP</a>
+documentation for further information.</dd>
+</dl>
+<dl class="docutils">
+<dt><strong>Problem</strong></dt>
+<dd>You receive the following error message:
+<strong>Error 0x800700DF: The file size exceeds the limit allowed and cannot be
+saved.</strong></dd>
+<dt><strong>Solution</strong></dt>
+<dd><p class="first">Windows limits the maximum size a file transferred from or to a WebDAV share
+may have. You can increase the value <strong>FileSizeLimitInBytes</strong> in
+<strong>HKEY_LOCAL_MacHINESYSTEMCurrentControlSetServicesWebClientParameters</strong>
+by clicking on <strong>Modify</strong>.</p>
+<p class="last">To increase the limit to the maximum value of 4GB, select <strong>Decimal</strong>, enter
+a value of <strong>4294967295</strong>, and reboot Windows or restart the <strong>WebClient</strong>
+service.</p>
+</dd>
+<dt><strong>Problem</strong></dt>
+<dd>Accessing your files from Microsoft Office via WebDAV fails.</dd>
+<dt><strong>Solution</strong></dt>
+<dd>Known problems and their solutions are documented in the <a class="reference external" href="https://support.microsoft.com/kb/2123563">KB2123563</a> article.</dd>
+<dt><strong>Problem</strong></dt>
+<dd>You cannot download more than 50 MB or upload large Files when the upload takes
+longer than 30 minutes using Web Client in Windows 7.</dd>
+<dt><strong>Solution</strong></dt>
+<dd>Workarounds are documented in the <a class="reference external" href="https://support.microsoft.com/kb/2668751">KB2668751</a> article.</dd>
+</dl>
+</div>
+</div>
++<div class="section" id="accessing-files-using-curl">
++<h2>Accessing Files Using cURL<a class="headerlink" href="#accessing-files-using-curl" title="Permalink to this headline">¶</a></h2>
++<p>Since WebDAV is an extension of HTTP cURL can be used to script file operations.</p>
++<p>To create a folder with the current date as name:</p>
++<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>curl -u user:pass -X MKCOL <span class="s2">"http://example.org/owncloud/remote.php/webdav/$(date '+%d-%b-%Y')"</span>
++</pre></div>
++</div>
++<p>To upload a file <tt class="docutils literal"><span class="pre">error.log</span></tt> into that directory:</p>
++<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>curl -u user:pass -T error.log <span class="s2">"http://example.org/owncloud/remote.php/webdav/$(date '+%d-%b-%Y')/error.log"</span>
++</pre></div>
++</div>
++<p>To move a file:</p>
++<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>curl -u user:pass -X MOVE --header <span class="s1">'Destination: http://example.org/owncloud/remote.php/webdav/target.jpg'</span> http://example.org/owncloud/remote.php/webdav/source.jpg
++</pre></div>
++</div>
++<p>To get the properties of files in the root folder:</p>
++<div class="highlight-bash"><div class="highlight"><pre> <span class="nv">$ </span>curl -X PROPFIND -H <span class="s2">"Depth: 1"</span> -u user:pass http://example.org/owncloud/remote.php/webdav/ | xml_pp
++ <?xml <span class="nv">version</span><span class="o">=</span><span class="s2">"1.0"</span> <span class="nv">encoding</span><span class="o">=</span><span class="s2">"utf-8"</span>?>
++<d:multistatus xmlns:d<span class="o">=</span><span class="s2">"DAV:"</span> xmlns:oc<span class="o">=</span><span class="s2">"http://owncloud.org/ns"</span> xmlns:s<span class="o">=</span><span class="s2">"http://sabredav.org/ns"</span>>
++ <d:response>
++ <d:href>/owncloud/remote.php/webdav/</d:href>
++ <d:propstat>
++ <d:prop>
++ <d:getlastmodified>Tue, 13 Oct 2015 17:07:45 GMT</d:getlastmodified>
++ <d:resourcetype>
++ <d:collection/>
++ </d:resourcetype>
++ <d:quota-used-bytes>163</d:quota-used-bytes>
++ <d:quota-available-bytes>11802275840</d:quota-available-bytes>
++ <d:getetag><span class="s2">"561d3a6139d05"</span></d:getetag>
++ </d:prop>
++ <d:status>HTTP/1.1 200 OK</d:status>
++ </d:propstat>
++ </d:response>
++ <d:response>
++ <d:href>/owncloud/remote.php/webdav/welcome.txt</d:href>
++ <d:propstat>
++ <d:prop>
++ <d:getlastmodified>Tue, 13 Oct 2015 17:07:35 GMT</d:getlastmodified>
++ <d:getcontentlength>163</d:getcontentlength>
++ <d:resourcetype/>
++ <d:getetag><span class="s2">"47465fae667b2d0fee154f5e17d1f0f1"</span></d:getetag>
++ <d:getcontenttype>text/plain</d:getcontenttype>
++ </d:prop>
++ <d:status>HTTP/1.1 200 OK</d:status>
++ </d:propstat>
++ </d:response>
++</d:multistatus>
++</pre></div>
++</div>
++</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc version.php
index d6bac1e,2230ce3..442429c
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,19 +1,6 @@@
-<?php
-
-// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
-// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
-// when updating major/minor version number.
-$OC_Version=array(7, 0, 11, 0);
-
-// The human readable string
-$OC_VersionString='7.0.11 RC1';
-
-// The ownCloud edition
-$OC_Edition='';
-
-// The ownCloud channel
-$OC_Channel='git';
-
-// The build number
-$OC_Build='';
-
+<?php
- $OC_Version = array(7,0,10,0);
- $OC_VersionString = '7.0.10';
++$OC_Version = array(7,0,11,0);
++$OC_VersionString = '7.0.11 RC1';
+$OC_Edition = '';
- $OC_Channel = 'stable';
- $OC_Build = '2015-09-10T14:37:24+00:00 4b6474edf1b8ee50a7dc4fa327d962f116ffa863';
++$OC_Channel = 'testing';
++$OC_Build = '2015-10-22T00:01:48+00:00 df9b8cdd7f402271ed1c905970f4c41c39aa8dbc';
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list