none

diff --git a/TWiki/TWikiRegistration.mdwn b/TWiki/TWikiRegistration.mdwn
index ed38a2a..9a8adcd 100644 (file)
--- a/TWiki/TWikiRegistration.mdwn
+++ b/TWiki/TWikiRegistration.mdwn
@@ -2,7 +2,7 @@ To edit pages on this %WIKITOOLNAME% Collaborative Web, you must have a register
 
 To register as a new user, simply fill out this form:
 
-<form action="http://www.dementia.org/twiki//register" method="post">
+<form action="http://www.dementia.org/twiki//register/Main/WebHome" method="post">
   <table border="1">
     <tr>
       <td align="right"> First &amp; last name: </td>
@@ -53,8 +53,8 @@ To register as a new user, simply fill out this form:
 **_Submitting the form will automatically:_**
 
 - Create an account for you, so that you can start editing pages using your [[WikiName]].
-- Create your personal TWiki topic using your [[WikiName]] as topic name, and add the data you submitted to the topic.
-- Add your name to the list of users in the [[TWikiUsers]] topic.
+- Create your personal %WIKITOOLNAME% topic using your [[WikiName]] as topic name, and add the data you submitted to the topic.
+- Add your name to the list of users in the [[TWikiUsers]] topic in the %WIKITOOLNAME%.Main web.
 - Send you a confirmation of your registration by email.
 
 Once registered you can login using your [[WikiName]] and password.

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index 1072943..abe93d4 100644 (file)
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -90,8 +90,8 @@ TWiki expands the following variables enclosed in % percent signs:
     <td> REMOTE_USER environment variable, is <b></b></td>
   </tr>
   <tr>
-    <td><code>%INCLUDE{"file.ext"}%</code></td>
-    <td> Server side include, includes the text of a file. The default directory is the current Wiki web. Example: <code><b>%INCLUDE{"../Know/TopicName.txt"}%</b></code></td>
+    <td><code>%INCLUDE{"SomeTopic"}%</code></td>
+    <td> Server side include, includes another topic. The current Wiki web is searched by default. Example: <code><b>%INCLUDE{"TWiki.TWikiWebsTable"}%</b></code></td>
   </tr>
   <tr>
     <td><code>%SEARCH{"str" ...}%</code></td>
@@ -102,21 +102,36 @@ TWiki expands the following variables enclosed in % percent signs:
           <th bgcolor="#99CCCC"><strong> Default: </strong></th>
         </tr>
         <tr>
-          <td><code>web="Name"</code></td>
-          <td> Specify Wiki web to search </td>
+          <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> Current web </td>
         </tr>
         <tr>
-          <td><code>scope="topic"</code></td>
-          <td> Search topic name (title) </td>
+          <td><code>scope="topic"</code><br /><code>scope="text"</code></td>
+          <td> Search topic name (title) or in the text (body) of the topic </td>
           <td> Topic text (body) </td>
         </tr>
         <tr>
+          <td><code>order="topic"</code><br /><code>order="modified"</code><br /><code>order="editby"</code></td>
+          <td> Sort the results of search by the topic names, last modified time, or last editor </td>
+          <td> Sort by topic name </td>
+        </tr>
+        <tr>
+          <td><code>limit="all"</code><br /><code>limit="16"</code></td>
+          <td> Limit the number of results returned </td>
+          <td> All results </td>
+        </tr>
+        <tr>
           <td><code>regex="on"</code></td>
           <td>[[Main/RegularExpression]] search </td>
           <td> Literal search </td>
         </tr>
         <tr>
+          <td><code>reverse="on"</code></td>
+          <td> Reverse the direction of the search </td>
+          <td> Ascending search </td>
+        </tr>
+        <tr>
           <td><code>casesensitive="on"</code></td>
           <td> Case sensitive search </td>
           <td> Ignore case </td>
@@ -127,6 +142,11 @@ TWiki expands the following variables enclosed in % percent signs:
           <td> Show topic summary </td>
         </tr>
         <tr>
+          <td><code>bookview="on"</code></td>
+          <td>[[Main/BookView]] search, e.g. show complete topic text </td>
+          <td> Show topic summary </td>
+        </tr>
+        <tr>
           <td><code>nosearch="on"</code></td>
           <td> Suppress search string </td>
           <td> Show search string </td>
@@ -140,6 +160,8 @@ TWiki expands the following variables enclosed in % percent signs:
   </tr>
 </table>
 
+[1] **_Note_**: A web can be excluded from a `web="all"` search if you define a `NOSEARCHALL=on` variable in its [[WebPreferences]].
+
 Additional variables are defined in the preferences ( site-level ( **_SL_** ) in [[TWikiPreferences]], web-level ( **_WL_** ) in [[WebPreferences]] of each web, and user level ( **_UL_** ) preferences in individual user topics):
 
 <table border="1">
