nextcloud · juliusknorr · Jul 20, 2016 · Jul 20, 2016 · Jul 20, 2016 · Jul 20, 2016
diff --git a/_shared_assets/static/logo-blue.pdf b/_shared_assets/static/logo-blue.pdf
diff --git a/_shared_assets/static/logo-blue.png b/_shared_assets/static/logo-blue.png
diff --git a/_shared_assets/themes/nextcloud_com/layout.html b/_shared_assets/themes/nextcloud_com/layout.html
@@ -67,11 +67,14 @@
 
     <nav class="collapse navbar-collapse" role="navigation">
       <ul id="menu-header" class="nav navbar-nav">
+          <li><a target="_blank" href="https://demo.nextcloud.com">Demo</a></li>
           <li><a href="https://nextcloud.com/news/">News</a></li>
+          <li><a href="https://nextcloud.com/features/">Features</a></li>
           <li><a href="https://nextcloud.com/about/">About us</a></li>
           <li><a href="https://nextcloud.com/contribute/">Get involved</a></li>
           <li><a href="https://nextcloud.com/support/">Support</a></li>
           <li><a href="https://nextcloud.com/enterprise/">Enterprise</a></li>
+          <li class="menu-install"><a href="https://nextcloud.com/install/">Download</a></li>
       </ul>
     </nav>
   </div>

diff --git a/_shared_assets/themes/nextcloud_com/static/styles.css b/_shared_assets/themes/nextcloud_com/static/styles.css
@@ -7,15 +7,6 @@
 	border-color: red;
  }*/
 
-.menu-install {
-    background: #35537a !important;
-}
-
-.menu-install:hover  {
-    background: #2A6496 !important;
-}
-
-
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;

diff --git a/admin_manual/conf.py b/admin_manual/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# ownCloud Documentation documentation build configuration file, created by
+# Nextcloud Documentation documentation build configuration file, created by
 # sphinx-quickstart on Mon Oct 22 23:16:40 2012.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -44,13 +44,13 @@
 # built documents.
 #
 # The short X.Y version.
-version = '9.1'
+version = '10'
 # The full version, including alpha/beta/rc tags.
-release = '9.1'
+release = '10'
 
 # General information about the project.
-project = u'ownCloud %s Server Administration Manual' % (version)
-copyright = u'2012-2016, The ownCloud developers'
+project = u'Nextcloud %s Server Administration Manual' % (version)
+copyright = u'2012-2016, The Nextcloud developers'
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -166,7 +166,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'ownCloudServerAdminManual'
+htmlhelp_basename = 'NextcloudServerAdminManual'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -185,7 +185,7 @@
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [('contents', 'ownCloud_Server_Administration_Manual.tex', u'ownCloud Server Administration Manual', u'The ownCloud developers', 'manual'),]
+latex_documents = [('contents', 'Nextcloud_Server_Administration_Manual.tex', u'Nextcloud Server Administration Manual', u'The Nextcloud developers', 'manual'),]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
@@ -209,13 +209,13 @@
 
 # -- Options for pdf page output -----------------------------------------------
 
-pdf_documents = [('contents', u'owncloud Server Administration Manual', u'ownCloud Server Administration Manual', u'The ownCloud developers'),]
+pdf_documents = [('contents', u'nextcloud Server Administration Manual', u'Nextcloud Server Administration Manual', u'The Nextcloud developers'),]
 
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [ ('contents', 'owncloudserveradminmanual', u'ownCloud Server Administration Manual', [u'The ownCloud developers'], 1) ]
+man_pages = [ ('contents', 'nextcloudserveradminmanual', u'Nextcloud Server Administration Manual', [u'The Nextcloud developers'], 1) ]
 
 # If true, show URL addresses after external links.
 #man_show_urls = False
@@ -226,7 +226,7 @@
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
-texinfo_documents = [ ('contents', 'ownCloud Server Admin Manual', u'ownCloud Server Administration Manual', u'The ownCloud developers', 'ownCloud', 'The ownCloud Server Administration Manual.', 'Miscellaneous'), ]
+texinfo_documents = [ ('contents', 'Nextcloud Server Admin Manual', u'Nextcloud Server Administration Manual', u'The Nextcloud developers', 'Nextcloud', 'The Nextcloud Server Administration Manual.', 'Miscellaneous'), ]
 
 # Documents to append as an appendix to all manuals.
 #texinfo_appendices = []
