From b511e9d0a990d531dfc15bdabeec45e04e71efd0 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 20 Oct 2017 14:33:50 -0700 Subject: [PATCH] docs: Recommend Xenial over Trusty for new installations. --- README.md | 4 ++-- docs/dev-setup-non-vagrant.md | 2 +- docs/prod-install.md | 5 ++++- docs/prod-requirements.md | 6 ++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8a80fc43cd..b7552a5885 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,8 @@ This is documented in [the developer installation guide][dev-install]. ## Running Zulip in production -Zulip in production supports Ubuntu 14.04 Trusty and Ubuntu 16.04 -Xenial. We're happy to support work to enable Zulip to run on +Zulip in production supports Ubuntu 16.04 Xenial and Ubuntu 14.04 +Trusty. We're happy to support work to enable Zulip to run on additional platforms. The installation process is [documented here](https://zulip.readthedocs.io/en/latest/prod.html). diff --git a/docs/dev-setup-non-vagrant.md b/docs/dev-setup-non-vagrant.md index 0afa0ac767..164ac43319 100644 --- a/docs/dev-setup-non-vagrant.md +++ b/docs/dev-setup-non-vagrant.md @@ -12,7 +12,7 @@ Start by cloning this repository: `git clone https://github.com/zulip/zulip.git` If you'd like to install a Zulip development environment on a computer -that's already running Ubuntu 14.04 Trusty or Ubuntu 16.04 Xenial, you +that's already running Ubuntu 16.04 Xenial or Ubuntu 14.04 Trusty, you can do that by just running: ``` diff --git a/docs/prod-install.md b/docs/prod-install.md index f11f48084b..e348c440cf 100644 --- a/docs/prod-install.md +++ b/docs/prod-install.md @@ -8,7 +8,10 @@ You will need an Ubuntu system that satisfies [the installation requirements](prod-requirements.html). In short, you need: * Either a dedicated machine, or a fresh VM on an existing machine. -* Ubuntu 14.04 Trusty or Ubuntu 16.04 Xenial, 64-bit. +* Ubuntu 16.04 Xenial or Ubuntu 14.04 Trusty, 64-bit. If you have a + choice, install on Xenial, since Trusty is approaching its + end-of-life and you'll save yourself the work of upgrading a + production installation. * At least 2GB RAM and 10 GB disk space (4GB and 2 CPUs recommended for 100+ users). * A DNS name, an SSL certificate, and credentials for sending email. diff --git a/docs/prod-requirements.md b/docs/prod-requirements.md index c4d320a17c..ec62fce2cb 100644 --- a/docs/prod-requirements.md +++ b/docs/prod-requirements.md @@ -23,8 +23,10 @@ can't support you, but #### Operating System -Ubuntu 14.04 Trusty and Ubuntu 16.04 Xenial are supported for running -Zulip in production. 64-bit is recommended. +Ubuntu 16.04 Xenial and Ubuntu 14.04 Trusty are supported for running +Zulip in production. 64-bit is recommended. We recommend Xenial if +you have a choice, since 14.04 is approaching end-of-life and you'll +save yourself the work of upgrading in a few months. #### Hardware Specifications