summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2018-10-14 21:03:15 -0500
committerGitHub <noreply@github.com>2018-10-14 21:03:15 -0500
commit433efe06191a7007ca8c5bf8fafee5c7c1439ebb (patch)
tree6765f2177ba5fd0352380db05548d1171517d08e /docs/glossary.rst
parentd8a08302f3b38da8a5d9b854afbe346d84c534c2 (diff)
parent364bd7dfef2c6599b126671784b23f9fb7fa6dea (diff)
downloadpyramid-433efe06191a7007ca8c5bf8fafee5c7c1439ebb.tar.gz
pyramid-433efe06191a7007ca8c5bf8fafee5c7c1439ebb.tar.bz2
pyramid-433efe06191a7007ca8c5bf8fafee5c7c1439ebb.zip
Merge pull request #3326 from mmerickel/fix-deprecated-accept-predicate
Overhaul HTTP Accept (mime type) handling in Pyramid
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index aef0263a8..c14729fc4 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1209,3 +1209,9 @@ Glossary
Alembic
`Alembic <http://alembic.zzzcomputing.com/en/latest/>`_ is a lightweight database migration tool for usage with the SQLAlchemy Database Toolkit for Python.
+
+ media type
+ A label representing the type of some content.
+ A media type is a nested structure containing a top-level type and a subtype.
+ Optionally, a media type can also contain parameters specific to the type.
+ See :rfc:`6838` for more information about media types.