diff options
| author | Min ho Kim <minho42@gmail.com> | 2019-07-27 01:11:04 +1000 |
|---|---|---|
| committer | Min ho Kim <minho42@gmail.com> | 2019-07-27 01:11:04 +1000 |
| commit | a85a83b631ac6ff8653a9c35cd089c7889753ea3 (patch) | |
| tree | 0321399b4b04efdc1f6031af25d8c056fd4724d9 /docs | |
| parent | d32e4775e6da03720a9d3b239efeec956101e954 (diff) | |
| download | pyramid-a85a83b631ac6ff8653a9c35cd089c7889753ea3.tar.gz pyramid-a85a83b631ac6ff8653a9c35cd089c7889753ea3.tar.bz2 pyramid-a85a83b631ac6ff8653a9c35cd089c7889753ea3.zip | |
Fix typos
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/designdefense.rst | 2 | ||||
| -rw-r--r-- | docs/narr/advanced-features.rst | 4 | ||||
| -rw-r--r-- | docs/narr/commandline.rst | 2 | ||||
| -rw-r--r-- | docs/narr/hooks.rst | 4 | ||||
| -rw-r--r-- | docs/narr/hybrid.rst | 2 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 2 | ||||
| -rw-r--r-- | docs/narr/security.rst | 2 | ||||
| -rw-r--r-- | docs/narr/upgrading.rst | 2 | ||||
| -rw-r--r-- | docs/narr/viewconfig.rst | 2 | ||||
| -rw-r--r-- | docs/quick_tour.rst | 2 | ||||
| -rw-r--r-- | docs/whatsnew-1.2.rst | 2 | ||||
| -rw-r--r-- | docs/whatsnew-1.5.rst | 6 |
12 files changed, 16 insertions, 16 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst index 566ad1f5e..e02949ce5 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -988,7 +988,7 @@ the following: traverses by registering one or more adapters. As a result of being able to either replace the larger component entirely or turn knobs on the default implementation of the larger component, no one understands when (or - whether) they should ever override the larger component entrirely. This + whether) they should ever override the larger component entirely. This results, over time, in a rusting together of the larger "replaceable" component and the framework itself because people come to depend on the availability of the default component in order just to turn its knobs. The diff --git a/docs/narr/advanced-features.rst b/docs/narr/advanced-features.rst index b169aad95..b24208bc4 100644 --- a/docs/narr/advanced-features.rst +++ b/docs/narr/advanced-features.rst @@ -84,7 +84,7 @@ Speaking of the :app:`Pyramid` structured :meth:`~pyramid.config.Configurator.in If you need, you can extend or override the configuration of an existing application by including its configuration in your own and then modifying it. -For example, if you want to reuse an existing application that already has a bunch of routes, you can just use the ``include`` statement with a ``route_prefix``. All the routes of that application will be availabe, prefixed as you requested: +For example, if you want to reuse an existing application that already has a bunch of routes, you can just use the ``include`` statement with a ``route_prefix``. All the routes of that application will be available, prefixed as you requested: .. code-block:: python :linenos: @@ -115,7 +115,7 @@ In addition, the system that handles authentication and authorization is flexibl Build Trees of Resources ------------------------ -:app:`Pyramid` supports :term:`traversal`, a way of mapping URLs to a concrete :term:`resource tree`. If your application naturally consists of an arbitrary heirarchy of different types of content (like a CMS or a Document Management System), traversal is for you. If you have a requirement for a highly granular security model ("Jane can edit documents in *this* folder, but not *that* one"), traversal can be a powerful approach. +:app:`Pyramid` supports :term:`traversal`, a way of mapping URLs to a concrete :term:`resource tree`. If your application naturally consists of an arbitrary hierarchy of different types of content (like a CMS or a Document Management System), traversal is for you. If you have a requirement for a highly granular security model ("Jane can edit documents in *this* folder, but not *that* one"), traversal can be a powerful approach. .. seealso:: diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index 21b2a0839..0c5189903 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -452,7 +452,7 @@ For example: route_and_view_attached / app1.standard_views.route_and_view_attached * method_conflicts /conflicts app1.standard_conflicts <route mismatch> multiview /multiview app1.standard_views.multiview GET,PATCH - not_post /not_post app1.standard_views.multview !POST,* + not_post /not_post app1.standard_views.multiview !POST,* ``proutes`` generates a table with four columns: *Name*, *Pattern*, *View*, and *Method*. The items listed in the Name column are route names, the items diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index 3c02c2653..1ca5c3a6d 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -1335,7 +1335,7 @@ Specifying neither ``over`` nor ``under`` is equivalent to specifying If all options for ``under`` (or ``over``) cannot be found in the current configuration, it is an error. If some options are specified purely for -compatibilty with other tweens, just add a fallback of ``MAIN`` or ``INGRESS``. +compatibility with other tweens, just add a fallback of ``MAIN`` or ``INGRESS``. For example, ``under=('someothertween', 'someothertween2', INGRESS)``. This constraint will require the tween to be located under the ``someothertween`` tween, the ``someothertween2`` tween, and ``INGRESS``. If any of these is not @@ -1412,7 +1412,7 @@ time. Displaying Tween Ordering ~~~~~~~~~~~~~~~~~~~~~~~~~ -The ``ptweens`` command-line utility can be used to report the current implict +The ``ptweens`` command-line utility can be used to report the current implicit and explicit tween chains used by an application. See :ref:`displaying_tweens`. diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst index 1238601ed..58c3e82e8 100644 --- a/docs/narr/hybrid.rst +++ b/docs/narr/hybrid.rst @@ -495,7 +495,7 @@ the above call to ``request.resource_path`` would generate ``/mysection/``. See :ref:`virtual_root_support` for more information. If the route you're trying to use needs simple dynamic part values to be filled -in to succesfully generate the URL, you can pass these as the ``route_kw`` +in to successfully generate the URL, you can pass these as the ``route_kw`` argument to ``resource_url`` and ``resource_path``. For example, assuming that the route definition is like so: diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 41a5638e3..b32013931 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -245,7 +245,7 @@ When you use a :term:`renderer` with your view callable, you are freed from need .. index:: pair: renderer; explicitly calling - pair: view renderer; explictly calling + pair: view renderer; explicitly calling .. _example_render_to_response_call: diff --git a/docs/narr/security.rst b/docs/narr/security.rst index 6b6f9a1f1..94469ba48 100644 --- a/docs/narr/security.rst +++ b/docs/narr/security.rst @@ -772,7 +772,7 @@ Preventing Cross-Site Request Forgery Attacks `Cross-site request forgery <https://en.wikipedia.org/wiki/Cross-site_request_forgery>`_ attacks are a -phenomenon whereby a user who is logged in to your website might inadvertantly +phenomenon whereby a user who is logged in to your website might inadvertently load a URL because it is linked from, or embedded in, an attacker's website. If the URL is one that may modify or delete data, the consequences can be dire. diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst index 87e4647c3..af552741c 100644 --- a/docs/narr/upgrading.rst +++ b/docs/narr/upgrading.rst @@ -103,7 +103,7 @@ a newer Pyramid release is always to read the :ref:`changelog` to find the deprecations and removals for each release between the release you're currently running and the one to which you wish to upgrade. The change history notes every deprecation within a ``Deprecation`` section and every removal within a -``Backwards Incompatibilies`` section for each release. +``Backwards Incompatibilities`` section for each release. The change history often contains instructions for changing your code to avoid deprecation warnings and how to change docs-deprecated spellings to newer ones. diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index da2c41409..465477b4d 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -196,7 +196,7 @@ Non-Predicate Arguments ``require_csrf`` CSRF checks will affect any request method that is not defined as a "safe" - method by RFC2616. In pratice this means that GET, HEAD, OPTIONS, and TRACE + method by RFC2616. In practice this means that GET, HEAD, OPTIONS, and TRACE methods will pass untouched and all others methods will require CSRF. This option is used in combination with the ``pyramid.require_default_csrf`` setting to control which request parameters are checked for CSRF tokens. diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index 471820ef6..1726b85a1 100644 --- a/docs/quick_tour.rst +++ b/docs/quick_tour.rst @@ -95,7 +95,7 @@ explanation: As shown in this example, the :term:`configurator` plays a central role in Pyramid development. Building an application from loosely-coupled parts via :doc:`../narr/configuration` is a central idea in Pyramid, one that we will -revisit regurlarly in this *Quick Tour*. +revisit regularly in this *Quick Tour*. .. seealso:: See also: :ref:`Quick Tutorial Hello World <qtut_hello_world>`, diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst index 8572f04f5..8b1943822 100644 --- a/docs/whatsnew-1.2.rst +++ b/docs/whatsnew-1.2.rst @@ -232,7 +232,7 @@ Backwards Incompatibilities config.add_view('my.pkg.someview', route_name='foo') This won't effect "normal" users, only people who have legacy BFG codebases - that used an autommitting configurator and possibly tests that use the + that used an autocommitting configurator and possibly tests that use the configurator API (the configurator returned by :func:`pyramid.testing.setUp` is an autocommitting configurator). The right way to get around this is to use a default non-autocommitting diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst index a477ce5ec..753dfd355 100644 --- a/docs/whatsnew-1.5.rst +++ b/docs/whatsnew-1.5.rst @@ -276,7 +276,7 @@ The feature additions in Pyramid 1.5 follow. - You can now generate "hybrid" urldispatch/traversal URLs more easily by using the new ``route_name``, ``route_kw`` and ``route_remainder_name`` arguments to :meth:`~pyramid.request.Request.resource_url` and - :meth:`~pyuramid.request.Request.resource_path`. See + :meth:`~pyramid.request.Request.resource_path`. See :ref:`generating_hybrid_urls`. - A new http exception superclass named @@ -371,7 +371,7 @@ The feature additions in Pyramid 1.5 follow. Other Backwards Incompatibilities --------------------------------- -- Modified the :meth:`~pyramid.request.Reuqest.current_route_url` method. The +- Modified the :meth:`~pyramid.request.Request.current_route_url` method. The method previously returned the URL without the query string by default, it now does attach the query string unless it is overriden. @@ -441,7 +441,7 @@ Other Backwards Incompatibilities since Pyramid 1.1. Use methods of ``request.environ`` (a real dictionary) instead. -- Removed ancient backwards compatibily hack in +- Removed ancient backwards compatibility hack in ``pyramid.traversal.DefaultRootFactory`` which populated the ``__dict__`` of the factory with the matchdict values for compatibility with BFG 0.9. |
