From a39070eda1d27c99266b838eb74a8ae15812a39f Mon Sep 17 00:00:00 2001
From: "Bruce A. Mah" <bmah@es.net>
Date: Mon, 16 Jun 2014 11:26:13 -0700
Subject: [PATCH] Update for 3.0.5 release and GitHub Pages.

---
 docs/conf.py  |  4 ++--
 docs/news.rst | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3afc1ea..b43094a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -52,9 +52,9 @@ copyright = u'2014, ESnet'
 # built documents.
 #
 # The short X.Y version.
-version = '3.0.3'
+version = '3.0.5'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.3'
+release = '3.0.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/news.rst b/docs/news.rst
index b5caead..6a1b98a 100644
--- a/docs/news.rst
+++ b/docs/news.rst
@@ -1,6 +1,39 @@
 iperf3 Project News
 ===================
 
+2014-06-16:  Project documentation on GitHub Pages
+--------------------------------------------------
+
+iperf3 project documentation can now be found at:
+
+| URL:  http://software.es.net/iperf/
+
+This is a GitHub Pages site.  In an ongoing series of steps, content
+will be migrated from the iperf3 wiki to GitHub Pages.
+
+2014-06-16:  iperf-3.0.5 released
+---------------------------------
+
+| URL:  http://downloads.es.net/pub/iperf/iperf-3.0.5.tar.gz
+| SHA256:  ``e1e1989985b17a4c03b0fa207004ad164b137e37ab0682fecbf5e93bcaa920a6  iperf-3.0.5.tar.gz``
+
+This is the third maintenance release of iperf 3, with few more
+enhancements and bug fixes.  Highlights:
+
+* A timing issue which caused measurement intervals to be wrong with
+  TCP tests on lossy networks has been fixed.
+
+* It is now possible to get (most of) the server-side output at
+  the client by using the ``--get-server-output`` flag.
+
+* A number of bugs with ``--json`` output have been fixed.
+
+A more extensive list of changes can always be found in the
+``RELEASE_NOTES`` file in the source distribution.
+
+Note:  An iperf-3.0.4 release was planned and tagged, but not
+officially released.
+
 2014-06-10:  New iperf3 download site
 -------------------------------------