@@ -174,6 +196,11 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
     <td> Background color of web </td>
   </tr>
   <tr>
+    <td><code>%NOSEARCHALL%</code></td>
+    <td><strong><em>WL</em></strong></td>
+    <td> Exclude web from a <code>web="all"</code> search (set variable to <code>on</code> for hidden webs) </td>
+  </tr>
+  <tr>
     <td><code>%EDITBOXWIDTH%</code></td>
     <td><strong><em>SL</em></strong> , <strong><em>UL</em></strong></td>
     <td> Horizontal size of edit box, is <b> <code>%EDITBOXWIDTH%</code> </b></td>
@@ -188,6 +215,23 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
     <td><strong><em>SL</em></strong> , <strong><em>UL</em></strong></td>
     <td> Default state of the link check box in the attach file page. Check box is initially checked if value is set to <code>CHECKED</code> , unchecked if empty. If checked, a link is created to the attached file at the end of the topic. Value is: <b><code>%ATTACHLINKBOX%</code></b></td>
   </tr>
+  <tr>
+    <td><code>%HTTP_EQUIV_ON_VIEW%</code></td>
+    <td><strong><em>SL</em></strong></td>
+    <td> http-equiv meta tags for view, rdiff, attach, search* scripts. </td>
+  </tr>
+  <tr>
+    <td><code>%HTTP_EQUIV_ON_EDIT%</code></td>
+    <td><strong><em>SL</em></strong> , <strong><em>UL</em></strong></td>
+    <td> http-equiv meta tags for edit script. </td>
+  </tr>
+  <tr>
+  </tr>
+  <tr>
+    <td><code>%HTTP_EQUIV_ON_PREVIEW%</code></td>
+    <td><strong><em>SL</em></strong> , <strong><em>UL</em></strong></td>
+    <td> http-equiv meta tags for preview script. </td>
+  </tr>
 </table>
 
--- [[PeterThoeny]] - 29 May 2000 <br />
+-- [[PeterThoeny]] - 17 Aug 2000 <br />

diff --git a/TWiki/TextFormattingFAQ.mdwn b/TWiki/TextFormattingFAQ.mdwn
index 228781f..0ef6eac 100644 (file)
--- a/TWiki/TextFormattingFAQ.mdwn
+++ b/TWiki/TextFormattingFAQ.mdwn
@@ -51,11 +51,11 @@ There are two work arounds if you want to display angle brackets:
 
 <a name="ques">Q:</a> **Some words (like [[WinAPI]]) have an unwanted question mark at the end. How can I prevent that?**
 
-A question mark after a word is a link to a not yet existing topic. For example, [[WinAPI]] is a valid [[WikiTopic]] name in [[WikiNotation]], but the actual topic _WinAPI_ does not exist.
+A question mark after a word is a link to a not yet existing topic. For example, [[WinAPI]] is a valid [[WikiName]], but the actual topic _WinAPI_ does not exist.
 
-If you do not intend to create a topic for a valid TWiki topic name, you can prevent it being linked by putting an HTML tag in front of it. I usually use &lt;NOP&gt;. This is a non existing HTML tag, so a browser just ignores it.
+If you do not intend to create a topic for a valid [[WikiWord]], you can prevent it being linked by putting an HTML tag in front of it. I usually use &lt;nop&gt;. This is a non existing HTML tag, so a browser just ignores it.
 
-- Example text: <br />`WinAPI as it is, <NOP>WinAPI with preceeding NOP.`
+- Example text: <br />`WinAPI as it is, <nop>WinAPI with preceeding NOP.`
 - Example output: <br />[[WinAPI]] as it is, WinAPI with preceeding NOP.
 
 ----
@@ -227,4 +227,4 @@ Place text you would like to specify a color inside &lt;FONT COLOR="colorCode"&g
 
 ----
 
--- [[PeterThoeny]] - 08 Aug 1999
+-- [[PeterThoeny]] - 18 Aug 2000

diff --git a/TWiki/WikiName.mdwn b/TWiki/WikiName.mdwn
new file mode 100644 (file)
index 0000000..6386f14
--- /dev/null
+++ b/TWiki/WikiName.mdwn
@@ -0,0 +1,5 @@
+Your name in [[WikiNotation]]. Usually your first and last name connected togther.
+
+For example, Bill Clinton's WikiName is [[BillClinton]].
+
+**_Note:_** All users are in the %WIKITOOLNAME%.Main web. Prepend the "Main" name if you write a username in a topic, i.e. write `Main.TWikiGuest` to link to [[TWikiGuest]].