diff options
| author | Michael Merickel <michael@merickel.org> | 2018-09-27 21:53:03 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-09-27 21:53:03 -0500 |
| commit | f081ae991a9107363fceeeeccd361c2f85bdd046 (patch) | |
| tree | 85dc0cae8faffbf77bd539c4558e0126b9af79cd | |
| parent | c3c83eb71ff3352cee754b404ad4d65ab02fa464 (diff) | |
| download | pyramid-f081ae991a9107363fceeeeccd361c2f85bdd046.tar.gz pyramid-f081ae991a9107363fceeeeccd361c2f85bdd046.tar.bz2 pyramid-f081ae991a9107363fceeeeccd361c2f85bdd046.zip | |
fix docs
| -rw-r--r-- | docs/narr/viewconfig.rst | 9 | ||||
| -rw-r--r-- | pyramid/config/views.py | 4 | ||||
| -rw-r--r-- | pyramid/util.py | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index cd49d6e94..7e6617b78 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -352,7 +352,7 @@ configured view. If ``accept`` is not specified, the ``HTTP_ACCEPT`` HTTP header is not taken into consideration when deciding whether or not to invoke the associated view callable. - See :ref:`accept_content_negotation` for more information. + See :ref:`accept_content_negotiation` for more information. .. versionchanged:: 1.10 Media ranges such as ``text/*`` will now raise :class:`pyramid.exceptions.ConfigurationError`. @@ -1028,9 +1028,9 @@ these values. .. index:: single: Accept - single: Accept content negotation + single: Accept content negotiation -.. _accept_content_negotation: +.. _accept_content_negotiation: Accept Header Content Negotiation --------------------------------- @@ -1084,6 +1084,9 @@ For example: In this case, the ``application/json`` view should always be selected in cases where it is otherwise ambiguous. +.. index:: + single: default accept ordering + .. _default_accept_ordering: Default Accept Ordering diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 45a89e5fb..e40a851ff 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -687,7 +687,7 @@ class ViewsConfiguratorMixin(object): not taken into consideration when deciding whether or not to invoke the associated view callable. - See :ref:`accept_content_negotation` for more information. + See :ref:`accept_content_negotiation` for more information. path_info @@ -1262,7 +1262,7 @@ class ViewsConfiguratorMixin(object): ``weighs_more_than`` and ``weighs_less_than`` control the ordering of media types. Each value may be a string or a list of strings. - See :ref:`accept_content_negotation` for more information. + See :ref:`accept_content_negotiation` for more information. .. versionadded:: 1.10 diff --git a/pyramid/util.py b/pyramid/util.py index 677880794..708931eea 100644 --- a/pyramid/util.py +++ b/pyramid/util.py @@ -665,10 +665,8 @@ def sort_accept_offers(offers, order=None): - ``*/*`` :param offers: A list of offers to be sorted. - :param order: A weighted list of offer where items closer to the start of + :param order: A weighted list of offers where items closer to the start of the list will be a preferred over items closer to the end. - :param is_order_parsed: If the list of orders is pre-parsed then do not - parse it again. :return: A list of offers sorted first by specificity (higher to lower) then by ``order``. |