This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud-doc.
commit 7bb24eec3c620ced25b3d9b6d7fe928d02739ea4
Author: Carla Schroder <carla at owncloud.com>
Date: Tue Nov 10 13:22:41 2015 -0800
update screenshots
---
.../installation/images/install-wizard-2.png | Bin 28652 -> 0 bytes
.../installation/images/install-wizard-3.png | Bin 26007 -> 0 bytes
.../installation/images/install-wizard-a.png | Bin 0 -> 17021 bytes
.../installation/images/install-wizard-a1.png | Bin 0 -> 19504 bytes
.../installation/images/install-wizard-a2.png | Bin 0 -> 49100 bytes
.../installation/images/install-wizard-a3.png | Bin 0 -> 10655 bytes
.../installation/images/install-wizard-a4.png | Bin 0 -> 51635 bytes
.../images/install-wizard-advanced.png | Bin 68482 -> 0 bytes
.../installation/images/install-wizard.png | Bin 40430 -> 0 bytes
.../installation/images/untrusted-domain.png | Bin 26983 -> 0 bytes
admin_manual/installation/installation_wizard.rst | 40 ++++++++++-----------
11 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/admin_manual/installation/images/install-wizard-2.png b/admin_manual/installation/images/install-wizard-2.png
deleted file mode 100644
index 23d8eaf..0000000
Binary files a/admin_manual/installation/images/install-wizard-2.png and /dev/null differ
diff --git a/admin_manual/installation/images/install-wizard-3.png b/admin_manual/installation/images/install-wizard-3.png
deleted file mode 100644
index ac2ed76..0000000
Binary files a/admin_manual/installation/images/install-wizard-3.png and /dev/null differ
diff --git a/admin_manual/installation/images/install-wizard-a.png b/admin_manual/installation/images/install-wizard-a.png
new file mode 100644
index 0000000..6586dbc
Binary files /dev/null and b/admin_manual/installation/images/install-wizard-a.png differ
diff --git a/admin_manual/installation/images/install-wizard-a1.png b/admin_manual/installation/images/install-wizard-a1.png
new file mode 100644
index 0000000..a8d1564
Binary files /dev/null and b/admin_manual/installation/images/install-wizard-a1.png differ
diff --git a/admin_manual/installation/images/install-wizard-a2.png b/admin_manual/installation/images/install-wizard-a2.png
new file mode 100644
index 0000000..e2dc459
Binary files /dev/null and b/admin_manual/installation/images/install-wizard-a2.png differ
diff --git a/admin_manual/installation/images/install-wizard-a3.png b/admin_manual/installation/images/install-wizard-a3.png
new file mode 100644
index 0000000..67a195a
Binary files /dev/null and b/admin_manual/installation/images/install-wizard-a3.png differ
diff --git a/admin_manual/installation/images/install-wizard-a4.png b/admin_manual/installation/images/install-wizard-a4.png
new file mode 100644
index 0000000..4eb108c
Binary files /dev/null and b/admin_manual/installation/images/install-wizard-a4.png differ
diff --git a/admin_manual/installation/images/install-wizard-advanced.png b/admin_manual/installation/images/install-wizard-advanced.png
deleted file mode 100644
index e254293..0000000
Binary files a/admin_manual/installation/images/install-wizard-advanced.png and /dev/null differ
diff --git a/admin_manual/installation/images/install-wizard.png b/admin_manual/installation/images/install-wizard.png
deleted file mode 100644
index 561bd76..0000000
Binary files a/admin_manual/installation/images/install-wizard.png and /dev/null differ
diff --git a/admin_manual/installation/images/untrusted-domain.png b/admin_manual/installation/images/untrusted-domain.png
deleted file mode 100644
index 825ca2d..0000000
Binary files a/admin_manual/installation/images/untrusted-domain.png and /dev/null differ
diff --git a/admin_manual/installation/installation_wizard.rst b/admin_manual/installation/installation_wizard.rst
index ede86eb..1545972 100644
--- a/admin_manual/installation/installation_wizard.rst
+++ b/admin_manual/installation/installation_wizard.rst
@@ -14,7 +14,7 @@ This is just three steps:
#. 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
@@ -37,11 +37,11 @@ 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
@@ -57,24 +57,23 @@ and must be owned by your HTTP user (see
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.
@@ -102,10 +101,9 @@ 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:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git