diff options
| author | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 23:14:26 -0600 |
| commit | 148cf5138638ce6b1b92b4e13fe1444df9451e34 (patch) | |
| tree | 7b088836b570b401caf510f130f144404cb19ca4 /docs/glossary.rst | |
| parent | cc396692d82441f8142fb14041542ebd2dad6f0a (diff) | |
| parent | b349c2ba948148d2f5441308c6646f624100b364 (diff) | |
| download | pyramid-148cf5138638ce6b1b92b4e13fe1444df9451e34.tar.gz pyramid-148cf5138638ce6b1b92b4e13fe1444df9451e34.tar.bz2 pyramid-148cf5138638ce6b1b92b4e13fe1444df9451e34.zip | |
Merge pull request #3556 from stevepiercy/docs-synch-cookiecutter-pr-71
Update docs to sync with cookiecutter master branch
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. |