[master] 98a172d Final spit&polish before release

[Poul-Henning Kamp]

commit 98a172de8b7113a6746a2dcdf2fe7cfacf1c19ed
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Sep 15 07:47:39 2016 +0000

    Final spit&polish before release

diff --git a/CONTRIBUTING b/CONTRIBUTING
index d76eecb..fdc94d6 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1,21 +1,29 @@
 Contributing to Varnish Cache
 =============================
 
-To contribute to Varnish, read
-https://www.varnish-cache.org/trac/wiki/Contributing as a starting
-point and follow relevant parts linked there.
-
 Official development tree is here:
 
     https://github.com/varnishcache/varnish-cache
 
-Patches can be sent to varnish-dev at varnish-cache.org.
+These days we prefer patches as pull requests directly to that tree.
+
+Bugreports go there too.
+
+Our main project communication is through or developer IRC channel::
+
+	#varnish-hacking on server irc.linpro.no
+
+(That channel is not for user questions, use the #varnish channel for that.)
+
+Mondays at 13:00 EU time we hold our weekly "bugwash" where we go
+through new (and old) tickets.  It speeds things up a lot if you
+can be join the channel and answer questions directly when we go
+over the ticket.
 
 Github pull requests
 --------------------
 
 Pull requests are handled like other tickets.
 
-Trivial pull requests (fix typos, etc) are welcomed, but they will be commited
+Trivial pull requests (fix typos, etc) are welcomed, but they may be commited
 by a core team member and the author credited in the commit message.
-
diff --git a/LICENSE b/LICENSE
index 67dc00a..1fc73b8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2014 Varnish Software AS
+Copyright (c) 2006-2016 Varnish Software AS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.Packaging b/README.Packaging
index 6663f88..baccc17 100644
--- a/README.Packaging
+++ b/README.Packaging
@@ -24,4 +24,4 @@ Third-party packages
 --------------------
 
 Varnish Cache is built and packaged in many different operating systems and
-distributions. Please see the wiki for more information.
+distributions. Please see http://varnish-cache.org for more information.
diff --git a/README.rst b/README.rst
index 309edc9..966da29 100644
--- a/README.rst
+++ b/README.rst
@@ -7,9 +7,9 @@ Documentation and additional information about Varnish is available on
 https://www.varnish-cache.org/
 
 Technical questions about Varnish and this release should be addressed
-to <varnish-misc at varnish-cache.org>.  Please see
-https://www.varnish-cache.org/trac/wiki/Contributing for how to
-contribute patches and report bugs.
+to <varnish-misc at varnish-cache.org>.
+
+Please see CONTRIBUTING for how to contribute patches and report bugs.
 
 Questions about commercial support and services related to Varnish
 should be addressed to <sales at varnish-software.com>.