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:
parent
81d0ccc2e1
commit
f4db9f2a2d
@ -1 +1 @@
|
|||||||
9267
|
9268
|
||||||
@ -1 +1 @@
|
|||||||
48a0dcaa94832f4f2ca998ac8dbca3187a2b5e24
|
1fab5f6e486fca345ffe5f4b349330210283b3ee
|
||||||
@ -46,7 +46,7 @@ Document Conventions
|
|||||||
|
|
||||||
This document uses the following conventions:
|
This document uses the following conventions:
|
||||||
|
|
||||||
.. warning:: This is a warning - something you should be aware of.
|
.. warning:: This is a warning—something you should be aware of.
|
||||||
|
|
||||||
.. note:: This is just a note, for your information.
|
.. note:: This is just a note, for your information.
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ This documentation is maintained in
|
|||||||
`reStructured Text
|
`reStructured Text
|
||||||
<http://docutils.sourceforge.net/docs/user/rst/quickstart.html>`_ format using
|
<http://docutils.sourceforge.net/docs/user/rst/quickstart.html>`_ format using
|
||||||
the `Sphinx <http://www.sphinx-doc.org/>`_ documentation system. It has
|
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
|
the `Bugzilla Documentation
|
||||||
<https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla;component=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
|
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
|
Bugzilla is `free <http://www.gnu.org/philosophy/free-sw.html>`_ and
|
||||||
`open source <http://opensource.org/osd>`_ software, which means (among other
|
`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?
|
whatsoever without the need for license or payment. Isn't that refreshing?
|
||||||
|
|
||||||
Bugzilla's code is made available under the
|
Bugzilla's code is made available under the
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user