diff options
| author | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
| commit | 828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39 (patch) | |
| tree | be692270de956199b4cfb1eda8a9fc24ceb8374e /docs/glossary.rst | |
| parent | 7820b922cc1b87147cc60288dff0bbdfd7b5bc8a (diff) | |
| parent | 148cf5138638ce6b1b92b4e13fe1444df9451e34 (diff) | |
| download | pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.gz pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.bz2 pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.zip | |
Merge branch 'master' into security-docs
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 5a33ff39d..61ba34f45 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -61,8 +61,7 @@ Glossary .. seealso:: - See also `PkgResources - <http://peak.telecommunity.com/DevCenter/PkgResources>`_. + See also `Package Discovery and Resource Access using pkg_resources <https://setuptools.readthedocs.io/en/latest/pkg_resources.html>`_. asset Any file contained within a Python :term:`package` which is *not* @@ -443,7 +442,7 @@ Glossary dispatching and other application configuration tasks. reStructuredText - A `plain text markup format <http://docutils.sourceforge.net/rst.html>`_ + A `plain text markup format <https://docutils.sourceforge.io/rst.html>`_ that is the defacto standard for documenting Python projects. The Pyramid documentation is written in reStructuredText. |