[master] c9b9c6bf8 Ditch references to the old trac/wiki

Tue Apr 9 20:11:07 UTC 2019

commit c9b9c6bf8752dc3685a4b7fcfbfd1260699878e1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Apr 9 20:09:54 2019 +0000

    Ditch references to the old trac/wiki

diff --git a/doc/sphinx/installation/help.rst b/doc/sphinx/installation/help.rst
index ba6dbd865..47f2dfe52 100644
--- a/doc/sphinx/installation/help.rst
+++ b/doc/sphinx/installation/help.rst
@@ -6,9 +6,11 @@ Getting hold of the gang behind Varnish is pretty straight forward,
 we try to help out as much as time permits and have tried to streamline
 this process as much as possible.
 
-But before you grab hold of us, spend a moment composing your thoughts and
-formulate your question. From our perspective there is nothing as pointless as simply telling
-us "Varnish does not work for me" with no further information. This does not give us any relevant information to use when trying to figure out whats wrong.
+But before you grab hold of us, spend a moment composing your
+thoughts and formulate your question. From our perspective there
+is nothing as pointless as simply telling us "Varnish does not work
+for me" with no further information. This does not give us any
+relevant information to use when trying to figure out whats wrong.
 
 And before you even do that, do a couple of searches to see if your
 question is already answered, if it has been, you will get your answer
@@ -33,7 +35,7 @@ families and jobs to deal with also.
 You are more than welcome to just hang out, and while we don't mind
 the occasional intrusion from the real world into our flow, we try and keep
 it mostly on topic, and please don't paste random links unless they are
-*really* spectacular and intelligent.
+*really* funny, spectacular and intelligent.
 
 Mailing Lists
 =============
@@ -46,7 +48,6 @@ people spend some time getting Varnish running, and then more or less
 forget about it. Therefore the announce list is a good way to be
 reminded about new releases, bugs or potential (security) vulnerabilities.
 
-
 The `varnish-misc` mailing list is for general banter, questions,
 suggestions, ideas and so on.  If you are new to Varnish it may pay
 off to subscribe to it, simply to have an ear to the telegraph-pole
@@ -59,46 +60,32 @@ thread changes, please change the subject to match, some of us deal
 with hundreds of emails per day, after spam-filters, and we need all
 the help we can get to pick the interesting ones.
 
-
 The `varnish-dev` mailing list is used by the developers and is
-usually quite focused on source-code and such. Everybody on
-the `-dev` list is also on `-misc`, so cross-posting only serves to annoy
-those people.
-
-We also maintain a community wiki_ for Varnish, there you will find information on planned events, meetings, current backlog, trouble tickets ,  and links to resources and documentation.
-
-.. XXX: we should introduce the wiki (if we care about it) before
-.. we start referring to it (below). Make a wiki chapter?
+usually quite focused on source-code and such. Everybody on the
+`-dev` list is also on `-misc`, so cross-posting only serves to
+annoy those people.
 
 Trouble Tickets
 ===============
 
-Please do not open a trouble ticket, unless you have spotted an actual
-bug in Varnish.  Ask on IRC first if you are in doubt.
+Our bugtracker lives on Github, but please do not open a trouble
+ticket, unless you have spotted an actual bug in Varnish.  Ask on
+IRC first if you are in doubt.
 
 The reason for this policy, is to avoid bugs being drowned in a
-pile of other `issues`, feature suggestions for future releases, and double postings of calls for help
-from people who forgot to check back on already opened Tickets.
+pile of other `issues`, feature suggestions for future releases,
+and double postings of calls for help from people who forgot to
+check back on already opened Tickets.
 
-.. XXX: Not sure what you want with the last sentence above. benc
+New ideas may get parked in our Github wiki, until we have time
+for them, or until we have thought out a good design.
 
-We instead track suggestions and feature ideas in our `"Future_Feature" wiki page`_,
-and through user support via email and IRC.
 
 Commercial Support
 ==================
 
-The following companies offer commercial Varnish support, and are listed
-here for your convenience.  If you want your company listed here, drop
-an email to phk at FreeBSD.org.
-
-	Varnish Software
-	sales at varnish-software.com
-
-	UPLEX
-	info at uplex.de
+If you need commercial support, there are companies which offer that
+and you can find a `list on our homepage. <http://varnish-cache.org/business/>`_.
 
 .. _mailman: https://www.varnish-cache.org/lists/mailman/listinfo
 .. _pastebin: https://gist.github.com/
-.. _"Future_Feature" wiki page: https://www.varnish-cache.org/trac/wiki/Future_Feature
-.. _wiki: https://www.varnish-cache.org/trac
diff --git a/doc/sphinx/tutorial/introduction.rst b/doc/sphinx/tutorial/introduction.rst
index 99862cc0e..237ff1c12 100644
--- a/doc/sphinx/tutorial/introduction.rst
+++ b/doc/sphinx/tutorial/introduction.rst
@@ -53,28 +53,3 @@ Varnish is written to run on modern versions of Linux and FreeBSD and the
 best experience is had on those platforms. Thanks to our contributors
 it also runs on NetBSD, OpenBSD, OS X and various Solaris-descendants
 like Oracle Solaris, OmniOS and SmartOS.
-
-About the Varnish development process
--------------------------------------
-
-Varnish is a community driven project. The development is overseen by
-the Varnish Governing Board which currently consists of Poul-Henning Kamp
-(Architect), Rogier Mulhuijzen (Fastly) and Lasse Karstensen (Independent).
-
-Please see https://www.varnish-cache.org/trac/wiki/Contributing as a
-starting point if you would like to contribute to Varnish.
-
-Getting in touch
-----------------
-
-You can get in touch with us through many channels. For real time chat
-you can reach us on IRC through the server irc.linpro.net on the #varnish
-and #varnish-hacking channels.
-There are two mailing lists available: one for user questions and one
-for development discussions. See https://www.varnish-cache.org/lists
-for information and signup.  There is also a web forum on the same site.
-
-Now that you have a vague idea on what Varnish Cache is, let's see if we
-can get it up and running.
-
-.. XXX:The above three paragraphs are repetitive this is already handled in previous chapters. The only new information is Governing Board which could be moved to the introduction and the paragraphs scrapped. benc
diff --git a/doc/sphinx/users-guide/increasing-your-hitrate.rst b/doc/sphinx/users-guide/increasing-your-hitrate.rst
index 80eec9fdb..94e1bdbad 100644
--- a/doc/sphinx/users-guide/increasing-your-hitrate.rst
+++ b/doc/sphinx/users-guide/increasing-your-hitrate.rst
@@ -41,9 +41,6 @@ requests coming from the client matching `/foo/bar`.
 For more information on how :ref:`varnishlog(1)` works please see
 :ref:`users-guide-logging` or then man page.
 
-For extended diagnostics headers, see
-https://www.varnish-cache.org/trac/wiki/VCLExampleHitMissHeader
-
 
 Tool: lwp-request
 ~~~~~~~~~~~~~~~~~
