Merge branch 'master' into module-support

15 years ago · 7f837901cb
1 changed files with 2 additions and 2 deletions
--- a/docs/api.rst
+++ b/docs/api.rst
@ -113,8 +113,8 @@ Incoming Request Data
      ============= ======================================================
      `path`        ``/page.html``
      `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/``
      ============= ======================================================