Merge branch 'stable'

doc/MAINTAINER_GUIDE.md

@@ -50,12 +50,19 @@ to go:
         * Look for any links to "latest" documentation, replace with version tag
         * Ensure all documentation pages listed in `mkdocs.yaml`
     * Check that any new Linux distribution versions added to
-      `etc/scripts/release.hs` and `etc/scripts/vagrant-releases.sh`
+      `etc/scripts/release.hs` and `etc/scripts/vagrant-releases.sh`.
+        * [Ubuntu](https://wiki.ubuntu.com/Releases)
+        * [Debian](https://www.debian.org/releases/) (keep at least latest two)
+        * [CentOS](https://wiki.centos.org/Download)
+        * [Fedora](https://fedoraproject.org/wiki/Releases)
     * Check that no new entries need to be added to
       [releases.yaml](https://github.com/fpco/stackage-content/blob/master/stack/releases.yaml),
       [install_and_upgrade.md](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md),
       and
       `README.md`
+    * Remove unsupported/obsolete distribution versions from
+      [install_and_upgrade.md](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md),
+      and perhaps from the release process.
 
 ## Release process
 

doc/install_and_upgrade.md

@@ -108,14 +108,6 @@ problems, see the linked FAQ entries:
 
             echo 'deb http://download.fpcomplete.com/ubuntu wily main'|sudo tee /etc/apt/sources.list.d/fpco.list
 
-      * Ubuntu 15.04 (amd64):
-
-            echo 'deb http://download.fpcomplete.com/ubuntu vivid main'|sudo tee /etc/apt/sources.list.d/fpco.list
-
-      * Ubuntu 14.10 (amd64)
-
-            echo 'deb http://download.fpcomplete.com/ubuntu utopic main'|sudo tee /etc/apt/sources.list.d/fpco.list
-
       * Ubuntu 14.04 (amd64)
 
             echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/sources.list.d/fpco.list
@@ -177,11 +169,9 @@ problems, see the linked FAQ entries:
 *Note*: for 32-bit, you can use this
  [Fedora Copr repo](https://copr.fedoraproject.org/coprs/petersen/stack/) (not
  managed by the Stack release team, so not guaranteed to have the very latest
- version) which can be enabled with:
-
-    sudo dnf copr enable petersen/stack
+ version) which can be enabled with: `sudo dnf copr enable petersen/stack`
 
- 1. Add the appropriate source repository:
+   1. Add the appropriate source repository:
 
       * Fedora 23 (x86_64)
 
@@ -191,19 +181,9 @@ problems, see the linked FAQ entries:
 
             curl -sSL https://s3.amazonaws.com/download.fpcomplete.com/fedora/22/fpco.repo | sudo tee /etc/yum.repos.d/fpco.repo
 
-      * Fedora 21 (x86_64)
-
-            curl -sSL https://s3.amazonaws.com/download.fpcomplete.com/fedora/21/fpco.repo | sudo tee /etc/yum.repos.d/fpco.repo
-
- 2. Install:
-
-      * Fedora 22 and above
-
-            sudo dnf -y install stack
-
-      * Fedora < 22
+   2. Install:
 
-            sudo yum -y install stack
+        sudo dnf -y install stack
 
 ## <a name="suse"></a>openSUSE / SUSE Linux Enterprise