getredash · jeffwidman · Mar 8, 2016 · Mar 8, 2016
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ You can try out the demo instance: http://demo.redash.io/ (login with any Google
 
 ## Getting Started
 
-* [Setting up re:dash instance](http://redash.io/deployment/setup.html) (includes links to ready made AWS/GCE images).
+* [Setting up a re:dash instance](http://docs.redash.io/en/latest/setup.html).
 * [Documentation](http://docs.redash.io).
 
 

diff --git a/docs/dev/vagrant.rst b/docs/dev/vagrant.rst
@@ -4,9 +4,8 @@ Setting up development environment (using Vagrant)
 To simplify contribution there is a `Vagrant
 box <https://vagrantcloud.com/redash/boxes/dev>`__ available with all
 the needed software to run re:dash for development (use it only for
-development, for demo purposes there is
-`redash/demo <https://vagrantcloud.com/redash/boxes/demo>`__ box and the
-AWS/GCE images).
+development, for demo purposes use the
+`Redash website <https://demo.redash.io/>`__).
 
 To get started with this box:
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -9,7 +9,7 @@ Open Source Data Collaboration and Visualization Platform
 Prior to **re:dash**, we tried to use traditional BI suites and discovered a set of bloated, technically challenged and slow tools/flows. What we were looking for was a more hacker'ish way to look at data, so we built one.
 
 **re:dash** was built to allow fast and easy access to billions of records, that we process and collect using Amazon Redshift ("petabyte scale data warehouse" that "speaks" PostgreSQL).
-Today **_re:dash_** has support for querying multiple databases, including: Redshift, Google BigQuery,Google Spreadsheets, PostgreSQL, MySQL, Graphite and custom scripts.
+Today **_re:dash_** supports querying multiple databases, including: Redshift, Google BigQuery, Google Spreadsheets, PostgreSQL, MySQL, Graphite and custom scripts.
 
 Features
 ########

diff --git a/docs/settings.rst b/docs/settings.rst
@@ -1,7 +1,7 @@
 Settings
 ########
 
-Much of the functionality of re:dash can be changes with settings. Settings are read by `/redash/settings.py` from environment variables which (for most installs) can be set in `/opt/redash/current/.env`
+Much of the functionality of re:dash can be changed with settings. Settings are read by `/redash/settings.py` from environment variables which (for most installs) can be set in `/opt/redash/current/.env`
 
 The follow is a list of settings and what they control:
 

diff --git a/docs/setup.rst b/docs/setup.rst
@@ -6,84 +6,27 @@ script <https://raw.githubusercontent.com/getredash/redash/master/setup/ubuntu/b
 works on Ubuntu 12.04, Ubuntu 14.04 and Debian Wheezy. This script
 installs all needed dependencies and creates basic setup.
 
-To ease the process, there are also images for AWS and Google Compute
-Cloud. These images created with the same provision script using Packer.
-
 Create an instance
 ==================
 
-AWS
----
-
-Launch the instance with from the pre-baked AMI (for small deployments
-t2.micro should be enough):
-
--  us-east-1: `ami-a7ddfbcd <https://console.aws.amazon.com/ec2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-a7ddfbcd>`__
--  us-west-1: `ami-269feb46 <https://console.aws.amazon.com/ec2/home?region=us-west-1#LaunchInstanceWizard:ami=ami-269feb46>`__
--  us-west-2: `ami-435fba23 <https://console.aws.amazon.com/ec2/home?region=us-west-2#LaunchInstanceWizard:ami=ami-435fba23>`__
--  eu-west-1: `ami-b4c277c7 <https://console.aws.amazon.com/ec2/home?region=eu-west-1#LaunchInstanceWizard:ami=ami-b4c277c7>`__
--  eu-central-1: `ami-07ced76b <https://console.aws.amazon.com/ec2/home?region=eu-central-1#LaunchInstanceWizard:ami=ami-07ced76b>`__
--  sa-east-1: `ami-6e2eaf02 <https://console.aws.amazon.com/ec2/home?region=sa-east-1#LaunchInstanceWizard:ami=ami-6e2eaf02>`__
--  ap-northeast-1: `ami-aa5a64c4 <https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#LaunchInstanceWizard:ami=ami-aa5a64c4>`__
--  ap-southeast-1: `ami-1c45897f <https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#LaunchInstanceWizard:ami=ami-1c45897f>`__
--  ap-southeast-2: `ami-42b79221 <https://console.aws.amazon.com/ec2/home?region=ap-southeast-2#LaunchInstanceWizard:ami=ami-42b79221>`__
-
-(the above AMIs are of version: 0.9.1)
-
-When launching the instance make sure to use a security group, that **only** allows incoming traffic on: port 22 (SSH), 80 (HTTP) and 443 (HTTPS).
-
-Now proceed to `"Setup" <#setup>`__.
-
-Google Compute Engine
----------------------
-
-First, you need to add the images to your account:
-
-.. code:: bash
-
-    $ gcloud compute images create "redash-091-b1377" --source-uri gs://redash-images/redash.0.9.1.b1377.tar.gz
-
-Next you need to launch an instance using this image (n1-standard-1
-instance type is recommended). If you plan using re:dash with BigQuery,
-you can use a dedicated image which comes with BigQuery preconfigured
-(using instance permissions):
-
-.. code:: bash
-
-    $ gcloud compute images create "redash-091-b1377-bq" --source-uri gs://redash-images/redash.0.9.1.b1377-bq.tar.gz
-
-Note that you need to launch this instance with BigQuery access:
-
-.. code:: bash
-
-    $ gcloud compute instances create <your_instance_name> --image redash-091-b1377-bq --scopes storage-ro,bigquery
-
-(the same can be done from the web interface, just make sure to enable
-BigQuery access)
-
-Now proceed to `"Setup" <#setup>`__.
-
-
-Other
------
-
 Download the provision script and run it on your machine. Note that:
 
 1. You need to run the script as root.
 2. It was tested only on Ubuntu 12.04, Ubuntu 14.04 and Debian Wheezy.
-3. It's designed to run on a "clean" machine. If you're running this script on a machine that is used for other purposes, you might want to tweak it to your needs (like removing the ``apt-get dist-upgrade`` call at the beginning of it).
+3. It's designed to run on a "clean" machine. If you're running this script on a
+   machine that is used for other purposes, you might want to tweak it to your
+   needs (like removing the ``apt-get dist-upgrade`` call at the beginning of it).
 
 Setup
 =====
 
-Once you created the instance with either the image or the script, you
+Once you created the instance with the script, you
 should have a running re:dash instance with everything you need to get
 started. You can now login to it with the user "admin" (password:
 "admin"). But to make it useful, there are a few more steps that you
 need to manually do to complete the setup:
 
-First ssh to your instance and change directory to ``/opt/redash``. If
-you're using the GCE image, switch to root (``sudo su``).
+First ssh to your instance and change directory to ``/opt/redash``.
 
 Users & Google Authentication setup
 -----------------------------------
@@ -110,7 +53,8 @@ file.
    export REDASH_GOOGLE_CLIENT_SECRET=""
 
 
-4. Configure the domain(s) you want to allow to use with Google Apps, by running the command:
+4. Configure the domain(s) you want to allow to use with Google Apps, by
+   running the command:
 
 .. code::
 
@@ -134,17 +78,18 @@ If you're passing multiple domains, separate them with commas.
 Datasources
 -----------
 
-To make re:dash truly useful, you need to setup your data sources in it. Browse to ``/data_sources`` on your instance,
-to create new data source connection.
+To make re:dash truly useful, you need to setup your data sources in it. Browse
+to ``/data_sources`` on your instance, to create new data source connection.
 
 See :doc:`documentation </datasources>` for the different options.
 Your instance comes ready with dependencies needed to setup supported sources.
 
 Mail Configuration
 ------------------
 
-For the system to be able to send emails (for example when alerts trigger), you need to set the mail server to use and the
-host name of your re:dash server. If you're using one of our images, you can do this by editing the `.env` file:
+For the system to be able to send emails (for example when alerts trigger), you
+need to set the mail server to use and the host name of your re:dash server. If
+you're using one of our images, you can do this by editing the `.env` file:
 
 .. code::
 
@@ -161,16 +106,19 @@ host name of your re:dash server. If you're using one of our images, you can do
    export REDASH_HOST="" # base address of your re:dash instance, for example: "https://demo.redash.io"
 
 - Note that not all values are required, as there are default values.
-- It's recommended to use some mail service, like `Amazon SES <https://aws.amazon.com/ses/>`__, `Mailgun <http://www.mailgun.com/>`__
-  or `Mandrill <http://mandrillapp.com>`__ to send emails to ensure deliverability.
+- It's recommended to use some mail service, like
+  `Amazon SES <https://aws.amazon.com/ses/>`__,
+  `Mailgun <http://www.mailgun.com/>`__, or `SparkPost <http://sparkpost.com>`__
+  to send emails to ensure deliverability.
 
-To test email configuration, you can run `bin/run ./manage.py send_test_mail` (from `/opt/redash/current`).
+To test email configuration, you can run `bin/run ./manage.py send_test_mail`
+(from `/opt/redash/current`).
 
 How to upgrade?
 ---------------
 
-It's recommended to upgrade once in a while your re:dash instance to
-benefit from bug fixes and new features. See :doc:`here </upgrade>` for full upgrade
+It's recommended to once in a while upgrade your re:dash instance to benefit
+from bug fixes and new features. See :doc:`here </upgrade>` for full upgrade
 instructions (including Fabric script).
 
 Notes

diff --git a/setup/amazon_linux/README.md b/setup/amazon_linux/README.md