diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/view.rst | 3 | ||||
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | docs/copyright.rst | 4 | ||||
| -rw-r--r-- | docs/designdefense.rst | 10 | ||||
| -rw-r--r-- | docs/glossary.rst | 20 | ||||
| -rw-r--r-- | docs/index.rst | 4 | ||||
| -rw-r--r-- | docs/narr/advanced-features.rst | 4 | ||||
| -rw-r--r-- | docs/narr/commandline.rst | 2 | ||||
| -rw-r--r-- | docs/narr/firstapp.rst | 4 | ||||
| -rw-r--r-- | docs/narr/hooks.rst | 4 | ||||
| -rw-r--r-- | docs/narr/hybrid.rst | 2 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 8 | ||||
| -rw-r--r-- | docs/narr/renderers.rst | 4 | ||||
| -rw-r--r-- | docs/narr/security.rst | 6 | ||||
| -rw-r--r-- | docs/narr/templates.rst | 2 | ||||
| -rw-r--r-- | docs/narr/testing.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 | 6 | ||||
| -rw-r--r-- | docs/quick_tutorial/jinja2.rst | 2 | ||||
| -rw-r--r-- | docs/quick_tutorial/routing.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/definingviews.rst | 2 | ||||
| -rw-r--r-- | docs/whatsnew-1.2.rst | 2 | ||||
| -rw-r--r-- | docs/whatsnew-1.5.rst | 6 |
24 files changed, 53 insertions, 51 deletions
diff --git a/docs/api/view.rst b/docs/api/view.rst index e41212012..fe4b80acb 100644 --- a/docs/api/view.rst +++ b/docs/api/view.rst @@ -14,8 +14,7 @@ .. autoclass:: view_config :members: - .. autoclass:: view_defaults - :members: + .. autofunction:: view_defaults .. autoclass:: notfound_view_config :members: diff --git a/docs/conf.py b/docs/conf.py index 8fdebf53d..9f2b56225 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -448,4 +448,5 @@ epub_tocdepth = 3 linkcheck_ignore = [ r'http://localhost:\d+', r'http://localhost', + r'https://webchat.freenode.net/#pyramid', # JavaScript "anchor" ] diff --git a/docs/copyright.rst b/docs/copyright.rst index 3631fe5a3..c021d5db5 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -30,7 +30,7 @@ similar license to this one. Creative Commons Attribution-Nonconmmercial-Share Alike 3.0 United States License, the :app:`Pyramid` *software* is offered under a `less restrictive (BSD-like) license - <http://repoze.org/license.html>`_ . + <https://web.archive.org/web/20190401024809/http://repoze.org/license.html>`_ . All terms mentioned in this book that are known to be trademarks or service marks have been appropriately capitalized. However, use of a @@ -80,7 +80,7 @@ Print Production ---------------- The print version of this book was produced using the `Sphinx -<http://www.sphinx-doc.org/en/master/>`_ documentation generation system and +<https://www.sphinx-doc.org/en/master/>`_ documentation generation system and the `LaTeX <https://www.latex-project.org/>`_ typesetting system. Contacting The Publisher diff --git a/docs/designdefense.rst b/docs/designdefense.rst index 566ad1f5e..967a1aaed 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 @@ -1006,12 +1006,12 @@ Microframeworks have smaller Hello World programs ------------------------------------------------- Self-described "microframeworks" exist. `Bottle -<http://bottlepy.org/docs/dev/index.html>`_ and `Flask -<http://flask.pocoo.org/>`_ are two that are becoming popular. `Bobo +<https://bottlepy.org/docs/dev/>`_ and `Flask +<https://palletsprojects.com/p/flask/>`_ are two that are becoming popular. `Bobo <https://bobo.readthedocs.io/en/latest/>`_ doesn't describe itself as a microframework, but its intended user base is much the same. Many others exist. We've even (only as a teaching tool, not as any sort of official project) -`created one using Pyramid <http://static.repoze.org/casts/videotags.html>`_. +`created one using Pyramid <https://web.archive.org/web/20190118040819/http://static.repoze.org/casts/videotags.html>`_. The videos use BFG, a precursor to Pyramid, but the resulting code is `available for Pyramid too <https://github.com/Pylons/groundhog>`_). Microframeworks are small frameworks with one common feature: each allows its @@ -1657,7 +1657,7 @@ Pyramid has over 1200 pages of documentation (printed), covering topics from the very basic to the most advanced. *Nothing* is left undocumented, quite literally. It also has an *awesome*, very helpful community. Visit the `#pyramid IRC channel on freenode.net -<https://webchat.freenode.net/?channels=pyramid>`_ and see. +<https://webchat.freenode.net/#pyramid>`_ and see. Hate Zope +++++++++ diff --git a/docs/glossary.rst b/docs/glossary.rst index 36272f08c..2d2595592 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -38,9 +38,9 @@ Glossary "Repoze" is essentially a "brand" of software developed by `Agendaless Consulting <https://agendaless.com>`_ and a set of contributors. The term has no special intrinsic meaning. The project's `website - <http://repoze.org>`_ has more information. The software developed + <https://web.archive.org/web/20190127155548/http://repoze.org/>`_ has more information. The software developed "under the brand" is available in a `Subversion repository - <http://svn.repoze.org>`_. Pyramid was originally known as + <https://web.archive.org/web/20190103024221/http://svn.repoze.org/>`_. Pyramid was originally known as :mod:`repoze.bfg`. Setuptools @@ -352,7 +352,7 @@ Glossary server, a WSGI application, with a set of :term:`middleware` in-between. Zope - `The Z Object Publishing Framework <http://www.zope.org/en/latest/>`_, a + `The Z Object Publishing Framework <https://www.zope.org/>`_, a full-featured Python web framework. Grok @@ -397,12 +397,12 @@ Glossary the box in ZPT and text flavors. ZPT - The `Zope Page Template <https://zope.readthedocs.io/en/latest/zope2book/ZPT.html>`_ + The `Zope Page Template <https://zope.readthedocs.io/en/latest/zopebook/ZPT.html>`_ templating language. METAL `Macro Expansion for TAL - <https://zope.readthedocs.io/en/latest/zope2book/AppendixC.html#metal-overview>`_, a + <https://zope.readthedocs.io/en/latest/zopebook/AppendixC.html#metal-overview>`_, a part of :term:`ZPT` which makes it possible to share common look and feel between templates. @@ -411,7 +411,7 @@ Glossary by Christopher Lenz. Jinja2 - A `text templating language <http://jinja.pocoo.org/>`_ by Armin Ronacher. + A `text templating language <https://palletsprojects.com/p/jinja/>`_ by Armin Ronacher. Routes A `system by Ben Bangert <https://routes.readthedocs.io/en/latest/>`_ @@ -503,13 +503,13 @@ Glossary repoze.lemonade Zope2 CMF-like `data structures and helper facilities - <http://docs.repoze.org/lemonade>`_ for CA-and-ZODB-based + <https://web.archive.org/web/20180903140246/http://docs.repoze.org/lemonade/>`_ for CA-and-ZODB-based applications useful within :app:`Pyramid` applications. repoze.catalog An indexing and search facility (fielded and full-text) based on `zope.index <https://pypi.org/project/zope.index/>`_. See `the - documentation <http://docs.repoze.org/catalog>`_ for more + documentation <https://web.archive.org/web/20181214215757/http://docs.repoze.org/catalog/>`_ for more information. repoze.who @@ -519,7 +519,7 @@ Glossary repoze.workflow `Barebones workflow for Python apps - <http://docs.repoze.org/workflow>`_ . It can be used by + <https://web.archive.org/web/20181117003329/http://docs.repoze.org/workflow/>`_ . It can be used by :app:`Pyramid` to form a workflow system. virtual root @@ -732,7 +732,7 @@ Glossary See also `Agendaless Consulting <https://agendaless.com>`_. Jython - A `Python implementation <http://www.jython.org/>`_ written for + A `Python implementation <https://www.jython.org/>`_ written for the Java Virtual Machine. Python diff --git a/docs/index.rst b/docs/index.rst index 13ece925a..c1f6db81a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,7 +6,7 @@ The Pyramid Web Framework :app:`Pyramid` is a small, fast, down-to-earth Python web framework. It is developed as part of the `Pylons Project <https://pylonsproject.org>`_. -It is licensed under a `BSD-like license <http://repoze.org/license.html>`_. +It is licensed under a `BSD-like license <https://web.archive.org/web/20190401024809/http://repoze.org/license.html>`_. Here is one of the simplest :app:`Pyramid` applications you can make: @@ -77,7 +77,7 @@ If you've got questions that aren't answered by this documentation, contact the `Pylons-discuss maillist <https://groups.google.com/forum/#!forum/pylons-discuss>`_ or join the `#pyramid IRC channel -<https://webchat.freenode.net/?channels=pyramid>`_. +<https://webchat.freenode.net/#pyramid>`_. Browse and check out tagged and trunk versions of :app:`Pyramid` via the `Pyramid GitHub repository <https://github.com/Pylons/pyramid/>`_. To check out diff --git a/docs/narr/advanced-features.rst b/docs/narr/advanced-features.rst index 431b4f030..8d99f7291 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: @@ -116,7 +116,7 @@ authorization patterns. 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/firstapp.rst b/docs/narr/firstapp.rst index 49d9b467f..9bc79ac1b 100644 --- a/docs/narr/firstapp.rst +++ b/docs/narr/firstapp.rst @@ -38,9 +38,9 @@ On Windows: %VENV%\Scripts\python helloworld.py This command will not return and nothing will be printed to the console. When -port 6543 is visited by a browser on the URL ``/hello/world``, the server will +port 6543 is visited by a browser on the URL ``/``, the server will simply serve up the text "Hello world!". If your application is running on -your local system, using `<http://localhost:6543/hello/world>`_ in a browser +your local system, using `<http://localhost:6543/>`_ in a browser will show this result. Each time you visit a URL served by the application in a browser, a logging 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..f62e28905 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -35,7 +35,7 @@ Reliability :app:`Pyramid` is developed conservatively and tested exhaustively. Our motto is: "If it ain't tested, it's broke". Openness - As with Python, the :app:`Pyramid` software is distributed under a `permissive open source license <http://repoze.org/license.html>`_. + As with Python, the :app:`Pyramid` software is distributed under a `permissive open source license <https://web.archive.org/web/20190401024809/http://repoze.org/license.html>`_. .. _why_pyramid: @@ -52,7 +52,7 @@ Modern Tested ~~~~~~ -Untested code is broken by design. The :app:`Pyramid` community has a strong testing culture and our framework reflects that. Every release of :app:`Pyramid` has 100% statement coverage (as measured by `coverage <https://coverage.readthedocs.io/en/latest/>`_) and 95% decision/condition coverage. (as measured by `instrumental <https://instrumental.readthedocs.io/en/latest/intro.html>`_) It is automatically tested using `Travis <https://travis-ci.org/Pylons/pyramid>`_ and `Jenkins <http://jenkins.pylonsproject.org/job/pyramid/>`_ on supported versions of Python after each commit to its GitHub repository. `Official Pyramid add-ons <https://trypyramid.com/extending-pyramid.html>`_ are held to a similar testing standard. +Untested code is broken by design. The :app:`Pyramid` community has a strong testing culture and our framework reflects that. Every release of :app:`Pyramid` has 100% statement coverage (as measured by `coverage <https://coverage.readthedocs.io/en/latest/>`_) and 95% decision/condition coverage. (as measured by `instrumental <https://instrumental.readthedocs.io/en/latest/intro.html>`_) It is automatically tested using `Travis <https://travis-ci.org/Pylons/pyramid>`_ and Jenkins on supported versions of Python after each commit to its GitHub repository. `Official Pyramid add-ons <https://trypyramid.com/extending-pyramid.html>`_ are held to a similar testing standard. We still find bugs in :app:`Pyramid`, but we've noticed we find a lot fewer of them while working on projects with a solid testing regime. @@ -70,7 +70,7 @@ You can get help quickly with :app:`Pyramid`. It's our goal that no :app:`Pyrami .. seealso:: - See also our `#pyramid IRC channel <https://webchat.freenode.net/?channels=pyramid>`_, our `pylons-discuss mailing list <https://groups.google.com/forum/#!forum/pylons-discuss>`_, and :ref:`support-and-development`. + See also our `#pyramid IRC channel <https://webchat.freenode.net/#pyramid>`_, our `pylons-discuss mailing list <https://groups.google.com/forum/#!forum/pylons-discuss>`_, and :ref:`support-and-development`. .. _what_makes_pyramid_unique: @@ -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/renderers.rst b/docs/narr/renderers.rst index 6b4982e4b..21cfa0497 100644 --- a/docs/narr/renderers.rst +++ b/docs/narr/renderers.rst @@ -357,9 +357,9 @@ When a view is called that uses a JSONP renderer: Javscript library AJAX functionality will help you make JSONP requests. For example, JQuery has a `getJSON function -<http://api.jquery.com/jQuery.getJSON/>`_, and has equivalent (but more +<https://api.jquery.com/jQuery.getJSON/>`_, and has equivalent (but more complicated) functionality in its `ajax function -<http://api.jquery.com/jQuery.ajax/>`_. +<https://api.jquery.com/jQuery.ajax/>`_. For example (JavaScript): diff --git a/docs/narr/security.rst b/docs/narr/security.rst index b49958b85..2a7034a19 100644 --- a/docs/narr/security.rst +++ b/docs/narr/security.rst @@ -715,7 +715,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. @@ -887,7 +887,9 @@ that it matches one of the trusted origins. By default the only trusted origin is the current host, however additional origins may be configured by setting ``pyramid.csrf_trusted_origins`` to a list of domain names (and ports if they are non-standard). If a host in the list of domains starts with a ``.`` then -that will allow all subdomains as well as the domain without the ``.``. +that will allow all subdomains as well as the domain without the ``.``. If no +``Referer`` or ``Origin`` header is present in an HTTPS request, the CSRF check +will fail unless ``allow_no_origin`` is set. If CSRF checks fail then a :class:`pyramid.exceptions.BadCSRFToken` or :class:`pyramid.exceptions.BadCSRFOrigin` exception will be raised. This diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst index e5244e1ad..34d9a115c 100644 --- a/docs/narr/templates.rst +++ b/docs/narr/templates.rst @@ -452,7 +452,7 @@ templating languages including the following: .. _pyramid_chameleon: https://docs.pylonsproject.org/projects/pyramid-chameleon/en/latest/ -.. _Jinja2: http://jinja.pocoo.org/docs/dev/ +.. _Jinja2: https://jinja.palletsprojects.com/en/2.10.x/ .. _pyramid_jinja2: https://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/ diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst index 8048ca62c..883bb7c7b 100644 --- a/docs/narr/testing.rst +++ b/docs/narr/testing.rst @@ -50,7 +50,7 @@ The suggested mechanism for unit and integration testing of a :app:`Pyramid` application is the Python :mod:`unittest` module. Although this module is named :mod:`unittest`, it is actually capable of driving both unit and integration tests. A good :mod:`unittest` tutorial is available within `Dive -Into Python <http://www.diveintopython.net/unit_testing/index.html>`_ by Mark +Into Python 3 <https://diveinto.org/python3/unit-testing.html>`_ by Mark Pilgrim. :app:`Pyramid` provides a number of facilities that make unit, integration, and 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..a428a77c3 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>`, @@ -337,7 +337,7 @@ passed the view response through the ``pyramid_jinja2`` renderer. .. seealso:: See also: :ref:`Quick Tutorial Jinja2 <qtut_jinja2>`, `Jinja2 homepage - <http://jinja.pocoo.org/>`_, and :ref:`pyramid_jinja2 Overview + <https://palletsprojects.com/p/jinja/>`_, and :ref:`pyramid_jinja2 Overview <jinja2:overview>`. @@ -823,7 +823,7 @@ Now make a "factory" and pass it to the :term:`configurator`'s :emphasize-lines: 2-3 Pyramid's :term:`request` object now has a ``session`` attribute that we can -use in our view code in ``views.py``: +use in our view code in ``views/default.py``: .. literalinclude:: quick_tour/sessions/hello_world/views/default.py :language: python diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst index ed9acd955..a8b562fe7 100644 --- a/docs/quick_tutorial/jinja2.rst +++ b/docs/quick_tutorial/jinja2.rst @@ -97,5 +97,5 @@ Extra credit :term:`Configurator` to load ``pyramid_jinja2``'s configuration. What is another way we could include it into the config? -.. seealso:: `Jinja2 homepage <http://jinja.pocoo.org/>`_, and +.. seealso:: `Jinja2 homepage <https://palletsprojects.com/p/jinja/>`_, and :ref:`pyramid_jinja2 Overview <jinja2:overview>` diff --git a/docs/quick_tutorial/routing.rst b/docs/quick_tutorial/routing.rst index a6538a75f..71fb2a4d7 100644 --- a/docs/quick_tutorial/routing.rst +++ b/docs/quick_tutorial/routing.rst @@ -31,7 +31,7 @@ Previously we saw the basics of routing URLs to views in Pyramid. explicit in ordering. Pyramid also gives facilities to avoid the problem. It's relatively easy to build a system that uses implicit route ordering with Pyramid too. See `The Groundhog series of screencasts - <http://static.repoze.org/casts/videotags.html>`_ if you're interested in + <https://web.archive.org/web/20190118040819/http://static.repoze.org/casts/videotags.html>`_ if you're interested in doing so. diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst index 8600a0cea..a434039ca 100644 --- a/docs/tutorials/wiki2/definingviews.rst +++ b/docs/tutorials/wiki2/definingviews.rst @@ -350,7 +350,7 @@ template inheritance via blocks. - We have defined two placeholders in the layout template where a child template can override the content. These blocks are named ``subtitle`` (line 11) and ``content`` (line 36). -- Please refer to the `Jinja2 documentation <http://jinja.pocoo.org/>`_ for more information about template +- Please refer to the `Jinja2 documentation <https://palletsprojects.com/p/jinja/>`_ for more information about template inheritance. 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. |