From 74d0622d430188c15f61e0c8fc60a81ed90d107f Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Wed, 1 Jul 2015 10:00:39 +0100 Subject: [PATCH] Fix docs clobbered by 3.1 -> 3.2 merge. --- docs/en/00_Getting_Started/index.md | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/docs/en/00_Getting_Started/index.md b/docs/en/00_Getting_Started/index.md index bd891249d..575969450 100644 --- a/docs/en/00_Getting_Started/index.md +++ b/docs/en/00_Getting_Started/index.md @@ -9,8 +9,8 @@ lets you install and upgrade SilverStripe and its modules. Although installing Other ways to get SilverStripe: - * If you just want to get the code as quickly as possible, you can [download SilverStripe from our website](http://silverstripe.org/download). - * If you already have an installed version of SilverStripe, and you haven't used Composer to get it, please see our [upgrading](upgrading) guide. Note that [Composer](composer) provides its own tools for upgrading. + * If you just want to get the code as quickly as possible, you can [download SilverStripe from our website](http://www.silverstripe.org/software/download/). + * If you already have an installed version of SilverStripe, and you haven't used Composer to get it, please see our [upgrading](/upgrading) guide. Note that [Composer](composer) provides its own tools for upgrading. ## Setting up a server @@ -18,25 +18,25 @@ Other ways to get SilverStripe: To run SilverStripe on Linux/Unix, set up one of the following web servers: -* [Install using Apache](webserver) - our preferred platform -* [Install using Lighttpd](lighttpd) - fast, but a bit tricker to get going -* [Install using Nginx](nginx) - Super fast at serving static files. Great for large traffic sites. -* [Install using nginx and HHVM](nginx-hhvm) - nginx and [HHVM](http://hhvm.com/) as a faster alternative to PHP +* [Install using Apache](installation) - our preferred platform +* [Install using Lighttpd](installation/how_to/configure_lighttpd) - fast, but a bit tricker to get going +* [Install using Nginx](installation/how_to/configure_nginx) - Super fast at serving static files. Great for large traffic sites. +* [Install using nginx and HHVM](installation/how_to/setup_nginx_and_hhvm) - nginx and [HHVM](http://hhvm.com/) as a faster alternative to PHP ### Windows -The most straightforward way to get SilverStripe running on Windows is with the [Microsoft Web Platform installer](windows-pi). You can skip the "getting the code" step. +The most straightforward way to get SilverStripe running on Windows is with the [Microsoft Web Platform installer](installation/other_installation_options/windows_platform_installer). You can skip the "getting the code" step. For more flexibility, you can set up either of the following web servers, and use Composer to get the code: - * [Install using IIS](windows-manual-iis) - * [Install using Apache/WAMP](windows-wamp) + * [Install using IIS](installation/other_installation_options/windows_iis7) + * [Install using Apache/WAMP](installation/windows) ### Mac OS X Mac OS X comes with a built-in webserver, but there are a number of other options: - * [Install using MAMP](mac-osx) + * [Install using MAMP](installation/mac_osx) * [Install using Homebrew](installation/other_installation_options/mac_osx_homebrew) ### Virtual Machines through Vagrant @@ -61,10 +61,9 @@ ready for download or installation on a cloud platform. ## Troubleshooting -If you run into trouble, see [common-problems](common-problems) or post to the -[SilverStripe forums](http://silverstripe.com/silverstripe-forum/). +If you run into trouble, see [common-problems](installation/common_problems) or post to the +[SilverStripe forums](http://silverstripe.org/community/forums/). ## Related - * [Module installation](../topics/modules) - * [Suggested web hosts](http://doc.silverstripe.org/old/suggested-web-hosts) + * [Module installation](/developer_guides/extending/modules)