none

diff --git a/TWiki/TWikiTutorial.mdwn b/TWiki/TWikiTutorial.mdwn
index 6683d84..f22e782 100644 (file)
--- a/TWiki/TWikiTutorial.mdwn
+++ b/TWiki/TWikiTutorial.mdwn
@@ -21,7 +21,7 @@ This is a short, step-by-step tutorial to get you up to speed on %WIKITOOLNAME%.
   - Go to the [[OfficeLocations]] topic in the %WIKITOOLNAME%.Main web; it has a list of corporate offices already entered into %WIKITOOLNAME%.
 
 - Operations on topics:
-  - Go the the [[WebHome]] topic to learn what we can do with a topic.
+  - Go to the [[WebHome]] topic to learn what we can do with a topic.
   - The bottom of the page has some links:
   - `Edit` : Allows you to edit the topic (discussed later)
   - `Ref-By` : Find out what other topics link to this topic (reverse link)
@@ -30,7 +30,7 @@ This is a short, step-by-step tutorial to get you up to speed on %WIKITOOLNAME%.
   - `r1.3 | > | r1.2 | > | r1.1` : Allows you to see a previous topic revision or the difference between revisions.
 
 - Editing a topic and creating hyperlinked pages:
-  - Go the the [[Test|Test/WebHome]] topic of the %WIKITOOLNAME%.Test web. This web is the sandbox where you can make changes at will.
+  - Go to the [[Test|Test/WebHome]] topic of the %WIKITOOLNAME%.Test web. This web is the sandbox where you can make changes at will.
   - Press the `Edit` link. You are now in edit mode and you can see the source of the page. (Go to a different topic like [[TestTopic3]] in case you see a "Topic is locked by an other user" warning.)
   - Look at the text in edit mode and compare it with the rendered page (move back and forth in your browser.)
   - Notice how [[WikiWords]] are linked automatically; there is no link if you look at the text in edit mode.

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index 77f3d11..1989866 100644 (file)
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -137,7 +137,7 @@
           <td> 2 digit year </td>
           <td> 99 </td>
         </tr>
-      </table> Variables can be shortened to 3 characters. Example: <br /><code>%GMTIME{"$day $month, $year - $hour:$min:$sec"}%</code> is <br /><b>29 Jun, 2010 - 15:26:18</b></td>
+      </table> Variables can be shortened to 3 characters. Example: <br /><code>%GMTIME{"$day $month, $year - $hour:$min:$sec"}%</code> is <br /><b>29 Jun, 2010 - 15:26:26</b></td>
   </tr>
   <tr>
     <td><code>%SERVERTIME%</code></td>
@@ -201,15 +201,20 @@
   </tr>
   <tr>
     <td><code>%SEARCH{"str" ...}%</code></td>
-    <td> Inline search, shows a search result embedded in a topic. Parameter is composed of the search string, followed by optional <code>name="value"</code> pairs: <table border="1" cellpadding="0" cellspacing="0">
+    <td> Inline search, shows a search result embedded in a topic. Parameter is composed of the search term (enclosed in double quotes), followed by optional <code>name="value"</code> pairs: [1] <table border="1" cellpadding="0" cellspacing="0">
         <tr>
           <th bgcolor="#99CCCC"><strong> Pair: </strong></th>
           <th bgcolor="#99CCCC"><strong> Description: </strong></th>
           <th bgcolor="#99CCCC"><strong> Default: </strong></th>
         </tr>
         <tr>
+          <td><code>search="food"</code></td>
+          <td> Search term, (either regex or literal, depending on the <code>regex</code> parameter) </td>
+          <td> (used if initial search term is missing) </td>
+        </tr>
+        <tr>
           <td><code>web="Name"</code><br /><code>web="Main Know"</code><br /><code>web="all"</code></td>
-          <td> Wiki web to search: A web, a list of webs separated by whitespace, or all webs <code>[1]</code></td>
+          <td> Wiki web to search: A web, a list of webs separated by whitespace, or all webs <code>[2]</code></td>
           <td> Current web </td>
         </tr>
         <tr>
@@ -279,7 +284,9 @@
   </tr>
 </table>
 
-[1] **_Note_**: A web can be excluded from a `web="all"` search if you define a `NOSEARCHALL=on` variable in its [[WebPreferences]].
+[1] **_Note_**: The search form uses identical names for input fields.
+
+[2] **_Note_**: A web can be excluded from a `web="all"` search if you define a `NOSEARCHALL=on` variable in its [[WebPreferences]].
 
 ### <a name="Preferences Variables"></a> Preferences Variables
 
@@ -395,4 +402,4 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
 - Additional preferences variables can be defined on all three level as needed. Example:
   - `Set MYLOGO = %PUBURLPATH%/%MAINWEB%/LogoTopic/logo.gif`
 
--- [[PeterThoeny]] - 15 Mar 2001 <br />
+-- [[PeterThoeny]] - 24 Mar 2001 <br />