[Pkg-owncloud-commits] [owncloud] 05/07: Imported Upstream version 7.0.1+dfsg
David Prévot
taffit at moszumanska.debian.org
Mon Aug 4 16:35:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit c929a28a2ea7e16830e5d2b2eae555000b6de1b5
Merge: 08943d0 5a57d2b
Author: David Prévot <taffit at debian.org>
Date: Mon Aug 4 11:50:32 2014 -0400
Imported Upstream version 7.0.1+dfsg
apps/contacts/formats/backend_ldap_inet_org_person_connector.xml | 2 +-
apps/files_sharing/l10n/ast.php | 6 +++---
core/doc/admin/_sources/installation/installation_wizard.txt | 2 +-
core/doc/admin/_sources/maintenance/update.txt | 6 +++---
core/doc/admin/installation/installation_wizard.html | 2 +-
core/doc/admin/maintenance/update.html | 6 +++---
version.php | 8 ++++----
7 files changed, 16 insertions(+), 16 deletions(-)
diff --cc apps/contacts/formats/backend_ldap_inet_org_person_connector.xml
index bb0621a,0000000..75c402d
mode 100644,000000..100644
--- a/apps/contacts/formats/backend_ldap_inet_org_person_connector.xml
+++ b/apps/contacts/formats/backend_ldap_inet_org_person_connector.xml
@@@ -1,157 -1,0 +1,157 @@@
+<?xml version='1.0' standalone='yes'?>
+<entries name="inetOrgPerson">
+
+ <vcard_entries>
+
+ <vcard_entry property="FN" enabled="true">
+ <!--<ldif_entry name="cn"/>-->
+ <ldif_entry name="displayname" unique="true"/>
+ </vcard_entry>
+
+ <vcard_entry property="EMAIL" enabled="true">
+ <ldif_entry name="mail" unique="true"/>
+ </vcard_entry>
+
+ <vcard_entry property="NOTE" enabled="true">
+ <ldif_entry name="description" unique="true"/>
+ </vcard_entry>
+
+ <vcard_entry property="N" enabled="true">
+ <ldif_entry vcard_position="0" name="sn" unique="true"/>
+ <ldif_entry vcard_position="1" name="givenname"/>
+ </vcard_entry>
+
+ <vcard_entry property="TEL" type="FAX" enabled="true">
+ <ldif_entry name="facsimiletelephonenumber" unique="true"/>
+ </vcard_entry>
+
+ <vcard_entry property="TEL" type="HOME" enabled="true">
+ <ldif_entry name="telephonenumber" unique="true"/>
+ </vcard_entry>
+
+ <vcard_entry property="TEL" type="CELL" enabled="true">
+ <ldif_entry name="mobile" unique="true"/>
+ </vcard_entry>
+
+ <vcard_entry property="PHOTO" image="true" enabled="true">
+ <ldif_entry name="jpegphoto"/>
+ </vcard_entry>
+
+ <vcard_entry property="ADR" type="HOME" enabled="true">
+ <ldif_entry vcard_position="2" name="street"/>
+ <ldif_entry vcard_position="3" name="l"/>
+ <ldif_entry vcard_position="4" name="st"/>
+ <ldif_entry vcard_position="5" name="postalcode"/>
- <ldif_entry vcard_position="6" name="vcardcountry" unique="true"/>
++ <ldif_entry vcard_position="6" name="c" unique="true"/>
+ </vcard_entry>
+
+ <vcard_entry property="CATEGORIES" enabled="true">
+ <ldif_entry name="o" unique="true"/>
+ </vcard_entry>
+
+ <!--<vcard_entry property="" type="" enabled="true">
+ <ldap_entry vcard_position="" unique="" name=""/>
+ </vcard_entry>-->
+
+ </vcard_entries>
+
+ <ldap_entries>
+
+ <ldap_core>
+ <object_class name="top" />
+ <object_class name="inetOrgPerson" />
+ <unassigned_vcard_property ldap_name="businessCategory" />
+ <ldap_id name="cn" />
+ <not_null name="sn">
+ <action_switch name="givenname"/>
+ <!--<action_default value="value"/>-->
+ </not_null>
+ </ldap_core>
+
+ <ldif_entry name="mail" enabled="true">
+ <vcard_entry property="EMAIL" type="HOME">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="description" enabled="true">
+ <vcard_entry property="NOTE">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="displayname" enabled="true">
+ <vcard_entry property="FN">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="sn" enabled="true">
+ <vcard_entry property="N" position="0">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="givenname" enabled="true">
+ <vcard_entry property="N" position="1">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="facsimiletelephonenumber" enabled="true">
+ <vcard_entry property="TEL" type="FAX">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="telephonenumber" enabled="true">
+ <vcard_entry property="TEL" type="HOME">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="mobile" enabled="true">
+ <vcard_entry property="TEL" type="CELL">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="jpegphoto" enabled="true" image="true">
+ <vcard_entry property="PHOTO">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="street" enabled="true">
+ <vcard_entry property="ADR" type="HOME" position="2">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="l" enabled="true">
+ <vcard_entry property="ADR" type="HOME" position="3">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="st" enabled="true">
+ <vcard_entry property="ADR" type="HOME" position="4">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="postalcode" enabled="true">
+ <vcard_entry property="ADR" type="HOME" position="5">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="c" enabled="true">
+ <vcard_entry property="ADR" type="HOME" position="6">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="o" enabled="true">
+ <vcard_entry property="CATEGORIES">
+ </vcard_entry>
+ </ldif_entry>
+
+ <ldif_entry name="ou" enabled="true">
+ <vcard_entry property="CATEGORIES">
+ </vcard_entry>
+ </ldif_entry>
+
+ <!--<ldif_entry name="" enabled="true">
+ <vcard_entry property="" type="" prefix="" position="">
+ </vcard_entry>
+ </ldif_entry>-->
+
+ </ldap_entries>
+</entries>
diff --cc core/doc/admin/_sources/installation/installation_wizard.txt
index 1ff3115,0000000..312b972
mode 100644,000000..100644
--- a/core/doc/admin/_sources/installation/installation_wizard.txt
+++ b/core/doc/admin/_sources/installation/installation_wizard.txt
@@@ -1,122 -1,0 +1,122 @@@
+Installation Wizard
+-------------------
+
+When ownCloud prerequisites are fulfilled and all ownCloud files are installed
+on the server, the last thing left to do for finishing the installation is
+running the Installation Wizard.
+
+* Open your web browser
+* Navigate to your ownCloud instance.
+
+ * If you are installing ownCloud on the same machine as you are accessing the
+ install wizard from, the url will be https://localhost/owncloud
+ * If you are installing ownCloud on a different machine, you'll have to access
+ it by its hostname or IP address, e.g. https://example.com/owncloud
+ * Please take notice of the note at the end of the site if you're accessing
+ your ownCloud instance via a different IP address or host name during setup
+ than your users are going to use later on (or if your ownCloud instance
+ should be accessible via more than one host name or IP address).
+ * 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
+
+Required Settings
+~~~~~~~~~~~~~~~~~
+Under "create an admin account" you are requested to enter a username and
+password for the administrative user account. You can choose any username and
+password as you see fit, just make sure to remember it, you will need it later
+whenever you want to configure something for your ownCloud instance.
+
+Advanced Options
+~~~~~~~~~~~~~~~~
+* Advanced settings are available for configuring a different database or data
+ directory than the default ones.
+
+* 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!
+
+* Show these additional options by clicking on "Advanced":
+
+.. image:: images/install-wizard-advanced.png
+
+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/configuration_database`
+
- * Note that you will only be able to choose among the php database connectors
++* 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 or PostgreSQL you have two options regarding the database
+ name and user account you specify:
+
+ * You can specify either an admin/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.
+
+ * Beware that there are restrictions as to what characters a database name
+ may or may not contain, see the
+ `MySQL Schema Object Names documentation`_ for details);
+ * Make sure to choose a name under which no database exists yet
+ * ownCloud will use the provided credentials and create its own user with
+ permissions only on its own database.
+
+ * You can enter the name of an existing database and the username/password
+ of a user with permissions restricted to this one database only
+
+ * You can create such a user yourself, e.g. via phpmyadmin.
+ * This user shouldn't have permission to create a database.
+ * It should have full permissions on the (existing) database with the
+ name you specify.
+
+
+Finish Installation
+~~~~~~~~~~~~~~~~~~~
+* Once you've entered all settings, press "Finish Setup"
+* ownCloud will set up your cloud according to the given settings
+* When its finished, it will log you in as administrative user and present the
+ "Welcome to ownCloud" screen.
+
+
+Note
+~~~~
+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. No domain names of clients go there.
+
+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.
+
+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.
+
+It should be noted that 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
+
+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/_sources/maintenance/update.txt
index 6973eff,0000000..1389a7d
mode 100644,000000..100644
--- a/core/doc/admin/_sources/maintenance/update.txt
+++ b/core/doc/admin/_sources/maintenance/update.txt
@@@ -1,192 -1,0 +1,192 @@@
+Updating ownCloud
+-----------------
+
+.. _'Updating ownCloud':
+
+The Updater app provides a more automated method of updating ownCloud. To use the Updater app, it must be enabled in your ownCloud instance. The Updater is enabled in your ownCloud instance by default when you install.
+
+To update ownCloud:
+
+.. note:: To update ownCloud, the Updater app must be enabled in your ownCloud instance. The Updater app is enabled in your ownCloud instance by default when you install. However, to verify that it is enabled, or to enable the Updater app, see `Enabling the Updater App`_.
+
+1. Make a backup of the ownCloud folder and the database. See :doc:`backup` for details.
+
+2. Navigate to the 'Admin' page.
+
+3. Click the 'Update' tab.
+
+4. Refresh the page using Ctrl+F5.
+
+If this procedure doesn't work (for example, ownCloud 5.0.10 doesn't show new any new version) you could try to perform
+a full upgrade to update to the latest point release (see below).
+
+Verifying the Updater App is Enabled
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+However, to verify that the Updater is enabled in your ownCloud instance:
+
+1. Select the "Admin" option from the "Personal Settings" dropdown menu.
+
+.. figure:: ../images/oc_personal_settings_dropdown_admin.png
+
+2. Scroll down the resulting web page. If the Updater app appears in this window, the app is enabled. If not, then you must enable it. See `Enabling the Updater App`_.
+
+
+Enabling the Updater App
+^^^^^^^^^^^^^^^^^^^^^^^^
+.. _`Enabling the Updater App`:
+
+The Updater app is enabled in your ownCloud instance by default when you install. However, it is possible that it was disabled at some point. To enable the Updater app:
+
+1. Click the "+ App" function in the Apps Selection Menu.
+
+ The "Select an App" window opens.
+
+ .. figure:: ../images/oc_select_an_app_window.png
+
+ **Select an App window**
+
+2. Scroll down the list of apps on the left side of the web page and select the Update app.
+
+ .. figure:: ../images/oc_updater_select.png
+
+ **Selecting the Updater app**
+
+3. In the App View window, click "Enable."
+
+ .. figure:: ../images/oc_updater_enable.png
+
+ **Enabling the Updater app**
+
+ ownCloud enables the Updater app.
+
+Upgrading the ownCloud Server
+=============================
+
+The process for upgrading the ownCloud Server is fairly straightforward but requires planning and proper file and folder management.
+
+To upgrade your ownCloud Server:
+
+1. Ensure that you are running the latest point release of your current major ownCloud version (for example, point release 5.0.14a in the version 5.0 series). To update to the latest point release see 'Updating ownCloud'_.
+
+2. Deactivate all third party applications.
+
+ .. note:: Not all third party applications are supported on all ownCloud Server versions. Make sure to check version compatibility prior to upgrading your ownCloud server.
+
+3. Back up your existing ownCloud Server database. You can find these procedures in :doc:`backup`.
+
+4. Download the latest ownCloud Server version to your working directory.
+
+ For Linux operating systems, use the following command:
+
+ ``wget http://download.owncloud.org/community/owncloud-latest.tar.bz2``
+
+ For Windows operating systems:
+
+ See the installation instruction in :doc:`../installation/installation_windows`.
+
+5. Stop your web server.
+
+ Depending on your environment, you will be running either an Apache server or a Windows IIS server. In addition, when running your server in a Linux environment, the necessary commands for stopping the Apache server might differ from one Linux operating system to another.
+
+ To stop an Apache server, refer to the following table for specific commands to use in different Linux operating systems:
+
+ +------------------+----------------------------------------------+
+ | Operating System | Command (as root) |
+ +==================+==============================================+
+ | CentOS (Redhat) | ``apachectl stop`` |
+ +------------------+----------------------------------------------+
+ | Debian | |
+ | or | ``/etc/init.d/apache2 stop`` |
+ | Ubuntu | |
+ +------------------+----------------------------------------------+
+ | openSUSE | |
+ | or | ``/usr/sbin/rcapache2 stop`` |
+ | SUSE (SLE) | |
+ +------------------+----------------------------------------------+
+
+ To stop the Windows IIS web server, you can use either the user interface (UI) or command line method as follows:
+
+ +----------------------+-------------------------------------------------------------------------+
+ | Method | Procedure |
+ +======================+=========================================================================+
+ | User Interface (UI) | 1. Open IIS Manager and navigate to the Web server node in the tree. |
+ | | |
+ | | 2. In the **Actions** pane, click **Stop**. |
+ +----------------------+-------------------------------------------------------------------------+
+ | Command Line | 1. Open a command line window as administrator. |
+ | | |
+ | | 2. At the command prompt, type **net stop WAS** and press **ENTER**. |
+ | | |
+ | | 3. (Optional) To stop W3SVC, type **Y** and then press **ENTER**. |
+ +----------------------+-------------------------------------------------------------------------+
+
+ .. note:: For specific instructions on how to stop, start, or manage your server, please refer to instructions for the server on your specific operating environment.
+
- 6. Copy, move, or rename your current owncloud directory (named ``/owncloud`` if installed using defaults) to another location for use in your new version of ownCloud.
++6. Move, or rename your current owncloud directory (named ``/owncloud`` if installed using defaults) to another location for use in your new version of ownCloud.
+
+ .. note:: This step ensures that you have a version of ownCloud available for backup purposes.
+
+7. Replace the old version of ownCloud Server with the new version of ownCloud Server:
+
+ Assuming that your installation directory is called ‘owncloud’, and that it resides in your working directory, the command to unpack the release tarball into the directory would be as follows::
+
+ tar xjf owncloud-latest.tar.bz2
+
+ In Microsoft Windows environments, you can unpack the release tarball using WinZip or a similar tool (for example, Peazip).
+
- Though you can upack the server code into an existing, populated directory, best practice is to unpack server code into an empty directory.
++ Always unpack server code into an empty directory. Unpacking the server code into an existing, populated directory, is not supported.
+
- .. note:: If you copied the installation directory, instead of moving or renaming, this step overwrites the old ownCloud Server version in the current location.
++ .. note:: If you unpack into an existing installation, the autoloader might pick up classes twice because the files have been moved, resulting in a ``Cannot redeclare class`` error.
+
+8. Copy and paste the ``/config/config.php`` file from the saved version of ownCloud to the ``/config`` directory of your new ownCloud version.
+
+ .. note:: You must perform this step **before** restarting your web server.
+
+9. If you chose to keep your /data directory in your ``/owncloud`` directory, copy and paste it from the old version of ownCloud to the ``/owncloud`` directory of your new ownCloud version.
+
+ .. note:: We recommend storing your ``/data`` directory in a location other than your ``/owncloud`` directory. If you have your ``/data`` directory already stored in another location, you can skip this step. If you want to do so, now is a good time to change the location of your ``/data`` directory. See "Advanved Options" chapter in :doc:`../installation/installation_wizard` for added details about changing the default database or data directory.
+
+10. Restart your web server.
+
+ Depending on your environment, you will be running either an Apache server or a Windows IIS server. In addition, when running your server in a Linux environment, the necessary commands for stopping the Apache server might differ from one Linux operating system to another.
+
+ To restart an Apache server, refer to the following table for specific commands to use in different Linux operating systems:
+
+ +------------------+----------------------------------------------+
+ | Operating System | Command (as root) |
+ +==================+==============================================+
+ | CentOS (Redhat) | ``apachectl start`` |
+ +------------------+----------------------------------------------+
+ | Debian | |
+ | or | ``/etc/init.d/apache2 start`` |
+ | Ubuntu | |
+ +------------------+----------------------------------------------+
+ | openSUSE | |
+ | or | ``/usr/sbin/rcapache2 start`` |
+ | SUSE (SLE) | |
+ +------------------+----------------------------------------------+
+
+ To start the Windows IIS web server, you can use either the user interface (UI) or command line method as follows:
+
+ +----------------------+-------------------------------------------------------------------------+
+ | Method | Procedure |
+ +======================+=========================================================================+
+ | User Interface (UI) | 1. Open IIS Manager and navigate to the Web server node in the tree. |
+ | | |
+ | | 2. In the **Actions** pane, click **Start**. |
+ +----------------------+-------------------------------------------------------------------------+
+ | Command Line | 1. Open an elevated command line window. |
+ | | |
+ | | 2. At the command prompt, type **net start W3SVC** and press **ENTER**. |
+ | | This command starts both WAS and W3SVC. |
+ +----------------------+-------------------------------------------------------------------------+
+
+ .. note:: For specific instructions on how to stop, start, or manage your server, please refer to instructions for the server on your specific operating environment.
+
+11. Use a browser to your ownCloud server.
+
+ This step is required. Accessing the server using a browser connection launches the server upgrade.
+
+12. If third party applications were running on your system, ensure that they provide versions compatible with the new ownCloud release. If compatible, you can reinstall and enable these applications.
+
+ .. note:: Update procedures should run when necessary.
diff --cc core/doc/admin/installation/installation_wizard.html
index f20c578,0000000..60399dd
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_wizard.html
+++ b/core/doc/admin/installation/installation_wizard.html
@@@ -1,272 -1,0 +1,272 @@@
+
+<!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="Configuration" href="../configuration/index.html" />
+ <link rel="prev" title="Other Installation Methods" href="installation_others.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">Overview</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 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">Other Installation Methods</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="#advanced-options">Advanced Options</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="#note">Note</a></li>
+</ul>
+</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</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 thing left to do for finishing the installation is
+running the Installation Wizard.</p>
+<ul class="simple">
+<li>Open your web browser</li>
+<li>Navigate to your ownCloud instance.<ul>
+<li>If you are installing ownCloud on the same machine as you are accessing the
+install wizard from, the url will be <a class="reference external" href="https://localhost/owncloud">https://localhost/owncloud</a></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. <a class="reference external" href="https://example.com/owncloud">https://example.com/owncloud</a></li>
+<li>Please take notice of the note at the end of the site if you’re accessing
+your ownCloud instance via a different IP address or host name during setup
+than your users are going to use later on (or if your ownCloud instance
+should be accessible via more than one host name or IP address).</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>
+</li>
+<li>You will be presented with the setup screen:</li>
+</ul>
+<img alt="../_images/install-wizard.png" src="../_images/install-wizard.png" />
+<div class="section" id="required-settings">
+<h2>Required Settings<a class="headerlink" href="#required-settings" title="Permalink to this headline">¶</a></h2>
+<p>Under “create an admin account” you are requested to enter a username and
+password for the administrative user account. You can choose any username and
+password as you see fit, just make sure to remember it, you will need it later
+whenever you want to configure something for your ownCloud instance.</p>
+</div>
+<div class="section" id="advanced-options">
+<h2>Advanced Options<a class="headerlink" href="#advanced-options" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Advanced settings are available for configuring a different database or data
+directory than the default ones.</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>
+<li>Show these additional options by clicking on “Advanced”:</li>
+</ul>
+<img alt="../_images/install-wizard-advanced.png" src="../_images/install-wizard-advanced.png" />
+<div class="section" id="database-choice">
+<h3>Database choice<a class="headerlink" href="#database-choice" title="Permalink to this headline">¶</a></h3>
+<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/configuration_database.html"><em>Database Configuration</em></a></li>
- <li>Note that you will only be able to choose among the php database connectors
++<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 or PostgreSQL you have two options regarding the database
+name and user account you specify:<ul>
+<li>You can specify either an admin/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.<ul>
+<li>Beware that 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>
+<li>Make sure to choose a name under which no database exists yet</li>
+<li>ownCloud will use the provided credentials and create its own user with
+permissions only on its own database.</li>
+</ul>
+</li>
+<li>You can enter the name of an existing database and the username/password
+of a user with permissions restricted to this one database only<ul>
+<li>You can create such a user yourself, e.g. via phpmyadmin.</li>
+<li>This user shouldn’t have permission to create a database.</li>
+<li>It should have full permissions on the (existing) database with the
+name you specify.</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</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, press “Finish Setup”</li>
+<li>ownCloud will set up your cloud according to the given settings</li>
+<li>When its finished, it will log you in as administrative user and present the
+“Welcome to ownCloud” screen.</li>
+</ul>
+</div>
+<div class="section" id="note">
+<h2>Note<a class="headerlink" href="#note" title="Permalink to this headline">¶</a></h2>
+<p>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. No domain names of clients go there.</p>
+<p>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.</p>
+<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>It should be noted that 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:</p>
+<img alt="../_images/untrusted-domain.png" src="../_images/untrusted-domain.png" />
+<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/maintenance/update.html
index fbea3d5,0000000..151f4c8
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/update.html
+++ b/core/doc/admin/maintenance/update.html
@@@ -1,430 -1,0 +1,430 @@@
+
+<!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>Updating ownCloud — 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="Maintenance" href="index.html" />
+ <link rel="next" title="Restoring ownCloud" href="restore.html" />
+ <link rel="prev" title="Backing up ownCloud" href="backup.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">Overview</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="../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 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="enable_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Updating ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#verifying-the-updater-app-is-enabled">Verifying the Updater App is Enabled</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#enabling-the-updater-app">Enabling the Updater App</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="updating-owncloud">
+<h1>Updating ownCloud<a class="headerlink" href="#updating-owncloud" title="Permalink to this headline">¶</a></h1>
+<p id="id1">The Updater app provides a more automated method of updating ownCloud. To use the Updater app, it must be enabled in your ownCloud instance. The Updater is enabled in your ownCloud instance by default when you install.</p>
+<p>To update ownCloud:</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">To update ownCloud, the Updater app must be enabled in your ownCloud instance. The Updater app is enabled in your ownCloud instance by default when you install. However, to verify that it is enabled, or to enable the Updater app, see <a class="reference internal" href="#id2">Enabling the Updater App</a>.</p>
+</div>
+<ol class="arabic simple">
+<li>Make a backup of the ownCloud folder and the database. See <a class="reference internal" href="backup.html"><em>Backing up ownCloud</em></a> for details.</li>
+<li>Navigate to the ‘Admin’ page.</li>
+<li>Click the ‘Update’ tab.</li>
+<li>Refresh the page using Ctrl+F5.</li>
+</ol>
+<p>If this procedure doesn’t work (for example, ownCloud 5.0.10 doesn’t show new any new version) you could try to perform
+a full upgrade to update to the latest point release (see below).</p>
+<div class="section" id="verifying-the-updater-app-is-enabled">
+<h2>Verifying the Updater App is Enabled<a class="headerlink" href="#verifying-the-updater-app-is-enabled" title="Permalink to this headline">¶</a></h2>
+<p>However, to verify that the Updater is enabled in your ownCloud instance:</p>
+<ol class="arabic simple">
+<li>Select the “Admin” option from the “Personal Settings” dropdown menu.</li>
+</ol>
+<div class="figure">
+<img alt="../_images/oc_personal_settings_dropdown_admin.png" src="../_images/oc_personal_settings_dropdown_admin.png" />
+</div>
+<ol class="arabic simple" start="2">
+<li>Scroll down the resulting web page. If the Updater app appears in this window, the app is enabled. If not, then you must enable it. See <a class="reference internal" href="#id2">Enabling the Updater App</a>.</li>
+</ol>
+</div>
+<div class="section" id="enabling-the-updater-app">
+<h2>Enabling the Updater App<a class="headerlink" href="#enabling-the-updater-app" title="Permalink to this headline">¶</a></h2>
+<p id="id2">The Updater app is enabled in your ownCloud instance by default when you install. However, it is possible that it was disabled at some point. To enable the Updater app:</p>
+<ol class="arabic simple">
+<li>Click the “+ App” function in the Apps Selection Menu.</li>
+</ol>
+<blockquote>
+<div><p>The “Select an App” window opens.</p>
+<div class="figure">
+<img alt="../_images/oc_select_an_app_window.png" src="../_images/oc_select_an_app_window.png" />
+</div>
+<p><strong>Select an App window</strong></p>
+</div></blockquote>
+<ol class="arabic simple" start="2">
+<li>Scroll down the list of apps on the left side of the web page and select the Update app.</li>
+</ol>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/oc_updater_select.png" src="../_images/oc_updater_select.png" />
+</div>
+<p><strong>Selecting the Updater app</strong></p>
+</div></blockquote>
+<ol class="arabic simple" start="3">
+<li>In the App View window, click “Enable.”</li>
+</ol>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/oc_updater_enable.png" src="../_images/oc_updater_enable.png" />
+</div>
+<p><strong>Enabling the Updater app</strong></p>
+<p>ownCloud enables the Updater app.</p>
+</div></blockquote>
+<div class="section" id="upgrading-the-owncloud-server">
+<h3>Upgrading the ownCloud Server<a class="headerlink" href="#upgrading-the-owncloud-server" title="Permalink to this headline">¶</a></h3>
+<p>The process for upgrading the ownCloud Server is fairly straightforward but requires planning and proper file and folder management.</p>
+<p>To upgrade your ownCloud Server:</p>
+<ol class="arabic simple">
+<li>Ensure that you are running the latest point release of your current major ownCloud version (for example, point release 5.0.14a in the version 5.0 series). To update to the latest point release see ‘Updating ownCloud’_.</li>
+<li>Deactivate all third party applications.</li>
+</ol>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Not all third party applications are supported on all ownCloud Server versions. Make sure to check version compatibility prior to upgrading your ownCloud server.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="3">
+<li>Back up your existing ownCloud Server database. You can find these procedures in <a class="reference internal" href="backup.html"><em>Backing up ownCloud</em></a>.</li>
+<li>Download the latest ownCloud Server version to your working directory.</li>
+</ol>
+<blockquote>
+<div><p>For Linux operating systems, use the following command:</p>
+<p><tt class="docutils literal"><span class="pre">wget</span> <span class="pre">http://download.owncloud.org/community/owncloud-latest.tar.bz2</span></tt></p>
+<p>For Windows operating systems:</p>
+<p>See the installation instruction in <a class="reference internal" href="../installation/installation_windows.html"><em>Windows 7 and Windows Server 2008</em></a>.</p>
+</div></blockquote>
+<ol class="arabic simple" start="5">
+<li>Stop your web server.</li>
+</ol>
+<blockquote>
+<div><p>Depending on your environment, you will be running either an Apache server or a Windows IIS server. In addition, when running your server in a Linux environment, the necessary commands for stopping the Apache server might differ from one Linux operating system to another.</p>
+<p>To stop an Apache server, refer to the following table for specific commands to use in different Linux operating systems:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Operating System</th>
+<th class="head">Command (as root)</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>CentOS (Redhat)</td>
+<td><tt class="docutils literal"><span class="pre">apachectl</span> <span class="pre">stop</span></tt></td>
+</tr>
+<tr class="row-odd"><td>Debian
+or
+Ubuntu</td>
+<td><tt class="docutils literal"><span class="pre">/etc/init.d/apache2</span> <span class="pre">stop</span></tt></td>
+</tr>
+<tr class="row-even"><td>openSUSE
+or
+SUSE (SLE)</td>
+<td><tt class="docutils literal"><span class="pre">/usr/sbin/rcapache2</span> <span class="pre">stop</span></tt></td>
+</tr>
+</tbody>
+</table>
+<p>To stop the Windows IIS web server, you can use either the user interface (UI) or command line method as follows:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="23%" />
+<col width="77%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Method</th>
+<th class="head">Procedure</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User Interface (UI)</td>
+<td><ol class="first last arabic simple">
+<li>Open IIS Manager and navigate to the Web server node in the tree.</li>
+<li>In the <strong>Actions</strong> pane, click <strong>Stop</strong>.</li>
+</ol>
+</td>
+</tr>
+<tr class="row-odd"><td>Command Line</td>
+<td><ol class="first last arabic simple">
+<li>Open a command line window as administrator.</li>
+<li>At the command prompt, type <strong>net stop WAS</strong> and press <strong>ENTER</strong>.</li>
+<li>(Optional) To stop W3SVC, type <strong>Y</strong> and then press <strong>ENTER</strong>.</li>
+</ol>
+</td>
+</tr>
+</tbody>
+</table>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">For specific instructions on how to stop, start, or manage your server, please refer to instructions for the server on your specific operating environment.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="6">
- <li>Copy, move, or rename your current owncloud directory (named <tt class="docutils literal"><span class="pre">/owncloud</span></tt> if installed using defaults) to another location for use in your new version of ownCloud.</li>
++<li>Move, or rename your current owncloud directory (named <tt class="docutils literal"><span class="pre">/owncloud</span></tt> if installed using defaults) to another location for use in your new version of ownCloud.</li>
+</ol>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This step ensures that you have a version of ownCloud available for backup purposes.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="7">
+<li>Replace the old version of ownCloud Server with the new version of ownCloud Server:</li>
+</ol>
+<blockquote>
+<div><p>Assuming that your installation directory is called ‘owncloud’, and that it resides in your working directory, the command to unpack the release tarball into the directory would be as follows:</p>
+<div class="highlight-python"><pre>tar xjf owncloud-latest.tar.bz2</pre>
+</div>
+<p>In Microsoft Windows environments, you can unpack the release tarball using WinZip or a similar tool (for example, Peazip).</p>
- <p>Though you can upack the server code into an existing, populated directory, best practice is to unpack server code into an empty directory.</p>
++<p>Always unpack server code into an empty directory. Unpacking the server code into an existing, populated directory, is not supported.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
- <p class="last">If you copied the installation directory, instead of moving or renaming, this step overwrites the old ownCloud Server version in the current location.</p>
++<p class="last">If you unpack into an existing installation, the autoloader might pick up classes twice because the files have been moved, resulting in a <tt class="docutils literal"><span class="pre">Cannot</span> <span class="pre">redeclare</span> <span class="pre">class</span></tt> error.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="8">
+<li>Copy and paste the <tt class="docutils literal"><span class="pre">/config/config.php</span></tt> file from the saved version of ownCloud to the <tt class="docutils literal"><span class="pre">/config</span></tt> directory of your new ownCloud version.</li>
+</ol>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You must perform this step <strong>before</strong> restarting your web server.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="9">
+<li>If you chose to keep your /data directory in your <tt class="docutils literal"><span class="pre">/owncloud</span></tt> directory, copy and paste it from the old version of ownCloud to the <tt class="docutils literal"><span class="pre">/owncloud</span></tt> directory of your new ownCloud version.</li>
+</ol>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">We recommend storing your <tt class="docutils literal"><span class="pre">/data</span></tt> directory in a location other than your <tt class="docutils literal"><span class="pre">/owncloud</span></tt> directory. If you have your <tt class="docutils literal"><span class="pre">/data</span></tt> directory already stored in another location, you can skip this step. If you want to do so, now is a good time to change the location of your <tt class="docutils literal"><span cla [...]
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="10">
+<li>Restart your web server.</li>
+</ol>
+<blockquote>
+<div><p>Depending on your environment, you will be running either an Apache server or a Windows IIS server. In addition, when running your server in a Linux environment, the necessary commands for stopping the Apache server might differ from one Linux operating system to another.</p>
+<p>To restart an Apache server, refer to the following table for specific commands to use in different Linux operating systems:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Operating System</th>
+<th class="head">Command (as root)</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>CentOS (Redhat)</td>
+<td><tt class="docutils literal"><span class="pre">apachectl</span> <span class="pre">start</span></tt></td>
+</tr>
+<tr class="row-odd"><td>Debian
+or
+Ubuntu</td>
+<td><tt class="docutils literal"><span class="pre">/etc/init.d/apache2</span> <span class="pre">start</span></tt></td>
+</tr>
+<tr class="row-even"><td>openSUSE
+or
+SUSE (SLE)</td>
+<td><tt class="docutils literal"><span class="pre">/usr/sbin/rcapache2</span> <span class="pre">start</span></tt></td>
+</tr>
+</tbody>
+</table>
+<p>To start the Windows IIS web server, you can use either the user interface (UI) or command line method as follows:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="23%" />
+<col width="77%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Method</th>
+<th class="head">Procedure</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User Interface (UI)</td>
+<td><ol class="first last arabic simple">
+<li>Open IIS Manager and navigate to the Web server node in the tree.</li>
+<li>In the <strong>Actions</strong> pane, click <strong>Start</strong>.</li>
+</ol>
+</td>
+</tr>
+<tr class="row-odd"><td>Command Line</td>
+<td><ol class="first last arabic simple">
+<li>Open an elevated command line window.</li>
+<li>At the command prompt, type <strong>net start W3SVC</strong> and press <strong>ENTER</strong>.
+This command starts both WAS and W3SVC.</li>
+</ol>
+</td>
+</tr>
+</tbody>
+</table>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">For specific instructions on how to stop, start, or manage your server, please refer to instructions for the server on your specific operating environment.</p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="11">
+<li>Use a browser to your ownCloud server.</li>
+</ol>
+<blockquote>
+<div>This step is required. Accessing the server using a browser connection launches the server upgrade.</div></blockquote>
+<ol class="arabic simple" start="12">
+<li>If third party applications were running on your system, ensure that they provide versions compatible with the new ownCloud release. If compatible, you can reinstall and enable these applications.</li>
+</ol>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Update procedures should run when necessary.</p>
+</div>
+</div></blockquote>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc version.php
index 55d0ec2,541570e..de8bd2c
--- 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, 1, 1);
-
-// The human readable string
-$OC_VersionString='7.0.1';
-
-// The ownCloud edition
-$OC_Edition='';
-
-// The ownCloud channel
-$OC_Channel='git';
-
-// The build number
-$OC_Build='';
-
+<?php
- $OC_Version = array(7,0,1,0);
- $OC_VersionString = '7.0.1 RC1';
++$OC_Version = array(7,0,1,1);
++$OC_VersionString = '7.0.1';
+$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2014-07-30T21:44:11+00:00';
++$OC_Channel = 'stable';
++$OC_Build = '2014-08-04T13:49:17+00:00';
--
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