@@ -241,10 +241,10 @@
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'ownCloud Server Administration Manual'
-epub_author = u'The ownCloud developers'
-epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2012-2016, The ownCloud developers'
+epub_title = u'Nextcloud Server Administration Manual'
+epub_author = u'The Nextcloud developers'
+epub_publisher = u'The Nextcloud developers'
+epub_copyright = u'2012-2016, The Nextcloud developers'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
@@ -282,5 +282,3 @@
 
 # Include todos?
 todo_include_todos = True
-
-
@@ -2,11 +2,11 @@
 Database Configuration
 ======================
 
-ownCloud requires a database in which administrative data is stored. The following databases are currently supported:
+Nextcloud requires a database in which administrative data is stored. The following databases are currently supported:
 
 * `MySQL <http://www.mysql.com/>`_ / `MariaDB <https://mariadb.org/>`_
 * `PostgreSQL <http://www.postgresql.org/>`_
-* `Oracle <http://www.oracle.com/>`_ (ownCloud Enterprise edition only)
+* `Oracle <http://www.oracle.com/>`_
 
 The MySQL or MariaDB databases are the recommended database engines.
 
@@ -25,12 +25,12 @@ requires that you install and set up the server software first.
 MySQL / MariaDB with Binary Logging Enabled
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-ownCloud is currently using a ``TRANSACTION_READ_COMMITTED`` transaction isolation
+Nextcloud is currently using a ``TRANSACTION_READ_COMMITTED`` transaction isolation
 to avoid data loss under high load scenarios (e.g. by using the sync client with
 many clients/users and many parallel operations). This requires a disabled or
 correctly configured binary logging when using MySQL or MariaDB. Your system is
 affected if you see the following in your log file during the installation or
-update of ownCloud:
+update of Nextcloud:
 
  An unhandled exception has been thrown:
  exception 'PDOException' with message 'SQLSTATE[HY000]: General error: 1665 
@@ -65,7 +65,7 @@ for detailed information.
 
 Parameters
 ----------
-For setting up ownCloud to use any database, use the instructions in :doc:`../installation/installation_wizard`. You should not have to edit the respective values in the :file:`config/config.php`.  However, in special cases (for example, if you want to connect your ownCloud instance to a database created by a previous installation of ownCloud), some modification might be required.
+For setting up Nextcloud to use any database, use the instructions in :doc:`../installation/installation_wizard`. You should not have to edit the respective values in the :file:`config/config.php`.  However, in special cases (for example, if you want to connect your Nextcloud instance to a database created by a previous installation of Nextcloud), some modification might be required.
 
 Configuring a MySQL or MariaDB Database
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -74,7 +74,7 @@ If you decide to use a MySQL or MariaDB database, ensure the following:
 
 * That you have installed and enabled the pdo_mysql extension in PHP
 
-* That the **mysql.default_socket** points to the correct socket (if the database runs on the same server as ownCloud).
+* That the **mysql.default_socket** points to the correct socket (if the database runs on the same server as Nextcloud).
 
 .. note:: MariaDB is backwards compatible with MySQL.  All instructions work for both. You will not need to replace mysql with anything.
 
@@ -100,7 +100,7 @@ The PHP configuration in :file:`/etc/php5/conf.d/mysql.ini` could look like this
   mysql.trace_mode=Off
 
 Now you need to create a database user and the database itself by using the
-MySQL command line interface. The database tables will be created by ownCloud
+MySQL command line interface. The database tables will be created by Nextcloud
 when you login for the first time.
 
 To start the MySQL command line mode use::
@@ -112,14 +112,14 @@ Then a **mysql>** or **MariaDB [root]>** prompt will appear. Now enter the follo
 ::
 
   CREATE USER 'username'@'localhost' IDENTIFIED BY 'password';
-  CREATE DATABASE IF NOT EXISTS owncloud;
-  GRANT ALL PRIVILEGES ON owncloud.* TO 'username'@'localhost' IDENTIFIED BY 'password';
+  CREATE DATABASE IF NOT EXISTS nextcloud;
+  GRANT ALL PRIVILEGES ON nextcloud.* TO 'username'@'localhost' IDENTIFIED BY 'password';
 
 You can quit the prompt by entering::
 
   quit
 
