[Pkg-owncloud-commits] [owncloud-doc] 208/270: Merge pull request #312 from RandolfCarter/stable6_fix_win_php_version_hint

[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 c61ffb2339e99576d450a6bd4790b27a943cf0b8
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jul 4 08:02:31 2014 +0200

    Merge pull request #312 from RandolfCarter/stable6_fix_win_php_version_hint
    
    Correct PHP installation hints
    Conflicts:
    	admin_manual/installation/installation_windows.rst
---
 admin_manual/installation/installation_windows.rst | 54 ++++++++++------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/admin_manual/installation/installation_windows.rst b/admin_manual/installation/installation_windows.rst
index e17a08e..3dfdf3f 100644
--- a/admin_manual/installation/installation_windows.rst
+++ b/admin_manual/installation/installation_windows.rst
@@ -81,6 +81,8 @@ features are the features you would expect from a web server.
 
     The standard IIS 7 splash page opens.  This page displays a static image that indicates that your web server is running. Assuming you were able to reach splash page, your web server is now up and running.
 
+Continue by `installing PHP`_.
+
 
 Windows Server 2008
 ^^^^^^^^^^^^^^^^^^^
@@ -111,43 +113,32 @@ Windows Server 2008
 
 8. Select your website
 
-    On the far right side of the opening page you will see a section titled :guilabel:`Manage Server`. 
-
-9. Make sure that the service is started, or click “Start” to start the services selected.
-
-9. Go to a web browser and type `localhost`. 
+9. Once this is complete, you should be able to go to a web browser and type
+   `localhost`. This should open the standard IIS 7 splash page, which is just a
+   static image that says your web server is running. Assuming you were able to get
+   the splash page, it is safe to say your web server is now up and running.
 
-    The standard IIS 7 splash page opens to display a static image that says your web server is running. Accessing this splash page indicates that your web server is now functioning. 
-
-Proceed to the next section to install PHP on the server.
+Continue by `installing PHP`_.
 
 Installing PHP
 ~~~~~~~~~~~~~~
 
-This part is also straightforward, but it is necessary to remind you that this is for IIS only.
-
-To install PHP:
-
-1. Go to the following link and download the `PHP installer <http://windows.php.net/download/>`_ for version "VC9 Non Thread Safe" 32 or
-   64 bit based on your system.
-
-    .. note:: If you are using Apache, make sure you download version VC6 instead.  You can locate this version lower on the page.
+1. Go to the `PHP for Windows`_ download page.
 
-2. Once you have logged in, select the location that is closest to you geographically.
+.. note:: The instructions below are for IIS only. If using a different server
+          software, make sure to follow the hints on "Which version do I
+          choose" on the left hand side of the page linked above.
 
-3. Run the install wizard once it downloads. 
+2. Download the Installer for PHP 5.3, the "VC9 Non Thread Safe" version,
+   either 32 or 64 bit, depending on your system.
+3. Run the downloaded installation executable.
+4. Read the license agreement, agree, select an install directory.
+5. Then select IIS FastCGI as the install server.
+6. Take the default selections for the items to install, and click next.
+   Then click `install`.
+7. Once the installer is finished, PHP is installed.
 
-4. Read the license agreement, agree, and select an install directory.
-
-4. Select IIS FastCGI as the install server. 
-
-5. Click next, accepting the default selections for the items to install.
-
-6. Click `install`.
-
-    PHP installs on your system. 
-
-Proceed to the next section to install MySQL.
+Continue by `installing MySQL`_.
 
 Installing MySQL
 ~~~~~~~~~~~~~~~~
@@ -279,4 +270,7 @@ To modify the IIS Manager:
 
     .. note:: This entry is in bytes, not kilobytes.
 
-    Congratulations!  ownCloud is now configured and ready for use.
+You should now have ownCloud configured and ready for use.
+
+
+.. _PHP For Windows: http://windows.php.net/download/

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