Merge branch 'master' into module-support

This commit is contained in:
Armin Ronacher 2010-05-04 11:45:37 +02:00
commit 7f837901cb

View file

@ -113,8 +113,8 @@ Incoming Request Data
============= ====================================================== ============= ======================================================
`path` ``/page.html`` `path` ``/page.html``
`script_root` ``/myapplication`` `script_root` ``/myapplication``
`url` ``http://www.example.com/myapplication/page.html`` `base_url` ``http://www.example.com/myapplication/page.html``
`base_url` ``http://www.example.com/myapplication/page.html?x=y`` `url` ``http://www.example.com/myapplication/page.html?x=y``
`url_root` ``http://www.example.com/myapplication/`` `url_root` ``http://www.example.com/myapplication/``
============= ====================================================== ============= ======================================================