-An ownCloud instance configured with MySQL would contain the hostname on which
+An Nextcloud instance configured with MySQL would contain the hostname on which
 the database is running, a valid username and password to access it, and the
 name of the database. The :file:`config/config.php` as created by the
 :doc:`../installation/installation_wizard` would therefore contain entries like
@@ -130,7 +130,7 @@ this:
   <?php
 
     "dbtype"        => "mysql",
-    "dbname"        => "owncloud",
+    "dbname"        => "nextcloud",
     "dbuser"        => "username",
     "dbpassword"    => "password",
     "dbhost"        => "localhost",
@@ -168,13 +168,13 @@ Then a **template1=#** prompt will appear. Now enter the following lines and con
 ::
 
   CREATE USER username CREATEDB;
-  CREATE DATABASE owncloud OWNER username;
+  CREATE DATABASE nextcloud OWNER username;
 
 You can quit the prompt by entering::
 
   \q
 
-An ownCloud instance configured with PostgreSQL would contain the path to the socket on
+An Nextcloud instance configured with PostgreSQL would contain the path to the socket on
 which the database is running as the hostname, the system username the php process is using,
 and an empty password to access it, and the name of the database. The :file:`config/config.php` as 
 created by the :doc:`../installation/installation_wizard` would therefore contain entries like
@@ -185,7 +185,7 @@ this:
   <?php
 
     "dbtype"        => "pgsql",
-    "dbname"        => "owncloud",
+    "dbname"        => "nextcloud",
     "dbuser"        => "username",
     "dbpassword"    => "",
     "dbhost"        => "/var/run/postgresql",
@@ -196,7 +196,7 @@ this:
 If you use another authentication method (not peer), you'll need to use the following steps to get the database setup:
 Now you need to create a database user and the database itself by using the
 PostgreSQL command line interface. The database tables will be created by
-ownCloud when you login for the first time.
+Nextcloud when you login for the first time.
 
 To start the postgres command line mode use::
 
@@ -215,7 +215,7 @@ You can quit the prompt by entering::
 
   \q
 
-An ownCloud instance configured with PostgreSQL would contain the hostname on
+An Nextcloud instance configured with PostgreSQL would contain the hostname on
 which the database is running, a valid username and password to access it, and
 the name of the database. The :file:`config/config.php` as created by the
 :doc:`../installation/installation_wizard` would therefore contain entries like
@@ -226,7 +226,7 @@ this:
   <?php
 
     "dbtype"        => "pgsql",
-    "dbname"        => "owncloud",
+    "dbname"        => "nextcloud",
     "dbuser"        => "username",
     "dbpassword"    => "password",
     "dbhost"        => "localhost",
@@ -246,7 +246,7 @@ refer to the manual of your database for how to raise the configuration options
 ``wait_timeout`` and/or ``max_allowed_packet``.
 
 Some shared hosters are not allowing the access to these config options. For such
-systems ownCloud is providing a ``dbdriveroptions`` configuration option within your
+systems Nextcloud is providing a ``dbdriveroptions`` configuration option within your
 :file:`config/config.php` where you can pass such options to the database driver.
 Please refer to :doc:`../configuration_server/config_sample_php_parameters` for an example.
 
@@ -302,12 +302,12 @@ the respective host name::
 Assuming the database server is installed on the same system you're running
 the command from, use::
 
-  psql -Uusername -downcloud
+  psql -Uusername -dnextcloud
 
 To access a MySQL installation on a different machine, add the -h option with
 the respective host name::
 
-  psql -Uusername -downcloud -h HOSTNAME
+  psql -Uusername -dnextcloud -h HOSTNAME
 
 ::
 
@@ -330,10 +330,10 @@ Useful SQL commands
   MySQL     : SHOW DATABASES;
   PostgreSQL: \l
 
-**Show ownCloud Tables in Database**::
+**Show Nextcloud Tables in Database**::
 
-  MySQL     : USE owncloud; SHOW TABLES;
-  PostgreSQL: \c owncloud; \d
+  MySQL     : USE nextcloud; SHOW TABLES;
+  PostgreSQL: \c nextcloud; \d
 
 **Quit Database**::
 

diff --git a/admin_manual/configuration_files/collaborative_documents_configuration.rst b/admin_manual/configuration_files/collaborative_documents_configuration.rst
@@ -48,4 +48,4 @@ If the mentioned test fails please make sure that:
 * your SELinux configuration is not blocking the execution of the binary
 * the PHP ``open_basedir`` is correctly configured to allow the access to the binary
 
