3235: Merge branch 'master' into 3235-top-nav-site-search

[arvados.git] / doc / install / index.html.textile.liquid

diff --git a/doc/install/index.html.textile.liquid b/doc/install/index.html.textile.liquid
index 5bf35f36f5ad04e86f7c2e51f210f6975ef7fe70..7cb0fea15a56d959a0f783a146929040e84778cf 100644 (file)
--- a/doc/install/index.html.textile.liquid
+++ b/doc/install/index.html.textile.liquid
@@ -1,15 +1,25 @@
 ---
 layout: default
 navsection: installguide
-title: Overview
+title: Installation overview
 ...
 
-{% include 'alert_stub' %}
+Arvados can be installed in multiple ways. Arvados does not depend on any particular cloud operating stack. Arvados runs on one or more GNU/Linux system(s). Arvados is being developed on Debian and Ubuntu GNU/Linux.
+
+The simplest way to try out Arvados is to use the Docker-based installation, which installs Arvados in a series of Docker containers.
+
+For larger scale installations, a manual installation is more appropriate.
+
+h2. Docker
 
-h2. Installation Overview
+"Installing with Docker":install-docker.html
+
+h2. Manual installation
+
+{% include 'alert_stub' %}
 
 # Set up a cluster, or use Amazon
-# Create and mount Keep volumes
+# "Install Keep":install-keep.html
 # "Install the Single Sign On (SSO) server":install-sso.html
 # "Install the Arvados REST API server":install-api-server.html
 # "Install the Arvados workbench application":install-workbench-app.html