Merge branch 'master' into security-policy

6 files changed, 11 insertions, 5 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index a347d8d2b..d8a4f45a6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -91,3 +91,5 @@ Backward Incompatibilities
 Documentation Changes
 ---------------------
 
+- Restore build of PDF on Read The Docs.
+  See https://github.com/Pylons/pyramid/issues/3290
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 42a1f8cc2..019c66c9a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -337,4 +337,6 @@ Contributors
 
 - Alexandre Yukio Harano, 2018/10/05
 
-- Theron Luhn, 2019/02/17
+- Arijit Basu, 2019/02/19
+
+- Theron Luhn, 2019/03/30
\ No newline at end of file
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.