Merge tag 'upstream/7.6.0'

Upstream version 7.6.0

1 files changed, 75 insertions, 0 deletions

diff --git a/docs/support.rst b/docs/support.rst
new file mode 100644
index 0000000..0d4fc3a
--- /dev/null
+++ b/docs/support.rst
@@ -0,0 +1,75 @@
+.. title: Support and Contact
+.. slug: contact
+.. date: 1970-01-01 15:00:00
+.. description: Get help using Nikola, or contact us.
+
+:Version: 7.5.1
+
+.. class:: alert alert-info pull-right
+
+.. contents::
+
+Help and Support
+================
+
+1. A `mailing list`_, nikola-discuss on Google Groups exists.
+2. There is an IRC channel, #nikola on Freenode.  You can find many
+   developers and volunteers (users) there which are there to provide
+   help, if they are around and read your message.
+3. You can also contact `@GetNikola <http://twitter.com/GetNikola>`_ on
+   Twitter.
+4. If you are experiencing a bug, [1]_ you should report it on GitHub (see
+   below).
+
+Plugins and Themes
+------------------
+
+Plugins and Themes from the Indexes are not officially supported.
+
+1. Ask the `mailing list`_, which may or may not work out.
+2. You can also try the IRC channel if the theme/plugin is very popular.
+3. Report an issue at the `plugins issue tracker`_ or at the `themes
+   issue tracker`_.
+4. Contact the author of the plugin/theme.  The name of the author of a
+   plugin is available in the ``.plugin`` and ``.py`` files.  Tracking
+   down theme authors can be much harder due to how our architecture
+   works (but certainly is doable).
+
+Report a Bug, Request a Feature
+===============================
+
+Bug reports should be sent to the `Issue tracker`_ at GitHub.
+
+Feature requests should be sent to the or to the `Issue tracker`_ or to
+the `mailing list`_, especially if they require further discussion.
+
+Administrativia
+===============
+
+If you are in need of getting administrativia [2]_ resolved, you may want
+to e-mail info@getnikola.com and therefore contact the people behind the
+project.  Note that this email **may not** be used for support matters.
+Messages are forwarded to all three administrators, the names and
+personal addresses (if you need to contact them personally) of you can
+find below.
+
+Administrators
+--------------
+
++----------------+-----------------+-----------+-----------------------+
+| Name           | GitHub Nickname | Location  | E-mail                |
++================+=================+===========+=======================+
+| Roberto Alsina | ralsina         | Argentina | roberto@getnikola.com |
++----------------+-----------------+-----------+-----------------------+
+| Damián Avila   | damianavila     | Argentina | damian@getnikola.com  |
++----------------+-----------------+-----------+-----------------------+
+| Chris Warrick  | Kwpolska        | Poland    | chris@getnikola.com   |
++----------------+-----------------+-----------+-----------------------+
+
+.. [1] `As defined on Wikipedia. <http://en.wikipedia.org/wiki/Software_bug>`_
+.. [2] `administrative matters <http://en.wiktionary.org/wiki/administrativia>`_
+
+.. _mailing list: http://groups.google.com/group/nikola-discuss
+.. _Issue tracker: https://github.com/getnikola/nikola/issues
+.. _plugins issue tracker: https://github.com/getnikola/plugins/issues
+.. _themes issue tracker: https://github.com/getnikola/nikola-themes/issues