diff options
| author | Chris McDonough <chrism@plope.com> | 2014-04-08 09:08:02 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-04-08 09:08:02 -0400 |
| commit | ecb376a132034bd4ccfe1daa69d4828699e9028d (patch) | |
| tree | 912b74c4dc61370bb46487f5c52fc705c70e150e /docs/quick_tutorial | |
| parent | e012af904feb15f20a134f22eaeeb61bd9d56cc8 (diff) | |
| parent | bcf18220be9c21ff4b1af50f45b90aadfa7820f5 (diff) | |
| download | pyramid-ecb376a132034bd4ccfe1daa69d4828699e9028d.tar.gz pyramid-ecb376a132034bd4ccfe1daa69d4828699e9028d.tar.bz2 pyramid-ecb376a132034bd4ccfe1daa69d4828699e9028d.zip | |
fix merge conflict while merging master to 1.5 branch
Diffstat (limited to 'docs/quick_tutorial')
| -rw-r--r-- | docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt | 4 | ||||
| -rw-r--r-- | docs/quick_tutorial/scaffolds.rst | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt b/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt index d1fea0d7f..3292dfd90 100644 --- a/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt +++ b/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt @@ -4,10 +4,10 @@ <title>WikiPage: Add/Edit</title> <tal:block tal:repeat="reqt view.reqts['css']"> <link rel="stylesheet" type="text/css" - href="${request.static_url('deform:static/' + reqt)}"/> + href="${request.static_url(reqt)}"/> </tal:block> <tal:block tal:repeat="reqt view.reqts['js']"> - <script src="${request.static_url('deform:static/' + reqt)}" + <script src="${request.static_url(reqt)}" type="text/javascript"></script> </tal:block> </head> diff --git a/docs/quick_tutorial/scaffolds.rst b/docs/quick_tutorial/scaffolds.rst index 8ca2d27df..4f2694100 100644 --- a/docs/quick_tutorial/scaffolds.rst +++ b/docs/quick_tutorial/scaffolds.rst @@ -63,11 +63,11 @@ Steps On startup, ``pserve`` logs some output: - .. code-block:: bash + .. code-block:: bash - Starting subprocess with file monitor - Starting server in PID 72213. - Starting HTTP server on http://0.0.0.0:6543 + Starting subprocess with file monitor + Starting server in PID 72213. + Starting HTTP server on http://0.0.0.0:6543 #. Open http://localhost:6543/ in your browser. |