none

1 files changed, 7 insertions, 7 deletions

diff --git a/TWiki/WebSearch.mdwn b/TWiki/WebSearch.mdwn
index 29ba322c..c29b44ee 100644
--- a/TWiki/WebSearch.mdwn
+++ b/TWiki/WebSearch.mdwn
@@ -1,9 +1,9 @@
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
+<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%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="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
+<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%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" /> %TWIKIWEB%.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](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=\.*)**: List of %WIKITOOLNAME%.%WEB% topics in alphabetical order. <br />**|[All](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=\.*)|[A](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ea)|[B](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Eb)|[C](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ec)|[D](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ed)|[E](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ee)|[F](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ef)|[G](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Eg)|[H](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Eh)|[I](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ei)|[J](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ej)|[K](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ek)|[L](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5El)|[M](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Em)|[N](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5En)|[O](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Eo)|[P](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ep)|[Q](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Eq)|[R](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Er)|[S](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Es)|[T](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Et)|[U](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Eu)|[V](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ev)|[W](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ew)|[X](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ex)|[Y](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ey)|[Z](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&search=%5Ez)| <br /> | [All](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/?scope=topic&regex=on&bookview=on&search=\.*)** topics in %TWIKIWEB%.BookView **|**
+* **[Topic index](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=\.*)**: List of %WIKITOOLNAME%.%INCLUDINGWEB% topics in alphabetical order. <br />**|[All](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=\.*)|[A](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ea)|[B](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eb)|[C](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ec)|[D](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ed)|[E](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ee)|[F](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ef)|[G](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eg)|[H](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eh)|[I](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ei)|[J](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ej)|[K](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ek)|[L](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5El)|[M](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Em)|[N](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5En)|[O](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eo)|[P](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ep)|[Q](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eq)|[R](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Er)|[S](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Es)|[T](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Et)|[U](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eu)|[V](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ev)|[W](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ew)|[X](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ex)|[Y](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ey)|[Z](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ez)| <br /> | [All](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&bookview=on&search=\.*)** topics in %TWIKIWEB%.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](%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/GoodStyle)**:
   * Make changes to topics in %TWIKIWEB%.GoodStyle,