Add recent changes from master Bugzilla branch.

diff --git a/docs/TODO b/docs/TODO
index 4e4afd14f16484c05fa1a73fc452ea7c0511118f..25d5e2a7b93870d1c138d6acde762e0b90c7b397 100644 (file)
--- a/docs/TODO
+++ b/docs/TODO
@@ -10,3 +10,7 @@ HTML Output:
 * Auto-highlighter thinks # in "bash#" is a comment char
 * Style definition lists to have the term in bold
 * Fix bug lifecycle image original doc link
+
+Topics to cover:
+
+* email_in.pl

diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst
index 1f031239a818c5fa10752ffcdb8159bd17637edb..9b4704f3f9bd9c1446713ee2601b101a75d9f475 100644 (file)
--- a/docs/en/rst/administering/parameters.rst
+++ b/docs/en/rst/administering/parameters.rst
@@ -638,34 +638,6 @@ globalwatchers
     permissions. It may be useful for sending notifications to a
     mailing-list, for instance.
 
-.. _param-patchviewer:
-
-Patch Viewer
-============
-
-This page contains configuration parameters for the CVS server,
-Bonsai server and LXR server that Bugzilla will use to enable the
-certain features of the Patch Viewer. Bonsai is a tool that enables queries
-to a CVS tree. LXR is a tool that can cross reference and index source
-code.
-
-This page is scheduled to be removed in :bug:`1068494`.
-
-cvsroot
-    The CVS root that most users of your system will be using for 'cvs diff'. Used in Patch Viewer ('Diff' option on patches) to figure out where patches are rooted even if users did the 'cvs diff' from different places in the directory structure. (NOTE: if your CVS repository is remote and requires a password, you must either ensure the Bugzilla user has done a 'cvs login' or specify the password as part of the CVS root.) Leave this blank if you have no CVS repository.
-
-cvsroot_get
-    The CVS root Bugzilla will be using to get patches from. Some installations may want to mirror their CVS repository on the Bugzilla server or even have it on that same server, and thus the repository can be the local file system (and much faster). Make this the same as cvsroot if you don't understand what this is (if cvsroot is blank, make this blank too).
-
-bonsai_url
-    The URL to a Bonsai server containing information about your CVS repository. Patch Viewer will use this information to create links to bonsai's blame for each section of a patch (it will append '/cvsblame.cgi?...' to this url). Leave this blank if you don't understand what this is.
-
-lxr_url
-    The URL to an LXR server that indexes your CVS repository. Patch Viewer will use this information to create links to LXR for each file in a patch. Leave this blank if you don't understand what this is.
-
-lxr_root
-    Some LXR installations do not index the CVS repository from the root -- Mozilla's, for example, starts indexing under mozilla/. This means URLs are relative to that extra path under the root. Enter this if you have a similar situation. Leave it blank if you don't know what this is. 
-
 .. _param-querydefaults:
 
 Query Defaults

diff --git a/docs/en/rst/using/tips.rst b/docs/en/rst/using/tips.rst
index 04d2165ada1e3ac265804d0f6344edba11e42fa4..ef7ce6d4a947910eadd3c1e9a92f739b3759955e 100644 (file)
--- a/docs/en/rst/using/tips.rst
+++ b/docs/en/rst/using/tips.rst
@@ -74,15 +74,15 @@ have more styling than plain text. For example, you may use Markdown for
 making a part of your comment look italic or bold in the generated HTML.
 Bugzilla supports most of the structures defined by
 `standard Markdown <http://daringfireball.net/projects/markdown/basics>`_,
-but does **not** support inline images and inline HTML.
-
-Additionally, three Github Flavored Markdown features are supported.
-
-* `Multiple underscores in words <https://help.github.com/articles/github-flavored-markdown#multiple-underscores-in-words>`_
-
-* `strikethrough <https://help.github.com/articles/github-flavored-markdown#strikethrough>`_
-
-* `fenced code blocks <https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks>`_
+but does **not** support inline images and inline HTML. For a complete
+reference on supported Markdown structures, please see the
+`syntax help <https://bugzilla.mozilla.org/page.cgi?id=markdown.html>`_ link
+next to the Markdown checkbox for new comments.
+
+.. todo:: The above link isn't ideal, but we can't easily link to the user's
+          Bugzilla because the docs aren't always on a Bugzilla (e.g.
+          when they are on ReadTheDocs). Best solution is to port the
+          Markdown guide to ReST.
 
 To use the Markdown feature, make sure that :guilabel:`Enable Markdown
 support for comments` is set to :guilabel:`on`