summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-08-08 00:31:24 -0500
committerMichael Merickel <michael@merickel.org>2018-08-28 02:35:58 -0500
commit121f45b82f2722c0d5e5c5a7b768270299793eeb (patch)
tree1f37d15fa9a2fd1f0002f6c36b73ff2d5e2f1c0b /docs/glossary.rst
parentdf62d60c3da241288cc9c9f1e93acae8e46de39c (diff)
downloadpyramid-121f45b82f2722c0d5e5c5a7b768270299793eeb.tar.gz
pyramid-121f45b82f2722c0d5e5c5a7b768270299793eeb.tar.bz2
pyramid-121f45b82f2722c0d5e5c5a7b768270299793eeb.zip
fix deprecated usage of request.accept in AcceptPredicate
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 b05344ae9..7244aeb8d 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.