Make 5.0.0-beta1 public.

R1/source/releases/index.rst

@@ -3,11 +3,23 @@
 Releases & Downloads
 ====================
 
-Currently supported releases
-----------------------------
+Varnish Cache is released every 6 months.
+
+========================== ============ ===========  ===========
+Release                    Date         Notes        Download
+========================== ============ ===========  ===========
+Varnish Cache 5.0.0-beta1  2016-09-09   pre-release  `varnish-5.0.0-beta1.tar.gz`_ and `beta packages`_.
+:ref:`rel4.1.3`            2016-07-05   Supported    `varnish-4.1.3.tar.gz`_
+:ref:`rel4.0.3`            2015-02-19   Supported    `varnish-4.0.3.tar.gz`_
+Varnish Cache 3.0.7        2015-03-23   End Of Life  `varnish-3.0.7.tar.gz`_
+========================== ============ ===========  ===========
+
+.. _`beta packages`: https://repo.varnish-cache.org/pkg/5.0.0-beta1/
+.. _varnish-5.0.0-beta1.tar.gz: https://repo.varnish-cache.org/source/varnish-5.0.0-beta1.tar.gz
+.. _varnish-4.1.3.tar.gz: https://repo.varnish-cache.org/source/varnish-4.1.3.tar.gz
+.. _varnish-4.0.3.tar.gz: https://repo.varnish-cache.org/source/varnish-4.0.3.tar.gz
+.. _varnish-3.0.7.tar.gz: https://repo.varnish-cache.org/source/varnish-3.0.7.tar.gz
 
-* :ref:`rel4.1.3`
-* :ref:`rel4.0.3`
 
 `Changelog for all releases <https://github.com/varnishcache/varnish-cache/blob/master/doc/changes.rst>`_
 
@@ -15,34 +27,25 @@ Currently supported releases
 
 :ref:`Extras, Utilities, etc. <extras>`
 
-By Operating System
--------------------
+Pre-built packages
+------------------
+
+Varnish Cache is widely available in package archives for different operating
+systems.
+
+Here is a list of the ones we know about:
 
-* :ref:`install_freebsd`
-* :ref:`install_ubuntu`
-* :ref:`install_debian`
-* :ref:`install_redhat`
 * `ArchLinux package`_ and `ArchLinux wiki`_
 * `Alpine Linux`_
+* :ref:`install_debian`
+* :ref:`install_freebsd`
+* :ref:`install_redhat`
+* :ref:`install_ubuntu`
 
 .. _`ArchLinux package`: https://www.archlinux.org/packages/extra/x86_64/varnish/
 .. _`ArchLinux wiki`: https://wiki.archlinux.org/index.php/Varnish
 .. _`Alpine Linux`: https://pkgs.alpinelinux.org/package/edge/main/x86_64/varnish
 
-Current and older releases
---------------------------
-
-========================== ============ =========== ===========
-Release                    Release Date Status      Download
-========================== ============ =========== ===========
-:ref:`rel4.1.3`            2016-07-05   Supported   `varnish-4.1.3.tar.gz`_
-:ref:`rel4.0.3`            2015-02-19   Supported   `varnish-4.0.3.tar.gz`_
-Varnish Cache 3.0.7        2015-03-23   End Of Life `varnish-3.0.7.tar.gz`_
-========================== ============ =========== ===========
-
-.. _varnish-4.1.3.tar.gz: https://repo.varnish-cache.org/source/varnish-4.1.3.tar.gz
-.. _varnish-4.0.3.tar.gz: https://repo.varnish-cache.org/source/varnish-4.0.3.tar.gz
-.. _varnish-3.0.7.tar.gz: https://repo.varnish-cache.org/source/varnish-3.0.7.tar.gz
 
 .. _beta-debs: https://jenkins.varnish-software.com/view/VC4/job/VC4-deb/lastSuccessfulBuild/artifact/deb-build/
 .. _beta-rpms-el6: https://jenkins.varnish-software.com/view/VC4/job/VC4-rpm-el6/lastSuccessfulBuild/artifact/rpm-build/varnish-4.1/el6/

R1/source/releases/install_debian.rst

 .. _install_debian:
 
-Installation on Debian
-======================
+Installation on Debian and Ubuntu
+=================================
 
-Varnish is distributed in the Debian package repositories but the
-version there might be out of date and we generally recommend using
-the packages provided by varnish-cache.org or packages from
-backports.debian.org.
+Varnish Cache is distributed in the Debian and Ubuntu package repositories.
 
-To use the varnish-cache.org repository and install Varnish under
-Debian 8 ("jessie") do the following as root::
+The versions there might be out of date, but they provide a simple and elegant
+way of getting started with Varnish Cache.
+
+::
+    apt update
+    apt install varnish
+
+Official packages of 5.0
+------------------------
+
+Starting from Varnish Cache 5.0, we've simplified our packaging down to two,
+the main package and a development package.
+
+In due time, we may add these to some repository software. Currently
+they're available on:
+
+    https://repo.varnish-cache.org/pkg/
+
+
+
+Packages from repo.varnish-cache.org (<5.0)
+------------------------------------
+
+To use the varnish-cache.org repository and install Varnish on
+Debian jessie do the following as root::
 
     apt-get install apt-transport-https
     curl https://repo.varnish-cache.org/GPG-key.txt | apt-key add -
@@ -18,7 +38,11 @@ Debian 8 ("jessie") do the following as root::
     apt-get update
     apt-get install varnish
 
-Packages are built for wheezy and jessie on amd64. Varnish 4.0
-packages are available in the "varnish-4.0" component.
+There are Ubuntu builds available under /ubuntu/.
+
+Some earlier/legacy builds are also available under the "varnish-3.0" and
+"varnish-4.0" components.
+
+List of supported platforms varies.
+
 
-Ubuntu LTS users please follow :ref:`these instructions <install_ubuntu>`.

R1/source/releases/install_ubuntu.rst

@@ -3,26 +3,7 @@
 Installation on Ubuntu
 ======================
 
-Varnish is distributed in the Ubuntu package repositories, but the
-version there might be out of date, and we generally recommend using
-the packages provided by varnish-cache.org.
+For installation of official packages on Ubuntu Linux, see the :ref:`Debian<install_debian>` page.
 
-Please be advised that we only provide packages for Ubuntu's LTS
-releases, not all the intermediate releases. These packages might
-still work fine on newer releases. The supported architecture is
-amd64.
 
-To use the varnish-cache.org repository and install Varnish under
-Ubuntu 14.04 (Trusty Tahr) do the following as root::
-
-    apt-get install apt-transport-https
-    curl https://repo.varnish-cache.org/GPG-key.txt | apt-key add -
-    echo "deb https://repo.varnish-cache.org/ubuntu/ trusty varnish-4.1" \
-	 >> /etc/apt/sources.list.d/varnish-cache.list
-    apt-get update
-    apt-get install varnish
-
-Packages for Varnish 4.0 is available in the "varnish-4.0" component.
-Currently packages are being built for precise and trusty on amd64.
-
-Debian users please follow :ref:`these instructions <install_debian>`.
+(this is left here to avoid linkrot)