none

diff --git a/TWiki/ChangePassword.mdwn b/TWiki/ChangePassword.mdwn
index 4b5e072..9d452ef 100644 (file)
--- a/TWiki/ChangePassword.mdwn
+++ b/TWiki/ChangePassword.mdwn
@@ -1,4 +1,4 @@
-<font>Change password</font><br />
+<font>Change password</font>
 
 **_Forgot your old password?_** Then use [[ResetPassword]] instead. Please only use ResetPassword in case you really forgot your password. Thank you.
 
@@ -30,3 +30,5 @@
 After submitting this form your password will be changed.
 
 If you have questions please contact the TWiki webmaster .
+
+**_Note to administrator:_** The change password form applies only if TWiki uses Basic Authentication, e.g. a `.htpassword` file managed by TWiki. It does not apply if you are using external authentication, such as an IT managed password system. (remove this note if you are using Basic Authentication; else replace this topic with a note describing how to change the password in your organization)

diff --git a/TWiki/RegularExpression.mdwn b/TWiki/RegularExpression.mdwn
index 7536370..024b004 100644 (file)
--- a/TWiki/RegularExpression.mdwn
+++ b/TWiki/RegularExpression.mdwn
@@ -28,7 +28,11 @@ REs are similar to (but more poweful than) the "wildcards" used in the command-l
   </tr>
   <tr>
     <td><code>bug*</code></td>
-    <td> Search for <strong>bug</strong>, <strong>bugs</strong>, <strong>bugfix</strong></td>
+    <td> Search for <strong>bug</strong>, <strong>bugg</strong>, <strong>buggg</strong> or simply <strong>bu</strong> (a star matches <strong>zero</strong> or more instances of the previous character) </td>
+  </tr>
+  <tr>
+    <td><code>bug.*</code></td>
+    <td> Search for <strong>bug</strong>, <strong>bugs</strong>, <strong>bugfix</strong> (a dot-star matches zero or more instances of <strong>any</strong> character) </td>
   </tr>
   <tr>
     <td><code>[Bb]ag</code></td>

diff --git a/TWiki/ResetPassword.mdwn b/TWiki/ResetPassword.mdwn
index 1aa10d5..b8ace63 100644 (file)
--- a/TWiki/ResetPassword.mdwn
+++ b/TWiki/ResetPassword.mdwn
@@ -25,4 +25,6 @@ Please only use this **ResetPassword** form in case you really forgot your passw
 
 After submitting this form you will see a page with your **new password** appearing **encrypted**.
 
-You will have to e-mail this information to the Wiki webmaster , who will set your account to use the new password.
+You will have to e-mail this information to the Wiki webmaster, , who will set your account to use the new password.
+
+**_Note to administrator:_** The reset password form applies only if TWiki uses Basic Authentication, e.g. a `.htpassword` file managed by TWiki. It does not apply if you are using external authentication, such as an IT managed password system. (remove this note if you are using Basic Authentication; replace this topic with a note describing how to reset the password in your organization)

diff --git a/TWiki/TWikiInstallationGuide.mdwn b/TWiki/TWikiInstallationGuide.mdwn
index a7a9c44..2b47ac7 100644 (file)
--- a/TWiki/TWikiInstallationGuide.mdwn
+++ b/TWiki/TWikiInstallationGuide.mdwn
@@ -163,7 +163,7 @@ You can also edit `$localPerlLibPath` in the `setlib.cfg` file if you are not ro
 - %H% The `twiki/data/*/*.txt,v` RCS repository files in the installation package are locked by user `nobody`. If your CGI scripts are **_not_** running as user `nobody`, it's not possible to check in files (you'll see that the revision number won't increase after saving a topic). In this case, you need to unlock all repository files (check the RCS man pages) and lock them with a different user, ex `www-data`, or delete them all - new files will be automatically created the first time each topic is edited. A simple way to change ownership is with a search-and-replace in all files; for example, using perl:
 
 > cd twiki/data
->     perl -pi~ -e 's/nobody:/www-data:/' */*,v
+>     perl -pi~ -e 's/nobody(\:[0-9\.]+[\;\s]+strict\;)/www-data$1/' */*,v
 
 ### <a name="Step 3: Set the Main Configurati"></a> Step 3: Set the Main Configuration File
 

diff --git a/TWiki/TWikiTopics.mdwn b/TWiki/TWikiTopics.mdwn
index aff9334..a3eb719 100644 (file)
--- a/TWiki/TWikiTopics.mdwn
+++ b/TWiki/TWikiTopics.mdwn
@@ -52,9 +52,12 @@ A TWiki topic is a rich information unit. **Each** topic has:
 
 Features that can be used by topics and sites include:
 
-- skins
-  - fully configurable look and feel for all topics
+- [[TWiki Skins|TWiki/TWikiSkins]] to customize the look of headers and footers when topics are converted to Web pages for display:
   - default and user selectable per session
+  - fully configurable look and feel
+  - apply skins across an entire TWiki web, or to a single displayed page
+  - use included skins and easily create new ones
+  - try the <code>**[Printable]**</code> skin below: stripped down headers and footers suitable for clean hard copy
 - plug-ins
   - new feature packages
   - developer community evolving existing and new capabilities
@@ -75,10 +78,6 @@ Features that can be used by topics and sites include:
   - accesses meta-data
   - use text fields and boxes, radio buttons, pulldown selector menus, checkboxes
   - create your own forms to tag topics to later search, sort and display
-- [[TWiki Skins|TWiki/TWikiSkins]] to customize the look of headers and footers when topics are converted to Web pages for display:
-  - apply skins across an entire TWiki web, or to a single displayed page
-  - use included skins and easily create new ones
-  - try the <code>**[Printable]**</code> skin below: stripped down headers and footers suitable for clean hard copy
 - [[renaming, moving, and deleting|Main/WebHome#RenamingTopics]]
   - rename a topic and automatically update all of the links to it, site-wide
   - move a topic from one TWiki web to another