[Pkg-owncloud-commits] [owncloud] 03/05: Imported Upstream version 8.2.1~~rc3~dfsg
David Prévot
taffit at moszumanska.debian.org
Fri Nov 13 17:11:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit 7b9061cfc01f05d1a9715db0bbf832d0e88e7f17
Merge: 519f9e2 583dd64
Author: David Prévot <taffit at debian.org>
Date: Fri Nov 13 12:59:43 2015 -0400
Imported Upstream version 8.2.1~~rc3~dfsg
core/doc/admin/_images/install-wizard-2.png | Bin 28652 -> 0 bytes
core/doc/admin/_images/install-wizard-3.png | Bin 26007 -> 0 bytes
core/doc/admin/_images/install-wizard-a.png | Bin 0 -> 17021 bytes
core/doc/admin/_images/install-wizard-a1.png | Bin 0 -> 19504 bytes
core/doc/admin/_images/install-wizard-a2.png | Bin 0 -> 49100 bytes
core/doc/admin/_images/install-wizard-a4.png | Bin 0 -> 51635 bytes
core/doc/admin/_images/install-wizard.png | Bin 40430 -> 0 bytes
core/doc/admin/_images/untrusted-domain.png | Bin 26983 -> 0 bytes
.../_sources/installation/installation_wizard.txt | 40 ++++++++++-----------
.../admin/installation/installation_wizard.html | 33 +++++++++--------
core/doc/user/_images/oc_main_web_labelled.png | Bin 53491 -> 50962 bytes
core/doc/user/_images/oc_main_web_labelled1.png | Bin 0 -> 50962 bytes
core/doc/user/_images/users-files.png | Bin 53491 -> 0 bytes
core/doc/user/_sources/files/access_webgui.txt | 4 ++-
core/doc/user/files/access_webgui.html | 2 +-
core/doc/user/webinterface.html | 2 +-
version.php | 6 ++--
17 files changed, 43 insertions(+), 44 deletions(-)
diff --cc core/doc/admin/_images/install-wizard-a.png
index 0000000,0000000..6586dbc
new file mode 100644
Binary files differ
diff --cc core/doc/admin/_images/install-wizard-a1.png
index 0000000,0000000..a8d1564
new file mode 100644
Binary files differ
diff --cc core/doc/admin/_images/install-wizard-a2.png
index 0000000,0000000..e2dc459
new file mode 100644
Binary files differ
diff --cc core/doc/admin/_images/install-wizard-a4.png
index 0000000,0000000..4eb108c
new file mode 100644
Binary files differ
diff --cc core/doc/admin/_sources/installation/installation_wizard.txt
index ede86eb,0000000..1545972
mode 100644,000000..100644
--- a/core/doc/admin/_sources/installation/installation_wizard.txt
+++ b/core/doc/admin/_sources/installation/installation_wizard.txt
@@@ -1,179 -1,0 +1,177 @@@
+===================
+Installation Wizard
+===================
+
+Quick Start
+-----------
+
+When ownCloud prerequisites are fulfilled and all ownCloud files are installed,
+the last step to completing the installation is running the Installation
+Wizard.
+This is just three steps:
+
+#. Point your Web browser to ``http://localhost/owncloud``
+#. Enter your desired administrator's username and password.
+#. Click **Finish Setup**.
+
- .. figure:: images/install-wizard.png
++.. figure:: images/install-wizard-a.png
+ :scale: 75%
+ :alt: screenshot of the installation wizard
+
+You're finished and can start using your new ownCloud server.
+
+Of course, there is much more that you can do to set up your ownCloud server for
+best performance and security. In the following sections we will cover important
+installation and post-installation steps. Note that you must follow the
+instructions in :ref:`Setting Strong Permissions <strong_perms_label>` in order
+to use the :doc:`occ Command <../configuration_server/occ_command>`.
+
+* :ref:`Data Directory Location <data_directory_location_label>`
+* :ref:`Database Choice <database_choice_label>`
+* :ref:`Trusted Domains <trusted_domains_label>`
+* :ref:`Setting Strong Permissions <strong_perms_label>`
+
+.. _data_directory_location_label:
+
+Data Directory Location
+-----------------------
+
+Click **Storage and Database** to expose additional installation configuration
- options for your ownCloud data directory and database options.
++options for your ownCloud data directory and database.
+
- .. figure:: images/install-wizard-2.png
++.. figure:: images/install-wizard-a1.png
+ :scale: 75%
- :alt: screenshot of the installation wizard with all options exposed
++ :alt: installation wizard with all options exposed
+
+You should locate your ownCloud data directory outside of your Web root if you
+are using an HTTP server other than Apache, or you may wish to store your
+ownCloud data in a different location for other reasons (e.g. on a storage
+server). It is best to configure your data directory location at installation,
+as it is difficult to move after installation. You may put it anywhere; in this
+example is it located in ``/var/oc_data``. This directory must already exist,
+and must be owned by your HTTP user (see
+:ref:`strong_perms_label`).
+
+.. _database_choice_label:
+
+Database Choice
+---------------
+
- SQLite is the default database for ownCloud Server (it is not
- available and not supported in the Enterprise edition), and it is good only for
- testing and lightweight single-user setups without client synchronization.
- Supported databases are MySQL, MariaDB, Oracle 11g, and PostgreSQL, and we
- recommend :doc:`MySQL/MariaDB <system_requirements>`. Your database and PHP
- connectors must be installed before you run the Installation Wizard. When you
- install ownCloud from packages all the necessary dependencies will be satisfied
- (see :doc:`source_installation` for a detailed listing of required and optional
- PHP modules). You will need the root database login, or any administrator login
- that has permissions to create and modify databases, and then enter any name
- you
- want for your ownCloud database.
++SQLite is the default database for ownCloud Server (it is not available and not
++supported in the Enterprise edition), and it is good only for testing and
++lightweight single-user setups without client synchronization. Supported
++databases are MySQL, MariaDB, Oracle 11g, and PostgreSQL, and we recommend
++:doc:`MySQL/MariaDB <system_requirements>`. Your database and PHP connectors
++must be installed before you run the Installation Wizard. When you install
++ownCloud from packages all the necessary dependencies will be satisfied (see
++:doc:`source_installation` for a detailed listing of required and optional PHP
++modules). You will need the root database login, or any administrator login that
++has permissions to create and modify databases, and then enter any name you want
++for your ownCloud database.
+
+Click Finish Setup, and start using your new ownCloud server.
+
- .. figure:: images/install-wizard-3.png
++.. figure:: images/install-wizard-a2.png
+ :scale: 75%
- :alt: screenshot of the welcome screen after a successful installation
++ :alt: ownCloud welcome screen after a successful installation
+
+Now we will look at some important post-installation steps.
+
+.. _trusted_domains_label:
+
+Trusted Domains
+---------------
+
+All URLs used to access your ownCloud server must be whitelisted in your
+``config.php`` file, under the ``trusted_domains`` setting. Users
+are allowed to log into ownCloud only when they point their browsers to a
+URL that is listed in the ``trusted_domains`` setting. You may use IP addresses
+and domain names. A typical configuration looks like this::
+
+ 'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'server1.example.com',
+ 2 => '192.168.1.50',
+ ),
+
+The loopback address, ``127.0.0.1``, is automatically whitelisted, so as long
+as you have access to the physical server you can always log in. 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. When a user tries a URL that
+is not whitelisted the following error appears:
+
- .. figure:: images/untrusted-domain.png
++.. figure:: images/install-wizard-a4.png
+ :scale: 75%
- :alt: screenshot of error message when URL is not whitelisted in
- trusted_domains
++ :alt: Error message when URL is not whitelisted
+
+.. _strong_perms_label:
+
+Setting Strong Directory Permissions
+------------------------------------
+
+For hardened security we recommend setting the permissions on your ownCloud
+directories as strictly as possible, and for proper server operations. This
+should be done immediately after the initial installation. Your HTTP user must
+own the ``config/``, ``data/`` and ``apps/`` directories 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
+use :ref:`label-phpinfo` (Look for the **User/Group** line).
+
+* 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 ${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 ${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:`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
diff --cc core/doc/admin/installation/installation_wizard.html
index 53ff5b8,0000000..ed32d6f
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_wizard.html
+++ b/core/doc/admin/installation/installation_wizard.html
@@@ -1,338 -1,0 +1,337 @@@
+
+<!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 Server Administration Manual 8.2 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: '8.2',
+ 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 Server Administration Manual 8.2 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Installing ownCloud From the Command Line" href="command_line_installation.html" />
+ <link rel="prev" title="Preferred Linux Installation Method" href="linux_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 Server Administration 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 class="current">
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 8.2</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="system_requirements.html">System Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html">Preferred Linux Installation Method</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="#quick-start">Quick Start</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#data-directory-location">Data Directory Location</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="#trusted-domains">Trusted Domains</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="command_line_installation.html">Installing ownCloud From the Command Line</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="source_installation.html">Manual Installation on Linux</a></li>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html">ownCloud Community Appliance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="php_54_installation.html">Installing PHP 5.4 on RHEL 6 and CentOS 6</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html">SELinux Configuration</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="ucs_installation.html">Univention Corporate Server</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="yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="macos_installation.html">Mac OS X</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_server/index.html">ownCloud Server Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_mimetypes/index.html">Mimetypes Management</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="../operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_user_management/index.html">User Management (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</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>
+<div class="section" id="quick-start">
+<h2>Quick Start<a class="headerlink" href="#quick-start" title="Permalink to this headline">¶</a></h2>
+<p>When ownCloud prerequisites are fulfilled and all ownCloud files are installed,
+the last step to completing the installation is running the Installation
+Wizard.
+This is just three steps:</p>
+<ol class="arabic simple">
+<li>Point your Web browser to <tt class="docutils literal"><span class="pre">http://localhost/owncloud</span></tt></li>
+<li>Enter your desired administrator’s username and password.</li>
+<li>Click <strong>Finish Setup</strong>.</li>
+</ol>
+<div class="figure">
- <a class="reference internal image-reference" href="../_images/install-wizard.png"><img alt="screenshot of the installation wizard" src="../_images/install-wizard.png" style="width: 276.0px; height: 511.5px;" /></a>
++<a class="reference internal image-reference" href="../_images/install-wizard-a.png"><img alt="screenshot of the installation wizard" src="../_images/install-wizard-a.png" style="width: 250.5px; height: 350.25px;" /></a>
+</div>
+<p>You’re finished and can start using your new ownCloud server.</p>
+<p>Of course, there is much more that you can do to set up your ownCloud server for
+best performance and security. In the following sections we will cover important
+installation and post-installation steps. Note that you must follow the
+instructions in <a class="reference internal" href="#strong-perms-label"><em>Setting Strong Permissions</em></a> in order
+to use the <a class="reference internal" href="../configuration_server/occ_command.html"><em>occ Command</em></a>.</p>
+<ul class="simple">
+<li><a class="reference internal" href="#data-directory-location-label"><em>Data Directory Location</em></a></li>
+<li><a class="reference internal" href="#database-choice-label"><em>Database Choice</em></a></li>
+<li><a class="reference internal" href="#trusted-domains-label"><em>Trusted Domains</em></a></li>
+<li><a class="reference internal" href="#strong-perms-label"><em>Setting Strong Permissions</em></a></li>
+</ul>
+</div>
+<div class="section" id="data-directory-location">
+<span id="data-directory-location-label"></span><h2>Data Directory Location<a class="headerlink" href="#data-directory-location" title="Permalink to this headline">¶</a></h2>
+<p>Click <strong>Storage and Database</strong> to expose additional installation configuration
- options for your ownCloud data directory and database options.</p>
++options for your ownCloud data directory and database.</p>
+<div class="figure">
- <a class="reference internal image-reference" href="../_images/install-wizard-2.png"><img alt="screenshot of the installation wizard with all options exposed" src="../_images/install-wizard-2.png" style="width: 231.75px; height: 520.5px;" /></a>
++<a class="reference internal image-reference" href="../_images/install-wizard-a1.png"><img alt="installation wizard with all options exposed" src="../_images/install-wizard-a1.png" style="width: 280.5px; height: 418.5px;" /></a>
+</div>
+<p>You should locate your ownCloud data directory outside of your Web root if you
+are using an HTTP server other than Apache, or you may wish to store your
+ownCloud data in a different location for other reasons (e.g. on a storage
+server). It is best to configure your data directory location at installation,
+as it is difficult to move after installation. You may put it anywhere; in this
+example is it located in <tt class="docutils literal"><span class="pre">/var/oc_data</span></tt>. This directory must already exist,
+and must be owned by your HTTP user (see
+<a class="reference internal" href="#strong-perms-label"><em>Setting Strong Directory Permissions</em></a>).</p>
+</div>
+<div class="section" id="database-choice">
+<span id="database-choice-label"></span><h2>Database Choice<a class="headerlink" href="#database-choice" title="Permalink to this headline">¶</a></h2>
- <p>SQLite is the default database for ownCloud Server (it is not
- available and not supported in the Enterprise edition), and it is good only for
- testing and lightweight single-user setups without client synchronization.
- Supported databases are MySQL, MariaDB, Oracle 11g, and PostgreSQL, and we
- recommend <a class="reference internal" href="system_requirements.html"><em>MySQL/MariaDB</em></a>. Your database and PHP
- connectors must be installed before you run the Installation Wizard. When you
- install ownCloud from packages all the necessary dependencies will be satisfied
- (see <a class="reference internal" href="source_installation.html"><em>Manual Installation on Linux</em></a> for a detailed listing of required and optional
- PHP modules). You will need the root database login, or any administrator login
- that has permissions to create and modify databases, and then enter any name
- you
- want for your ownCloud database.</p>
++<p>SQLite is the default database for ownCloud Server (it is not available and not
++supported in the Enterprise edition), and it is good only for testing and
++lightweight single-user setups without client synchronization. Supported
++databases are MySQL, MariaDB, Oracle 11g, and PostgreSQL, and we recommend
++<a class="reference internal" href="system_requirements.html"><em>MySQL/MariaDB</em></a>. Your database and PHP connectors
++must be installed before you run the Installation Wizard. When you install
++ownCloud from packages all the necessary dependencies will be satisfied (see
++<a class="reference internal" href="source_installation.html"><em>Manual Installation on Linux</em></a> for a detailed listing of required and optional PHP
++modules). You will need the root database login, or any administrator login that
++has permissions to create and modify databases, and then enter any name you want
++for your ownCloud database.</p>
+<p>Click Finish Setup, and start using your new ownCloud server.</p>
+<div class="figure">
- <a class="reference internal image-reference" href="../_images/install-wizard-3.png"><img alt="screenshot of the welcome screen after a successful installation" src="../_images/install-wizard-3.png" style="width: 375.0px; height: 240.75px;" /></a>
++<a class="reference internal image-reference" href="../_images/install-wizard-a2.png"><img alt="ownCloud welcome screen after a successful installation" src="../_images/install-wizard-a2.png" style="width: 433.5px; height: 356.25px;" /></a>
+</div>
+<p>Now we will look at some important post-installation steps.</p>
+</div>
+<div class="section" id="trusted-domains">
+<span id="trusted-domains-label"></span><h2>Trusted Domains<a class="headerlink" href="#trusted-domains" title="Permalink to this headline">¶</a></h2>
+<p>All URLs used to access your ownCloud server must be whitelisted in your
+<tt class="docutils literal"><span class="pre">config.php</span></tt> file, under the <tt class="docutils literal"><span class="pre">trusted_domains</span></tt> setting. Users
+are allowed to log into ownCloud only when they point their browsers to a
+URL that is listed in the <tt class="docutils literal"><span class="pre">trusted_domains</span></tt> setting. You may use IP addresses
+and domain names. A typical configuration looks like this:</p>
+<div class="highlight-python"><pre>'trusted_domains' =>
+ array (
+ 0 => 'localhost',
+ 1 => 'server1.example.com',
+ 2 => '192.168.1.50',
+),</pre>
+</div>
+<p>The loopback address, <tt class="docutils literal"><span class="pre">127.0.0.1</span></tt>, is automatically whitelisted, so as long
+as you have access to the physical server you can always log in. 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. When a user tries a URL that
+is not whitelisted the following error appears:</p>
+<div class="figure">
- <a class="reference internal image-reference" href="../_images/untrusted-domain.png"><img alt="screenshot of error message when URL is not whitelisted in trusted_domains" src="../_images/untrusted-domain.png" style="width: 725.25px; height: 272.25px;" /></a>
++<a class="reference internal image-reference" href="../_images/install-wizard-a4.png"><img alt="Error message when URL is not whitelisted" src="../_images/install-wizard-a4.png" style="width: 544.5px; height: 273.0px;" /></a>
+</div>
+</div>
+<div class="section" id="setting-strong-directory-permissions">
+<span id="strong-perms-label"></span><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
+directories as strictly as possible, and for proper server operations. 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 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
+use <a class="reference internal" href="../issues/index.html#label-phpinfo"><em>PHP Version and Information</em></a> (Look for the <strong>User/Group</strong> line).</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 ${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 ${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">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>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/_images/oc_main_web_labelled.png
index 88d039b,0000000..813175e
mode 100644,000000..100644
Binary files differ
diff --cc core/doc/user/_images/oc_main_web_labelled1.png
index 0000000,0000000..813175e
new file mode 100644
Binary files differ
diff --cc core/doc/user/_sources/files/access_webgui.txt
index a42d773,0000000..608d473
mode 100644,000000..100644
--- a/core/doc/user/_sources/files/access_webgui.txt
+++ b/core/doc/user/_sources/files/access_webgui.txt
@@@ -1,227 -1,0 +1,229 @@@
+=====================================================
+Accessing your Files Using the ownCloud Web Interface
+=====================================================
+
+You can access your ownCloud files with the ownCloud web interface and create,
+preview, edit, delete, share, and re-share files. Your ownCloud administrator
+has the option to disable these features, so if any of them are missing on your
+system ask your server administrator.
+
- .. figure:: ../images/users-files.png
++.. figure:: ../images/oc_main_web_labelled.png
++ :scale: 75%
++ :alt: The Files view screen.
+
+ownCloud can display thumbnail previews for image files, MP3 covers,
+and text files, if this enabled by your server administrator. Hover your cursor
+over a file or folder to expose the controls for the following operations:
+
+Favorites
+ Click the star to the left of the file icon to mark it as a favorite.
+
+Pencil icon
+ Rename a file or folder. This does not alter the filename on the original
+ document.
+
+Download
+ Download the file to your computer.
+
+Versions
+ Displays older versions, if there are any, and you can revert to an older
+ file version.
+
+Edit
+ The Edit button appears on files that are editable inside ownCloud, in the
+ Documents app. Supported file formats are ``.odt``, ``.doc``, and ``.docx``.
+
+Share
+ Share the file or folder with a group or other users, and create public
+ shares with hyperlinks.
+
+Trash
+ Delete the selected file or folder, or unshare a shared file or folder.
+
+Previewing Files
+----------------
+
+You can display uncompressed text files, OpenDocument files, videos, and image files in
+the ownCloud embedded viewers by clicking on the file name. There may be other file types
+you can preview if your ownCloud administrator has enabled them. If ownCloud cannot
+display a file, it starts a download process and downloads the file to your computer.
+
+Video streaming by the native ownCloud video player depends on your Web browser and the
+video format. If your ownCloud administrator has enabled video streaming, and it doesn't
+work in your Web browser, it may be a browser issue.
+
+Navigating Inside Your ownCloud
+-------------------------------
+
+Navigating through folders in ownCloud is as simple as clicking on a folder to
+open it and using the back button on your browser to move to a previous level.
+ownCloud also provides a navigation bar at the top of the Files field for quick
+navigation.
+
+.. figure:: ../images/oc_filesweb_navigate.png
+
+ **Navigation bar**
+
+The navigation bar functions as a "breadcrumb" locator. It displays your
+current directory and enables you to migrate back to one of the upper
+directories or, using the home icon, to navigate back into your root folder.
+
+Overlay Icons Show Sharing Status
+---------------------------------
+Any folder that has been shared is marked with the ``Shared`` overlay icon.
+Public link shares are marked with a chain link. Un-shared folders are blank.
+
+.. figure:: ../images/users-overlays.png
+
+If your ownCloud server is the Enterprise Subscription, you may also have access
+to Sharepoint and Windows Network Drive file shares. These also have special
+overlay icons, and a red plugin means you have to enter a login to get access to
+the share.
+
+.. figure:: ../images/users-overlays-win-net-drive.png
+
+.. figure:: ../images/users-overlays-sharepoint.png
+
+Creating or Uploading Files and Directories
+-------------------------------------------
+
+ownCloud enables you to create new files or folders directly in an ownCloud
+folder by clicking on the *New* button in the Files app.
+
+.. figure:: ../images/oc_filesweb_new.png
+
+ **New button options**
+
+The *New* button provides the following two options from which to choose:
+
+Text file
+ Creates a simple text file and adds the file to your current folder.
+
+Folder
+ Creates a new folder in the current folder.
+
+Up arrow
+ The upward-point arrow is for uploading files from your computer into
+ ownCloud.
+
+You can also upload files by dragging and dropping them from your file manager.
+
+Selecting Files or Folders
+--------------------------
+
+You can select one or more files or folders by clicking on the small thumbnails
+or icons that represent them. When you select a file or folder, a small
+checkbox is populated with a check to indicate that it is selected. To select
+all files in the current directory, you can click on the checkbox located at
+the top of the Files app field, above the first file or folder on the list.
+
+If you select multiple files, you can delete all of the selected files or
+download them as a ZIP file by using the ``Delete`` or ``Download`` buttons at
+the top right side of the Files app field.
+
+.. note:: If the ``Download`` button is not visible, the administrator has
+ disabled this feature. Contact your administrator for further guidance.
+
+Filtering the File Application View
+-----------------------------------
+
+ownCloud enables you to view files in the File Application View using filter
+options located in the Apps Information Field. This feature enables you to
+quickly and easily view and manage files based on their share status.
+
+You can click on any of the filter options to view the files as follows:
+
+All files
+ The default view; displays all files that you have access to.
+
+Favorites
+ Files or folders marked with the yellow star.
+
+Shared with you
+ Displays all files shared with you by another user or group.
+
+Shared with others
+ Displays all files that you have shared with other users or groups.
+
+Shared by link
+ Displays all files that are shared by you via public link.
+
+External Storage
+ Files that you have access to on external storage devices and services such
+ as Dropbox, Google, and Amazon S3.
+
+Moving Files
+------------
+
+Using the ownCloud web interface, you can move files and folders by dragging
+and dropping them into any directory.
+
+Sharing Files Locally
+---------------------
+
+When enabled by your administrator, you can share files or folders on ownCloud
+with a local user, group, or any person online with a public link. Shared files
+and folders are labeled with the triangular share icon, and the status *Shared*
+in the file or folder row.
+
+To create a local share with other users or groups on your ownCloud server:
+
+1. Hover your cursor over an item on the Files page
+2. Click the **Share** icon
+
+The Share dialog box opens to show the following options:
+
+.. figure:: ../images/users-share-local.png
+
+ **Share dialog box**
+
+Type the name of the user or group that you want to share with. If you want to
+share with more than one, you have to create each share separately. Check the
+permissions you want the user or group to have, and optionally send them an
+email notification.
+
+.. note:: Users must enter their email addresses on their Personal pages for
+ email notifications to work
+
+Your new share appears on user's Files pages marked with a Share icon, and the
+name of the file owner.
+
+.. figure:: ../images/users-share-local2.png
+
+ **Shared file**
+
+When you want to revoke a share, simply click the Trashcan icon next to the
+name of the appropriate user or group in the Shared dialog.
+
+Creating a Public Link Share
+----------------------------
+
+You can share files outside of your organization with people who are not users
+on your ownCloud server by creating a public share link. Open the Share dialog
+and check Share Link.
+
+.. figure:: ../images/users-share-public.png
+
+ **Public share box**
+
+This creates a public URL that anyone can use to access the share. You have the
+options to send an email notification, protect it with a password, and put an
+expiration date on it. Your ownCloud administrator has the option to require
+passwords and expiration dates.
+
+Change in Share Expiration Date
+-------------------------------
+
+In older versions of ownCloud, you could set an expiration date on both local
+and public shares. Now you can set an expiration date only on public shares,
+and local shares do not expire when public shares expire. The only way to
+"expire" a local share is to click the trash can icon to un-share your files.
+
+Creating or Connecting to a Federated Cloud Sharing Link
+--------------------------------------------------------
+
+Federated Cloud Sharing, introduced in ownCloud 7 as Server-to-Server sharing,
+allows you to mount file shares from remote ownCloud servers, and manage them
+just like a local share. In ownCloud 8 the process for creating a new
+sharing link is easier and more streamlined. See :doc:`federated_cloud_sharing`
+to learn to how to create and connect to new Federated Cloud shares.
diff --cc core/doc/user/files/access_webgui.html
index 724f023,0000000..0247626
mode 100644,000000..100644
--- a/core/doc/user/files/access_webgui.html
+++ b/core/doc/user/files/access_webgui.html
@@@ -1,373 -1,0 +1,373 @@@
+
+<!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 your Files Using the ownCloud Web Interface — ownCloud User Manual 8.2 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: '8.2',
+ 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 8.2 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Accessing ownCloud Files Using WebDAV" href="access_webdav.html" />
+ <link rel="prev" title="Files & Synchronization" 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="../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 class="current">
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 User Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new.html">What’s New for Users in ownCloud 8.2</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 current"><a class="current reference internal" href="">Accessing your Files Using the ownCloud Web Interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#previewing-files">Previewing Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#navigating-inside-your-owncloud">Navigating Inside Your ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#overlay-icons-show-sharing-status">Overlay Icons Show Sharing Status</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-or-uploading-files-and-directories">Creating or Uploading Files and Directories</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#selecting-files-or-folders">Selecting Files or Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#filtering-the-file-application-view">Filtering the File Application View</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#moving-files">Moving Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sharing-files-locally">Sharing Files Locally</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-public-link-share">Creating a Public Link Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#change-in-share-expiration-date">Change in Share Expiration Date</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-or-connecting-to-a-federated-cloud-sharing-link">Creating or Connecting to a Federated Cloud Sharing Link</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="access_webdav.html">Accessing ownCloud Files Using WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deleted_file_management.html">Managing Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="desktop_mobile_sync.html">Desktop and Mobile Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encrypting_files.html">Encrypting Your ownCloud Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="federated_cloud_sharing.html">Using Federated Cloud Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="file_drop.html">Making Anonymous Uploads (ES Only)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="large_file_upload.html">Large File Uploads</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="version_control.html">Version Control</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/index.html">External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="accessing-your-files-using-the-owncloud-web-interface">
+<h1>Accessing your Files Using the ownCloud Web Interface<a class="headerlink" href="#accessing-your-files-using-the-owncloud-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>You can access your ownCloud files with the ownCloud web interface and create,
+preview, edit, delete, share, and re-share files. Your ownCloud administrator
+has the option to disable these features, so if any of them are missing on your
+system ask your server administrator.</p>
+<div class="figure">
- <img alt="../_images/users-files.png" src="../_images/users-files.png" />
++<a class="reference internal image-reference" href="../_images/oc_main_web_labelled.png"><img alt="The Files view screen." src="../_images/oc_main_web_labelled.png" style="width: 705.75px; height: 383.25px;" /></a>
+</div>
+<p>ownCloud can display thumbnail previews for image files, MP3 covers,
+and text files, if this enabled by your server administrator. Hover your cursor
+over a file or folder to expose the controls for the following operations:</p>
+<dl class="docutils">
+<dt>Favorites</dt>
+<dd>Click the star to the left of the file icon to mark it as a favorite.</dd>
+<dt>Pencil icon</dt>
+<dd>Rename a file or folder. This does not alter the filename on the original
+document.</dd>
+<dt>Download</dt>
+<dd>Download the file to your computer.</dd>
+<dt>Versions</dt>
+<dd>Displays older versions, if there are any, and you can revert to an older
+file version.</dd>
+<dt>Edit</dt>
+<dd>The Edit button appears on files that are editable inside ownCloud, in the
+Documents app. Supported file formats are <tt class="docutils literal"><span class="pre">.odt</span></tt>, <tt class="docutils literal"><span class="pre">.doc</span></tt>, and <tt class="docutils literal"><span class="pre">.docx</span></tt>.</dd>
+<dt>Share</dt>
+<dd>Share the file or folder with a group or other users, and create public
+shares with hyperlinks.</dd>
+<dt>Trash</dt>
+<dd>Delete the selected file or folder, or unshare a shared file or folder.</dd>
+</dl>
+<div class="section" id="previewing-files">
+<h2>Previewing Files<a class="headerlink" href="#previewing-files" title="Permalink to this headline">¶</a></h2>
+<p>You can display uncompressed text files, OpenDocument files, videos, and image files in
+the ownCloud embedded viewers by clicking on the file name. There may be other file types
+you can preview if your ownCloud administrator has enabled them. If ownCloud cannot
+display a file, it starts a download process and downloads the file to your computer.</p>
+<p>Video streaming by the native ownCloud video player depends on your Web browser and the
+video format. If your ownCloud administrator has enabled video streaming, and it doesn’t
+work in your Web browser, it may be a browser issue.</p>
+</div>
+<div class="section" id="navigating-inside-your-owncloud">
+<h2>Navigating Inside Your ownCloud<a class="headerlink" href="#navigating-inside-your-owncloud" title="Permalink to this headline">¶</a></h2>
+<p>Navigating through folders in ownCloud is as simple as clicking on a folder to
+open it and using the back button on your browser to move to a previous level.
+ownCloud also provides a navigation bar at the top of the Files field for quick
+navigation.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_navigate.png" src="../_images/oc_filesweb_navigate.png" />
+<p class="caption"><strong>Navigation bar</strong></p>
+</div>
+<p>The navigation bar functions as a “breadcrumb” locator. It displays your
+current directory and enables you to migrate back to one of the upper
+directories or, using the home icon, to navigate back into your root folder.</p>
+</div>
+<div class="section" id="overlay-icons-show-sharing-status">
+<h2>Overlay Icons Show Sharing Status<a class="headerlink" href="#overlay-icons-show-sharing-status" title="Permalink to this headline">¶</a></h2>
+<p>Any folder that has been shared is marked with the <tt class="docutils literal"><span class="pre">Shared</span></tt> overlay icon.
+Public link shares are marked with a chain link. Un-shared folders are blank.</p>
+<div class="figure">
+<img alt="../_images/users-overlays.png" src="../_images/users-overlays.png" />
+</div>
+<p>If your ownCloud server is the Enterprise Subscription, you may also have access
+to Sharepoint and Windows Network Drive file shares. These also have special
+overlay icons, and a red plugin means you have to enter a login to get access to
+the share.</p>
+<div class="figure">
+<img alt="../_images/users-overlays-win-net-drive.png" src="../_images/users-overlays-win-net-drive.png" />
+</div>
+<div class="figure">
+<img alt="../_images/users-overlays-sharepoint.png" src="../_images/users-overlays-sharepoint.png" />
+</div>
+</div>
+<div class="section" id="creating-or-uploading-files-and-directories">
+<h2>Creating or Uploading Files and Directories<a class="headerlink" href="#creating-or-uploading-files-and-directories" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud enables you to create new files or folders directly in an ownCloud
+folder by clicking on the <em>New</em> button in the Files app.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_new.png" src="../_images/oc_filesweb_new.png" />
+<p class="caption"><strong>New button options</strong></p>
+</div>
+<p>The <em>New</em> button provides the following two options from which to choose:</p>
+<dl class="docutils">
+<dt>Text file</dt>
+<dd>Creates a simple text file and adds the file to your current folder.</dd>
+<dt>Folder</dt>
+<dd>Creates a new folder in the current folder.</dd>
+<dt>Up arrow</dt>
+<dd>The upward-point arrow is for uploading files from your computer into
+ownCloud.</dd>
+</dl>
+<p>You can also upload files by dragging and dropping them from your file manager.</p>
+</div>
+<div class="section" id="selecting-files-or-folders">
+<h2>Selecting Files or Folders<a class="headerlink" href="#selecting-files-or-folders" title="Permalink to this headline">¶</a></h2>
+<p>You can select one or more files or folders by clicking on the small thumbnails
+or icons that represent them. When you select a file or folder, a small
+checkbox is populated with a check to indicate that it is selected. To select
+all files in the current directory, you can click on the checkbox located at
+the top of the Files app field, above the first file or folder on the list.</p>
+<p>If you select multiple files, you can delete all of the selected files or
+download them as a ZIP file by using the <tt class="docutils literal"><span class="pre">Delete</span></tt> or <tt class="docutils literal"><span class="pre">Download</span></tt> buttons at
+the top right side of the Files app field.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If the <tt class="docutils literal"><span class="pre">Download</span></tt> button is not visible, the administrator has
+disabled this feature. Contact your administrator for further guidance.</p>
+</div>
+</div>
+<div class="section" id="filtering-the-file-application-view">
+<h2>Filtering the File Application View<a class="headerlink" href="#filtering-the-file-application-view" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud enables you to view files in the File Application View using filter
+options located in the Apps Information Field. This feature enables you to
+quickly and easily view and manage files based on their share status.</p>
+<p>You can click on any of the filter options to view the files as follows:</p>
+<dl class="docutils">
+<dt>All files</dt>
+<dd>The default view; displays all files that you have access to.</dd>
+<dt>Favorites</dt>
+<dd>Files or folders marked with the yellow star.</dd>
+<dt>Shared with you</dt>
+<dd>Displays all files shared with you by another user or group.</dd>
+<dt>Shared with others</dt>
+<dd>Displays all files that you have shared with other users or groups.</dd>
+<dt>Shared by link</dt>
+<dd>Displays all files that are shared by you via public link.</dd>
+<dt>External Storage</dt>
+<dd>Files that you have access to on external storage devices and services such
+as Dropbox, Google, and Amazon S3.</dd>
+</dl>
+</div>
+<div class="section" id="moving-files">
+<h2>Moving Files<a class="headerlink" href="#moving-files" title="Permalink to this headline">¶</a></h2>
+<p>Using the ownCloud web interface, you can move files and folders by dragging
+and dropping them into any directory.</p>
+</div>
+<div class="section" id="sharing-files-locally">
+<h2>Sharing Files Locally<a class="headerlink" href="#sharing-files-locally" title="Permalink to this headline">¶</a></h2>
+<p>When enabled by your administrator, you can share files or folders on ownCloud
+with a local user, group, or any person online with a public link. Shared files
+and folders are labeled with the triangular share icon, and the status <em>Shared</em>
+in the file or folder row.</p>
+<p>To create a local share with other users or groups on your ownCloud server:</p>
+<ol class="arabic simple">
+<li>Hover your cursor over an item on the Files page</li>
+<li>Click the <strong>Share</strong> icon</li>
+</ol>
+<p>The Share dialog box opens to show the following options:</p>
+<div class="figure">
+<img alt="../_images/users-share-local.png" src="../_images/users-share-local.png" />
+<p class="caption"><strong>Share dialog box</strong></p>
+</div>
+<p>Type the name of the user or group that you want to share with. If you want to
+share with more than one, you have to create each share separately. Check the
+permissions you want the user or group to have, and optionally send them an
+email notification.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Users must enter their email addresses on their Personal pages for
+email notifications to work</p>
+</div>
+<p>Your new share appears on user’s Files pages marked with a Share icon, and the
+name of the file owner.</p>
+<div class="figure">
+<img alt="../_images/users-share-local2.png" src="../_images/users-share-local2.png" />
+<p class="caption"><strong>Shared file</strong></p>
+</div>
+<p>When you want to revoke a share, simply click the Trashcan icon next to the
+name of the appropriate user or group in the Shared dialog.</p>
+</div>
+<div class="section" id="creating-a-public-link-share">
+<h2>Creating a Public Link Share<a class="headerlink" href="#creating-a-public-link-share" title="Permalink to this headline">¶</a></h2>
+<p>You can share files outside of your organization with people who are not users
+on your ownCloud server by creating a public share link. Open the Share dialog
+and check Share Link.</p>
+<div class="figure">
+<img alt="../_images/users-share-public.png" src="../_images/users-share-public.png" />
+<p class="caption"><strong>Public share box</strong></p>
+</div>
+<p>This creates a public URL that anyone can use to access the share. You have the
+options to send an email notification, protect it with a password, and put an
+expiration date on it. Your ownCloud administrator has the option to require
+passwords and expiration dates.</p>
+</div>
+<div class="section" id="change-in-share-expiration-date">
+<h2>Change in Share Expiration Date<a class="headerlink" href="#change-in-share-expiration-date" title="Permalink to this headline">¶</a></h2>
+<p>In older versions of ownCloud, you could set an expiration date on both local
+and public shares. Now you can set an expiration date only on public shares,
+and local shares do not expire when public shares expire. The only way to
+“expire” a local share is to click the trash can icon to un-share your files.</p>
+</div>
+<div class="section" id="creating-or-connecting-to-a-federated-cloud-sharing-link">
+<h2>Creating or Connecting to a Federated Cloud Sharing Link<a class="headerlink" href="#creating-or-connecting-to-a-federated-cloud-sharing-link" title="Permalink to this headline">¶</a></h2>
+<p>Federated Cloud Sharing, introduced in ownCloud 7 as Server-to-Server sharing,
+allows you to mount file shares from remote ownCloud servers, and manage them
+just like a local share. In ownCloud 8 the process for creating a new
+sharing link is easier and more streamlined. See <a class="reference internal" href="federated_cloud_sharing.html"><em>Using Federated Cloud Sharing</em></a>
+to learn to how to create and connect to new Federated Cloud shares.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/webinterface.html
index ba4f00b,0000000..930c632
mode 100644,000000..100644
--- a/core/doc/user/webinterface.html
+++ b/core/doc/user/webinterface.html
@@@ -1,228 -1,0 +1,228 @@@
+
+<!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>The ownCloud Web Interface — ownCloud User Manual 8.2 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: '8.2',
+ 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 8.2 documentation" href="index.html" />
+ <link rel="next" title="Files & Synchronization" href="files/index.html" />
+ <link rel="prev" title="What’s New for Users in ownCloud 8.2" href="whats_new.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 class="current">
+<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 8.2 User Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="whats_new.html">What’s New for Users in ownCloud 8.2</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">The ownCloud Web Interface</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#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></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/index.html">External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="the-owncloud-web-interface">
+<h1>The ownCloud Web Interface<a class="headerlink" href="#the-owncloud-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>You can connect to your ownCloud server using any Web browser; just point it to
+your ownCloud server and enter your username and password.</p>
+<blockquote>
+<div><div class="figure">
+<a class="reference internal image-reference" href="_images/oc_connect.png"><img alt="_images/oc_connect.png" src="_images/oc_connect.png" style="width: 325.5px; height: 321.75px;" /></a>
+<p class="caption"><strong>ownCloud login window</strong></p>
+</div>
+</div></blockquote>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Some apps like <tt class="docutils literal"><span class="pre">files_external</span></tt> or <tt class="docutils literal"><span class="pre">encryption</span></tt> are disabling the <tt class="docutils literal"><span class="pre">remember</span></tt>
+checkbox (shown above) on purpose if they are enabled by your administrator.</p>
+</div>
+<div class="section" id="navigating-the-main-user-interface">
+<h2>Navigating the Main User Interface<a class="headerlink" href="#navigating-the-main-user-interface" title="Permalink to this headline">¶</a></h2>
+<p>By default, the ownCloud Web interface opens to your Files page.
+Once you have accessed the ownCloud Server main web interface you can add files,
+remove files, and make changes based on the access privileges set by you
+(if you are administering the server) or by your server administrator.</p>
+<blockquote>
+<div><div class="figure">
- <a class="reference internal image-reference" href="_images/oc_main_web_labelled.png"><img alt="_images/oc_main_web_labelled.png" src="_images/oc_main_web_labelled.png" style="width: 709.5px; height: 369.0px;" /></a>
++<a class="reference internal image-reference" href="_images/oc_main_web_labelled1.png"><img alt="_images/oc_main_web_labelled1.png" src="_images/oc_main_web_labelled1.png" style="width: 705.75px; height: 383.25px;" /></a>
+</div>
+<p><strong>Navigating the main user interface</strong></p>
+</div></blockquote>
+<p>The ownCloud Main User Interface contains the following fields and functions:</p>
+<ul class="simple">
+<li><strong>Apps Selection Menu</strong>: Located in the upper left corner, click the arrow to
+open a dropdown menu to navigate to your various available apps.</li>
+<li><strong>Apps Information</strong> field: Located in the left sidebar, this provides
+filters and tasks associated with your selected app. For example, when you
+are using the Files apps you have a special set of filters for quickly
+finding your files, such as files that have been shared with you, and files
+that you have shared with others. You’ll see different items for other apps.</li>
+<li><strong>Application View</strong>: The main central field in the ownCloud user interface.
+This field displays the contents or user features of your selected app.</li>
+<li><strong>Navigation Bar</strong>: Located over the main viewing window (the Application
+View), this bar provides a type of breadcrumbs navigation that enables you to
+migrate to higher levels of the folder hierarchy up to the root level (home).</li>
+<li><strong>New</strong> button: Located in the Navigation Bar, the <tt class="docutils literal"><span class="pre">New</span></tt> button
+enables you to create new files, new folders, or upload existing files from a
+specified link.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can also drag and drop files from your file manager into the
+ownCloud Files Application View to upload them to ownCloud. Currently,
+the only Web browsers that support drag-and-drop folders are Chrome and
+Chromium.</p>
+</div>
+<ul>
+<li><p class="first"><strong>Upload</strong> button: Located next to the <tt class="docutils literal"><span class="pre">New</span></tt> button in the
+Navigation Bar, the <tt class="docutils literal"><span class="pre">Upload</span></tt> button opens a file picker for
+uploading files from your system to the ownCloud server.</p>
+</li>
+<li><p class="first"><strong>Search</strong> field: The Search field is in the upper right hand corner of
+your Web interface, for searching for files.</p>
+</li>
+<li><p class="first"><strong>Personal Settings</strong> menu: Click on your ownCloud username, located to the
+right of the Search field, to open your Personal Settings dropdown menu. Your
+Personal page provides the following settings and features:</p>
+<ul class="simple">
+<li>Links to download desktop and mobile apps</li>
+<li>Re-run the First Run Wizard</li>
+<li>Server usage and space availability</li>
+<li>Password management</li>
+<li>Name, email, and profile picture settings</li>
+<li>Interface language settings</li>
+<li>Manage notifications</li>
+<li>SSL certificate manager</li>
+<li>ownCloud Version information</li>
+</ul>
+<p>See <a class="reference internal" href="userpreferences.html"><em>Setting Your Preferences</em></a> section to learn more about those settings.</p>
+</li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc version.php
index 34c21dc,2822616..45bbda2
--- a/version.php
+++ b/version.php
@@@ -1,7 -1,40 +1,7 @@@
-<?php
-/**
- * @author C Montero-Luque <cml at owncloud.com>
- * @author Frank Karlitschek <frank at owncloud.org>
- * @author Lukas Reschke <lukas at owncloud.com>
- * @author Roeland Jago Douma <roeland at famdouma.nl>
- * @author Vincent Petry <pvince81 at owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-// 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(8, 2, 1, 2);
-
-// The human readable string
+<?php
- $OC_Version = array(8,2,1,1);
- $OC_VersionString = '8.2.1 RC2';
++$OC_Version = array(8,2,1,2);
+ $OC_VersionString = '8.2.1 RC3';
-
-$OC_VersionCanBeUpgradedFrom = array(8, 1);
-
-// The ownCloud channel
-$OC_Channel = 'git';
-
-// The build number
-$OC_Build = '';
-
+$OC_Edition = '';
+$OC_Channel = 'testing';
+$OC_VersionCanBeUpgradedFrom = array(8,1);
- $OC_Build = '2015-11-10T22:08:29+00:00 d7aadcb5dfa3649285f5efdca6843c0c1aa910bf';
++$OC_Build = '2015-11-13T13:57:22+00:00 583dd64458bbc56db7b5b2e1bfdff4bf86324532';
--
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