Index: README.md
==================================================================
--- README.md
+++ README.md
@@ -20,10 +20,11 @@
   *  ["Hello World!" App (6 lines of code)](/doc/trunk/docs/helloworld.md)
   *  [Introduction To Writing Wapp Applications](/doc/trunk/docs/intro.md)
   *  [Quick Reference](/doc/trunk/docs/quickref.md)
   *  [Wapp Parameters](/doc/trunk/docs/params.md)
   *  [Wapp Commands](/doc/trunk/docs/commands.md)
+  *  [CGI Parameters](/doc/trunk/docs/quickref.md#cgiparams)
   *  [URL Mapping](/doc/trunk/docs/urlmapping.md)
   *  [Security Features](/doc/trunk/docs/security.md)
   *  [How To Compile wapptclsh - Or Not](/doc/trunk/docs/compiling.md)
   *  [Limitations of Wapp](/doc/trunk/docs/limitations.md)
   *  [Example Applications](/file/examples)

Index: docs/params.md
==================================================================
--- docs/params.md
+++ docs/params.md
@@ -131,11 +131,12 @@
 wapp-allow-xorigin-params call.  Only invoke wapp-allow-xorigin-params
 for web pages that only query information.  Do not invoke
 wapp-allow-xorigin-params on pages where the parameters can be used
 to change server-side state.
 
-3.0 CGI Parameter Details
+<a name='cgidetail'></a>
+3.0 CGI Parameter Details [(Quick reference)](quickref.md#cgiparams)
 -------------------------
 
 The CGI parameters in Wapp describe the HTTP request that is to be answered
 and the execution environment.
 These parameter look like CGI environment variables.  To prevent environment
@@ -276,22 +277,28 @@
     http://example.com/cgi-bin/script/method/extra/path?q1=5
            \_________/\_____________/\________________/ \__/
                 |            |               |           |
             HTTP_HOST   SCRIPT_NAME      PATH_INFO       `-- QUERY_STRING
 
+>
+    http://example.com/cgi-bin/script/method/extra/path?q1=5
+           \_________/\_______________________________/ \__/
+                |                    |                   |
+            HTTP_HOST         REQUEST_URI                `-- QUERY_STRING
+
 >
     http://example.com/cgi-bin/script/method/extra/path?q1=5
     \_______________________________/ \____/ \________/
                     |                    |        | 
                 BASE_URL           PATH_HEAD   PATH_TAIL
 
 
 >
     http://example.com/cgi-bin/script/method/extra/path?q1=5
-    \______________________________________/
-                       |
-                    SELF_URL
+    \______________________________________/ \________/
+                       |                          |
+                    SELF_URL                   PATH_TAIL
 
 ### 3.2 Undefined Parameters When Using SCGI on Nginx
 
 Some of the CGI parameters are undefined by default when using CGI mode
 with Nginx.  If these CGI parameters are needed by the application, then

Index: docs/quickref.md
==================================================================
--- docs/quickref.md
+++ docs/quickref.md
@@ -43,11 +43,11 @@
 |**wapp** {_TEXT_}|&rarr;|Append _TEXT_ without substitution|
 |**wapp-unsafe** _TEXT_|&rarr;|Append _TEXT_ that contains nothing that needs to be escaped|
 
 
 <a name="cgiparams"></a>
-3.0 CGI Parameters
+3.0 CGI Parameters [(More detail)](params.md#cgidetail)
 ------------------
 
 >
 |BASE\_URL|&rarr;|URL for the Wapp script without a method|
 |CONTENT|&rarr;|Raw (unparsed) POST content|
@@ -75,23 +75,23 @@
 
 Assuming "env.tcl" is the name of the Wapp application script:
 
 >
     https://wapp.tcl.tk/demo/env.tcl/abc/def/ghi?a=5&b=22.425#point42
-            \_________/\___________/\__________/
-                 |           |          |
-             HTTP_HOST  SCRIPT_NAME  PATH_INFO
+            \_________/\___________/\__________/ \__________/
+                 |           |          |             |
+             HTTP_HOST  SCRIPT_NAME  PATH_INFO    QUERY_STRING
 
 >
     https://wapp.tcl.tk/demo/env.tcl/abc/def/ghi?a=5&b=22.425#point42
     \______________________________/ \_/ \_____/
                    |                  |     |
-                BASE_URL         PATH_HEAD  |-- PATH_TAIL
-                                      |   __|__
-                                     / \ /     \
+                BASE_URL         PATH_HEAD  `-- PATH_TAIL
+
+>
     https://wapp.tcl.tk/demo/env.tcl/abc/def/ghi?a=5&b=22.425#point42
     \__________________________________/         \__________/
                    |                                  |
                 SELF_URL                         QUERY_STRING
 
 >
     SCRIPT_FILENAME := DOCUMENT_ROOT + SCRIPT_NAME