diff options
| author | Theron Luhn <theron@luhn.com> | 2019-03-30 10:56:25 -0700 |
|---|---|---|
| committer | Theron Luhn <theron@luhn.com> | 2019-03-30 10:56:25 -0700 |
| commit | 05b24d434e108f6a8490e8c2520e120e4a831534 (patch) | |
| tree | 0e9d9b93418e4292da3f5a54f9443b2a64094a42 /docs | |
| parent | 6aba89d19cc384021864d3b83d53082f56c3f419 (diff) | |
| parent | 80baff6e61d775dc34bb11b7d6c8ef8569da1c40 (diff) | |
| download | pyramid-05b24d434e108f6a8490e8c2520e120e4a831534.tar.gz pyramid-05b24d434e108f6a8490e8c2520e120e4a831534.tar.bz2 pyramid-05b24d434e108f6a8490e8c2520e120e4a831534.zip | |
Merge branch 'master' into security-policy
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 3 | ||||
| -rw-r--r-- | docs/narr/firstapp.rst | 3 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 2 | ||||
| -rw-r--r-- | docs/narr/project.rst | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index 48658ee9b..a6d37a176 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -181,6 +181,9 @@ htmlhelp_basename = 'pyramid' # Options for LaTeX output # ------------------------ +latex_engine = 'xelatex' +latex_use_xindy = False + # The paper size ('letter' or 'a4'). latex_paper_size = 'letter' diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst index 917482976..49d9b467f 100644 --- a/docs/narr/firstapp.rst +++ b/docs/narr/firstapp.rst @@ -170,8 +170,7 @@ Adding Configuration :lines: 12-13 The first line above calls the :meth:`pyramid.config.Configurator.add_route` -method, which registers a :term:`route` to match any URL path that begins with -``/hello/`` followed by a string. +method, which registers a :term:`route` to the root (``/``) URL path. The second line registers the ``hello_world`` function as a :term:`view callable` and makes sure that it will be called when the ``hello`` route is diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index dada4e8bd..41a5638e3 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -47,7 +47,7 @@ In a world filled with web frameworks, why should you choose :app:`Pyramid`\ ? Modern ~~~~~~ -:app:`Pyramid` is fully compatible with Python 3. If you develop a :app:`Pyramid` application today, you can rest assured that you'll be able to use the most modern features of your favorite language. And in the years to come, you'll continue to bed working on a framework that is up-to-date and forward-looking. +:app:`Pyramid` is fully compatible with Python 3. If you develop a :app:`Pyramid` application today, you can rest assured that you'll be able to use the most modern features of your favorite language. And in the years to come, you'll continue to be working on a framework that is up-to-date and forward-looking. Tested ~~~~~~ diff --git a/docs/narr/project.rst b/docs/narr/project.rst index 14f0d083e..58bef5701 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -149,7 +149,7 @@ number of debugging settings. You can use this file to put your application into production. The ``myproject`` project directory contains an additional subdirectory named -``myproject`` (note the case difference) representing a Python :term:`package` +``myproject`` representing a Python :term:`package` which holds very simple :app:`Pyramid` sample code. This is where you'll edit your application's Python code and templates. |