[master] 2445871 Revert "Forgot to :w in vi(1) before committing. (That was new...)"

[Poul-Henning Kamp]

commit 24458719b9b49d43f05323995e419a30807070a0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 23 22:45:35 2016 +0000

    Revert "Forgot to :w in vi(1) before committing. (That was new...)"
    
    This reverts commit e7779bcb29c78088b1b33293fa7cd1672ea63447.

diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
index 9667864..5e411b6 100644
--- a/doc/sphinx/conf.py.in
+++ b/doc/sphinx/conf.py.in
@@ -91,7 +91,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'classic'
+html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/doc/sphinx/phk/farfaraway.rst b/doc/sphinx/phk/farfaraway.rst
index e2e0974..5cc8271 100644
--- a/doc/sphinx/phk/farfaraway.rst
+++ b/doc/sphinx/phk/farfaraway.rst
@@ -70,13 +70,6 @@ might seem that way sometimes.
 
 But as prophylactic for bandwidth troubles, it is second to none.
 
-One of the goals of Varnish was that it should be easy to roll out
-in a crisis situation, start it, repoint your DNS, suffer less,
-tune it a little bit (usually: ignore cookies) and suffer a lot less.
-
-Today was a good sanity-check for me, trying exactly that.
-All in all it worked out pretty well, as the varnishhist above shows.
-
 *phk*
 
 .. [#f1] These `BSTJ articles about the first Atlantic phone cable