none

diff --git a/Main/WebSearch.mdwn b/Main/WebSearch.mdwn
index 4956cee..e69de29 100644 (file)
--- a/Main/WebSearch.mdwn
+++ b/Main/WebSearch.mdwn
@@ -1,66 +0,0 @@
-<form action="http://www.dementia.org/twiki//search/%WEB%/">
-  <ul>
-    <li><b>Simple search</b>: <table border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td><input checked name="scope" type="radio" value="text" /> Topic text (body)     </td>
-          <td><input name="web" type="checkbox" /> All webs (not only %WIKITOOLNAME%.%WEB% web) </td>
-        </tr>
-        <tr>
-          <td><input name="scope" type="radio" value="topic" /> Topic name </td>
-          <td><input name="bookview" type="checkbox" /> [[TWiki/BookView]]</td>
-        </tr>
-      </table><input name="search" size="32" type="text" /> <input type="submit" value="Search text" /></li>
-  </ul>
-</form>
-
-<form action="http://www.dementia.org/twiki//search/%WEB%/">
-  <ul>
-    <li><b>Advanced search</b>: <table border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td><input checked name="scope" type="radio" value="text" /> Topic text (body)     </td>
-          <td> Search </td>
-          <td><select name="web"><option selected value="all"> all </option>
-              <option value="Main">Main</option>
-              <option value="TWiki">TWiki</option>
-              <option value="Know">Know</option>
-              <option value="Test">Test</option></select> web(s) </td>
-        </tr>
-        <tr>
-          <td><input name="scope" type="radio" value="topic" /> Topic name </td>
-          <td> Sort by </td>
-          <td><select name="order"><option value="topic">Topic name</option>
-              <option value="modified">Last modified time</option>
-              <option value="editby">Last editor</option></select> in <input name="reverse" type="checkbox" /> reversed order </td>
-        </tr>
-      </table><input name="search" size="32" type="text" /> <input type="submit" value="Search text" /><br />
-      <table>
-        <tr>
-          <td> Make search: </td>
-          <td><input name="casesensitive" type="checkbox" /> Case sensitive </td>
-          <td><input name="regex" type="checkbox" /> [[TWiki/RegularExpression]] search </td>
-        </tr>
-        <tr>
-          <td> Don't show: </td>
-          <td><input name="nosearch" type="checkbox" /> search string </td>
-          <td><input name="nosummary" type="checkbox" /> summaries   <input name="nototal" type="checkbox" /> total matches </td>
-        </tr>
-        <tr>
-          <td> Do show: </td>
-          <td><input name="bookview" type="checkbox" /> [[TWiki/BookView]]</td>
-          <td><input name="limit" size="5" type="text" value="all" /> topics (result count) </td>
-        </tr>
-      </table>
-    </li>
-  </ul>
-</form>
-
-- **[Topic index](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=\.*)**: List of %WIKITOOLNAME%.%WEB% topics in alphabetical order. <br />**|[All](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=\.*)|[A](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ea)|[B](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eb)|[C](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ec)|[D](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ed)|[E](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ee)|[F](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ef)|[G](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eg)|[H](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eh)|[I](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ei)|[J](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ej)|[K](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ek)|[L](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5El)|[M](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Em)|[N](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5En)|[O](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eo)|[P](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ep)|[Q](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eq)|[R](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Er)|[S](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Es)|[T](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Et)|[U](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eu)|[V](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ev)|[W](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ew)|[X](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ex)|[Y](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ey)|[Z](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ez)| <br /> | [All](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&bookview=on&search=\.*)** topics in [[BookView]] **|**
-
-- **Jump to topic**: If you already know the name of the topic, enter the name of the topic at the second line of this page.
-
-- ** [[WebChanges]] **: Find out what topics in %WIKITOOLNAME%.%WEB% have changed recently.
-
-- **[How to edit text](http://www.dementia.org/twiki//view/TWiki/GoodStyle)**:
-  - Make changes to topics in [[GoodStyle]],
-  - Learn the [[TextFormattingRules]], and
-  - Have a look at the [[TextFormattingFAQ]].

diff --git a/TWiki/WebSearch.mdwn b/TWiki/WebSearch.mdwn
index 4956cee..0efddf8 100644 (file)
--- a/TWiki/WebSearch.mdwn
+++ b/TWiki/WebSearch.mdwn
@@ -1,9 +1,9 @@
-<form action="http://www.dementia.org/twiki//search/%WEB%/">
+<form action="http://www.dementia.org/twiki//search/%INCLUDINGWEB%/">
   <ul>
     <li><b>Simple search</b>: <table border="0" cellpadding="0" cellspacing="0">
         <tr>
           <td><input checked name="scope" type="radio" value="text" /> Topic text (body)     </td>
-          <td><input name="web" type="checkbox" /> All webs (not only %WIKITOOLNAME%.%WEB% web) </td>
+          <td><input name="web" type="checkbox" /> All webs (not only %WIKITOOLNAME%.%INCLUDINGWEB% web) </td>
         </tr>
         <tr>
           <td><input name="scope" type="radio" value="topic" /> Topic name </td>
@@ -13,7 +13,7 @@
   </ul>
 </form>
 
-<form action="http://www.dementia.org/twiki//search/%WEB%/">
+<form action="http://www.dementia.org/twiki//search/%INCLUDINGWEB%/">
   <ul>
     <li><b>Advanced search</b>: <table border="0" cellpadding="0" cellspacing="0">
         <tr>
@@ -42,23 +42,23 @@
         <tr>
           <td> Don't show: </td>
           <td><input name="nosearch" type="checkbox" /> search string </td>
-          <td><input name="nosummary" type="checkbox" /> summaries   <input name="nototal" type="checkbox" /> total matches </td>
+          <td><input name="nosummary" type="checkbox" /> summaries     <input name="nototal" type="checkbox" /> total matches </td>
         </tr>
         <tr>
           <td> Do show: </td>
           <td><input name="bookview" type="checkbox" /> [[TWiki/BookView]]</td>
-          <td><input name="limit" size="5" type="text" value="all" /> topics (result count) </td>
+          <td><input name="showlock" type="checkbox" /> locked topic   <input name="limit" size="5" type="text" value="all" /> topics (result count) </td>
         </tr>
       </table>
     </li>
   </ul>
 </form>
 
-- **[Topic index](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=\.*)**: List of %WIKITOOLNAME%.%WEB% topics in alphabetical order. <br />**|[All](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=\.*)|[A](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ea)|[B](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eb)|[C](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ec)|[D](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ed)|[E](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ee)|[F](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ef)|[G](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eg)|[H](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eh)|[I](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ei)|[J](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ej)|[K](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ek)|[L](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5El)|[M](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Em)|[N](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5En)|[O](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eo)|[P](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ep)|[Q](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eq)|[R](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Er)|[S](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Es)|[T](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Et)|[U](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Eu)|[V](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ev)|[W](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ew)|[X](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ex)|[Y](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ey)|[Z](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=%5Ez)| <br /> | [All](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&bookview=on&search=\.*)** topics in [[BookView]] **|**
+- **[Topic index](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=\.*)**: List of %WIKITOOLNAME%.%INCLUDINGWEB% topics in alphabetical order. <br />**|[All](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=\.*)|[A](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ea)|[B](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eb)|[C](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ec)|[D](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ed)|[E](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ee)|[F](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ef)|[G](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eg)|[H](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eh)|[I](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ei)|[J](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ej)|[K](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ek)|[L](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5El)|[M](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Em)|[N](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5En)|[O](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eo)|[P](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ep)|[Q](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eq)|[R](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Er)|[S](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Es)|[T](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Et)|[U](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eu)|[V](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ev)|[W](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ew)|[X](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ex)|[Y](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ey)|[Z](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ez)| <br /> | [All](http://www.dementia.org/twiki//search/%INCLUDINGWEB%/?scope=topic&regex=on&bookview=on&search=\.*)** topics in [[BookView]] **|**
 
 - **Jump to topic**: If you already know the name of the topic, enter the name of the topic at the second line of this page.
 
-- ** [[WebChanges]] **: Find out what topics in %WIKITOOLNAME%.%WEB% have changed recently.
+- ** [[WebChanges]] **: Find out what topics in %WIKITOOLNAME%.%INCLUDINGWEB% have changed recently.
 
 - **[How to edit text](http://www.dementia.org/twiki//view/TWiki/GoodStyle)**:
   - Make changes to topics in [[GoodStyle]],