-More hints why the test is failing can be found in your ``data/owncloud.log``.
+More hints why the test is failing can be found in your ``data/nextcloud.log``.
diff --git a/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst b/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst
@@ -6,20 +6,14 @@ Federated Cloud Sharing is now managed by the Federation app (9.0+), and is
 now called Federation sharing. When you enable the Federation app you can 
 easily and securely link file shares between Nextcloud servers, in effect 
 creating a cloud of Nextclouds.
-
-Sharing With ownCloud 8 and Older
----------------------------------
-
-Direct Federation shares (:ref:`label-direct-share-link`) are not supported in 
-ownCloud 8 and older, so you must create Federation shares with public links 
-(:ref:`label-public-link-share`). 
+
 
 .. _label-direct-share-link:   
 
-Creating a new Federation Share (9.0+ only)
--------------------------------------------
+Creating a new Federation Share
+-------------------------------
 
-Follow these steps to create a new Federation share between two Nextcloud 9.0+ 
+Follow these steps to create a new Federation share between two Nextcloud 
 servers. This requires no action by the user on the remote server; all it takes 
 is a few steps on the originating server.
 
@@ -39,15 +33,15 @@ is a few steps on the originating server.
 
 .. figure:: images/federation-0.png
 
-3. Now go to your Files page and select a folder to share. Click the share 
+4. Now go to your Files page and select a folder to share. Click the share 
    icon, and then enter the username and URL of the user on the remote Nextcloud 
    server. In this example, that is ``freda@https://example.com/nextcloud``. 
    When Nextcloud verifies the link, it displays it with the **(remote)** label. 
    Click on this label to establish the link.
 
 .. figure:: images/federation-2.png
 
-3. When the link is successfully completed, you have a single share option, 
+5. When the link is successfully completed, you have a single share option, 
    and that is **can edit**.
 
 .. figure:: images/federation-3.png
@@ -75,9 +69,6 @@ exchanged. A red light means the connection failed.
 Creating Federation Shares via Public Link Share
 ------------------------------------------------
 
-You'll need to use a Public Link Share to create Federation shares with 
-ownCloud 8.x and older.
-
 Check the ``Share Link`` checkbox to expose more sharing options (which are 
 described more fully in :doc:`file_sharing_configuration`). You may create a 
 Federation share by allowing Nextcloud to create a public link for you, and then 

diff --git a/admin_manual/configuration_files/previews_configuration.rst b/admin_manual/configuration_files/previews_configuration.rst
@@ -16,7 +16,7 @@ By default, Nextcloud can generate previews for the following filetypes:
 * Cover of MP3 files
 * Text documents
 
-.. note:: Older versions of ownCloud also supported the preview generation
+.. note:: Technically Nextcloud can also generate the previews
           of other file types such as PDF, SVG or various office documents.
           Due to security concerns those providers have been disabled by
           default and are considered unsupported.

diff --git a/admin_manual/configuration_mimetypes/mimetype_aliases.rst b/admin_manual/configuration_mimetypes/mimetype_aliases.rst
@@ -2,16 +2,16 @@
 Mimetype Aliases
 ================
 
-ownCloud allows you to create aliases for mimetypes, so that you can display 
+Nextcloud allows you to create aliases for mimetypes, so that you can display 
 custom icons for files. For example, you might want a nice audio icon for audio 
 files instead of the default file icon.
 
-By default ownCloud is distributed with 
-``owncloud/resources/config/mimetypealiases.dist.json``.
-Do not modify this file, as it will be replaced when ownCloud is updated. 
-Instead, create your own ``owncloud/config/mimetypealiases.json`` 
+By default Nextcloud is distributed with 
+``nextcloud/resources/config/mimetypealiases.dist.json``.
+Do not modify this file, as it will be replaced when Nextcloud is updated. 
+Instead, create your own ``nextcloud/config/mimetypealiases.json`` 
 file with your custom aliases. Use the same syntax as in 
-``owncloud/resources/config/mimetypealiases.dist.json``.
+``nextcloud/resources/config/mimetypealiases.dist.json``.
 
 Once you have made changes to your ``mimetypealiases.json``, use the ``occ`` 
 command to propagate the changes through the system. This example is for