Merge remote-tracking branch 'upstream/docs-relicensing' into docs-relicensing

git-svn-id: svn://10.0.0.236/trunk@265741 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-12-03 22:40:21 +00:00
parent 81d0ccc2e1
commit f4db9f2a2d
3 changed files with 6 additions and 6 deletions

View File

@ -1 +1 @@
9267
9268

View File

@ -1 +1 @@
48a0dcaa94832f4f2ca998ac8dbca3187a2b5e24
1fab5f6e486fca345ffe5f4b349330210283b3ee

View File

@ -46,7 +46,7 @@ Document Conventions
This document uses the following conventions:
.. warning:: This is a warning - something you should be aware of.
.. warning:: This is a warningsomething you should be aware of.
.. note:: This is just a note, for your information.
@ -68,7 +68,7 @@ This documentation is maintained in
`reStructured Text
<http://docutils.sourceforge.net/docs/user/rst/quickstart.html>`_ format using
the `Sphinx <http://www.sphinx-doc.org/>`_ documentation system. It has
recently been rewritten, so undoubtedly has bugs. Please file any you find, in
recently been rewritten, so it undoubtedly has bugs. Please file any you find, in
the `Bugzilla Documentation
<https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla;component=Documentation>`_
component in Mozilla's installation of Bugzilla. If you also want to make a
@ -83,7 +83,7 @@ License
Bugzilla is `free <http://www.gnu.org/philosophy/free-sw.html>`_ and
`open source <http://opensource.org/osd>`_ software, which means (among other
things) that you can download it, install it and run it for any purpose
things) that you can download it, install it, and run it for any purpose
whatsoever without the need for license or payment. Isn't that refreshing?
Bugzilla's code is made available under the