summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/introduction.rst2
-rw-r--r--docs/narr/viewconfig.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 187b81702..c4f2ea512 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -101,7 +101,7 @@ frameworks for small and large applications is just false; a well-designed
framework should be able to be good at both. Pyramid strives to be that kind
of framework.
-To this end, Pyramid provides a set of features, that, combined, are unique
+To this end, Pyramid provides a set of features that, combined, are unique
amongst Python web frameworks. Lots of other frameworks contain some
combination of these features; Pyramid of course actually stole many of them
from those other frameworks. But Pyramid is the only one that has all of
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 799de768f..f00dae451 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -834,7 +834,7 @@ decorator on the RESTView class:
.. code-block:: python
:linenos:
- from pyramid.view import view_config
+ from pyramid.view import view_defaults
from pyramid.response import Response
from pyramid.config import Configurator