[Pkg-owncloud-commits] [owncloud-doc] 137/270: Merge pull request #364 from owncloud/fix-305-356

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit eea17d4dd4a6e9bab7b6cc9ebc193442c915f662
Author: Volkan Gezer <wakeup at users.noreply.github.com>
Date:   Sat May 31 14:02:01 2014 +0200

    Merge pull request #364 from owncloud/fix-305-356
    
    fixes #305 and #356, add next steps
    Conflicts:
    	admin_manual/installation/installation_source.rst
---
 admin_manual/installation/installation_linux.rst  | 5 +++++
 admin_manual/installation/installation_source.rst | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/admin_manual/installation/installation_linux.rst b/admin_manual/installation/installation_linux.rst
index dba83bc..b326004 100644
--- a/admin_manual/installation/installation_linux.rst
+++ b/admin_manual/installation/installation_linux.rst
@@ -26,3 +26,8 @@ or else the installation process might fail.
 **PCLinuxOS:** Follow the Tutorial `ownCloud, installation and setup`_ on the PCLinuxOS web site.
 
 .. _ownCloud, installation and setup: http://pclinuxoshelp.com/index.php/Owncloud,_installation_and_setup
+
+Follow the wizard to complete your installation
+***********************************************
+
+For setting up your ownCloud instance after installation, please refer to the :ref:`install-wizard` section.
diff --git a/admin_manual/installation/installation_source.rst b/admin_manual/installation/installation_source.rst
index 2d9ca62..52f9b5d 100644
--- a/admin_manual/installation/installation_source.rst
+++ b/admin_manual/installation/installation_source.rst
@@ -581,6 +581,8 @@ Microsoft Internet Information Server (IIS)
 
 See :doc:`installation_windows` for further instructions.
 
+.. _install-wizard:
+
 Follow the Install Wizard
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git