summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-03-16 09:08:04 -0700
committerTres Seaver <tseaver@palladion.com>2013-03-16 09:08:04 -0700
commit2a52b8a60f14a1922331fb736c1181f28cefac2c (patch)
treeaab1bfddc8933003e32172bdc2ad7349faa67f00 /docs
parent13e241b21770a2471d520aa21b27e20f98aaecb3 (diff)
parent44c64f2027a6c32a97d7c52970557f3e1aed9b06 (diff)
downloadpyramid-2a52b8a60f14a1922331fb736c1181f28cefac2c.tar.gz
pyramid-2a52b8a60f14a1922331fb736c1181f28cefac2c.tar.bz2
pyramid-2a52b8a60f14a1922331fb736c1181f28cefac2c.zip
Merge pull request #913 from tshepang/rst
improve description; fix spelling
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index ccff2d7db..40c15efdc 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -403,10 +403,9 @@ Glossary
dispatching and other application configuration tasks.
reStructuredText
- A `plain text format <http://docutils.sourceforge.net/rst.html>`_
- that is the defacto standard for descriptive text shipped in
- :term:`distribution` files, and Python docstrings. This
- documentation is authored in ReStructuredText format.
+ A `plain text markup format <http://docutils.sourceforge.net/rst.html>`_
+ that is the defacto standard for documenting Python projects.
+ The Pyramid documentation is written in reStructuredText.
root
The object at which :term:`traversal` begins when :app:`Pyramid`