Skip to content
This repository
Browse code

Merge branch 'master' of github.com:Pylons/pyramid

  • Loading branch information...
commit 1e74e6f3fc5345d53dadb6861d2d8a3778ecf25e 2 parents 561a443 + bd90c4f
Chris McDonough authored May 02, 2012
6  docs/glossary.rst
Source Rendered
@@ -922,9 +922,9 @@ Glossary
922 922
      http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ .
923 923
 
924 924
    scaffold
925  
-     A project template that helps users get started writing a Pyramid
926  
-     application quickly.  Scaffolds are usually used via the ``pcreate``
927  
-     command.
  925
+     A project template that generates some of the major parts of a Pyramid
  926
+     application and helps users to quickly get started writing larger
  927
+     applications.  Scaffolds are usually used via the ``pcreate`` command.
928 928
 
929 929
    pyramid_exclog
930 930
      A package which logs Pyramid application exception (error) information
4  docs/narr/commandline.rst
Source Rendered
@@ -460,7 +460,7 @@ to the console.
460 460
 
461 461
 You can add request header values by using the ``--header`` option::
462 462
 
463  
-   $ bin/prequest --header=Host=example.com development.ini /
  463
+   $ bin/prequest --header=Host:example.com development.ini /
464 464
 
465 465
 Headers are added to the WSGI environment by converting them to their
466 466
 CGI/WSGI equivalents (e.g. ``Host=example.com`` will insert the ``HTTP_HOST``
@@ -718,7 +718,7 @@ we'll pretend you have a distribution with a package in it named
718 718
    def settings_show():
719 719
        description = """\
720 720
        Print the deployment settings for a Pyramid application.  Example:
721  
-       'psettings deployment.ini'
  721
+       'show_settings deployment.ini'
722 722
        """
723 723
        usage = "usage: %prog config_uri"
724 724
        parser = optparse.OptionParser(
7  docs/tutorials/wiki/installation.rst
Source Rendered
@@ -130,9 +130,10 @@ Preparation, Windows
130 130
 Make a Project
131 131
 ==============
132 132
 
133  
-Your next step is to create a project.  :app:`Pyramid` supplies a variety of
134  
-scaffolds to generate sample projects.  For this tutorial, we will use the
135  
-:term:`ZODB` -oriented scaffold named ``zodb``.
  133
+Your next step is to create a project.  For this tutorial, we will use the
  134
+:term:`scaffold` named ``zodb``, which generates an application
  135
+that uses :term:`ZODB` and :term:`traversal`.  :app:`Pyramid`
  136
+supplies a variety of scaffolds to generate sample projects.
136 137
 
137 138
 The below instructions assume your current working directory is the
138 139
 "virtualenv" named "pyramidtut".
8  docs/tutorials/wiki2/installation.rst
Source Rendered
@@ -67,10 +67,10 @@ Preparation, Windows
67 67
 Making a Project
68 68
 ================
69 69
 
70  
-Your next step is to create a project.  :app:`Pyramid` supplies a
71  
-variety of scaffolds to generate sample projects.  We will use the
72  
-``alchemy`` scaffold, which generates an application
73  
-that uses :term:`SQLAlchemy` and :term:`URL dispatch`.
  70
+Your next step is to create a project.  For this tutorial, we will use the
  71
+:term:`scaffold` named ``alchemy``, which generates an application
  72
+that uses :term:`SQLAlchemy` and :term:`URL dispatch`.  :app:`Pyramid`
  73
+supplies a variety of scaffolds to generate sample projects.
74 74
 
75 75
 The below instructions assume your current working directory is the
76 76
 "virtualenv" named "pyramidtut".

0 notes on commit 1e74e6f

Please sign in to comment.
Something went wrong with that request. Please try again.