From 1e4398b1228cb84df1a78fdfbf50c5a65fbfead4 Mon Sep 17 00:00:00 2001
From: MikeMannix <MikeMannix>
Date: Thu, 6 Sep 2001 22:18:19 +0000
Subject: [PATCH] none

---
 TWiki/ManagingTopics.mdwn          |   61 ++++++++++++++++++++++--------------
 TWiki/TWikiUserAuthentication.mdwn |   39 +++++++++++++++--------
 2 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/TWiki/ManagingTopics.mdwn b/TWiki/ManagingTopics.mdwn
index 6dad97f..db78624 100644
--- a/TWiki/ManagingTopics.mdwn
+++ b/TWiki/ManagingTopics.mdwn
@@ -1,11 +1,17 @@
 <div>
   <ul>
     <li><a href="#Managing Topics"> Managing Topics</a><ul>
-        <li><a href="#Referring Topics"> Referring Topics</a></li>
-        <li><a href="#Deleting a Topic"> Deleting a Topic</a></li>
+        <li><a href="#Overview"> Overview</a><ul>
+            <li><a href="#Referring Topics"> Referring Topics</a></li>
+            <li><a href="#Deleting a Topic"> Deleting a Topic</a><ul>
+                <li><a href="#Clearing the Trash"> Clearing the Trash</a></li>
+              </ul>
+            </li>
+          </ul>
+        </li>
         <li><a href="#Redirecting from an Old Topic"> Redirecting from an Old Topic</a></li>
-        <li><a href="#Permissions"> Permissions</a></li>
-        <li><a href="#Procedure"> Procedure</a></li>
+        <li><a href="#Impact of Topic Access Settings"> Impact of Topic Access Settings</a></li>
+        <li><a href="#How Rename/move Works"> How Rename/move Works</a></li>
         <li><a href="#Known Limitations"> Known Limitations</a></li>
       </ul>
     </li>
@@ -14,50 +20,57 @@
 
 ## <a name="Managing Topics"></a> Managing Topics
 
-Select [Rename/move] when viewing a topic to change its name, delete it or move it
+_Browser-based rename, move, and delete for individual topics_
 
-1. Select target Web if other than existing Web
-2. Fill in new name - defaults to current name
-3. You will be warned if there are locks or if there is a name clash
-4. A list of _links_ to the topic will be listed, by default these links will be updated, click checkbox to prevent this
-5. Press the Rename/Move button, topic will be renamed and links to the topic updated as requested.
+### <a name="Overview"></a> Overview
+
+Select **Rename/move** when viewing a topic to change its name, move it to another TWiki web, or delete it:
+
+1. **Select** target web if other than the current web - chose <code>**Trash**</code> to [[delete a topic|Main/WebHome#DeleteTopic]]
+2. **Enter** the new topic name - default is current name <br />**_NOTE:_** You will be warned if there are locks or if there is a name conflict
+3. **Select** from the list of links to the topic that will be changed those to OMIT from changes (by default, all referring links will be updated)
+4. **Click** on **Rename/Move** to rename/remove topic will be renamed and links to the topic updated as requested.
   - If any of the referring pages are locked then they will be listed
   - You can correct these later by again pressing Rename/Move
 
-### <a name="Referring Topics"></a> Referring Topics
+#### <a name="Referring Topics"></a> Referring Topics
 
 Referring topics are found using the the %SEARCH% variable, see the template <code>**searchrenameview.tmpl**</code>. First, matching topics in the current Web are listed - matches are to _topic_. Next, all Webs (including the current one) are listed that match _web.topic_. Because %SEARCH% is used, Webs marked in [[WebPreferences]] as NOSEARCHALL will not show up in the search for refernces to the _topic_ being changed.
 
 Changed references are kept are as short as possible, i.e. _topic_ is used in preference to _web.topic_.
 
-### <a name="Deleting a Topic"></a> Deleting a Topic
+<a name="DeleteTopic"></a>
+
+#### <a name="Deleting a Topic"></a> Deleting a Topic
+
+Deleted topics are moved to the `Trash` web - NOT physically erased from the server. All webs share `Trash` - in case of a name conflict with a topic already `Trash`, the user is alerted and asked to choose a new name.
 
-Topics can be _deleted_ by moving them to the <code>**Trash Web**</code>. Note that topics from all Webs go into this, so there could be name clashes, the user is warned of this and asked to choose a new name. When TWiki support sub-webs, these could be created on demand in the Trash Web, which would avoid this name clash problem.
+##### <a name="Clearing the Trash"></a> Clearing the Trash
 
-It is up to the administrator of a TWiki installation to clean the Trash Web periodically e.g. by archiving to tape of CDROM entries older than 6 months.
+**_NOTE:_** The `Trash` web should be be cleared periodically, by archiving the contents if required (recommended), then deleting the files from the `Trash` directory.
 
 ### <a name="Redirecting from an Old Topic"></a> Redirecting from an Old Topic
 
-Something like the following can be put in [[WebTopicViewTemplate]] and [[WebTopicNonWikiTemplate]] to show if a topic has moved. It does this by searching for the tag %META:TOPICMOVED\{...\}%.
+You can use [[TWikiMetaData]] to place a command in [[WebTopicViewTemplate]] and [[WebTopicNonWikiTemplate]] that will show if a topic has moved by searching for the tag %META:TOPICMOVED\{...\}%. Customize something like this:
 
-    %METASEARCH{type="topicmoved" web="%WEB%" topic="%TOPIC%" title="This topic used to exist and was moved to: "}%
+> %<nop>METASEARCH{type="topicmoved" web="%WEB%" topic="%TOPIC%" title="This topic used to exist and was moved to: "}%
 
-### <a name="Permissions"></a> Permissions
+### <a name="Impact of Topic Access Settings"></a> Impact of Topic Access Settings
 
-Permissions affect rename in various ways. To rename a topic you need both change and rename permissions. To alter refering topics, you need change permission. See [[TWikiDocumentation#TWiki_Access_Control]] for information on setting up permissions.
+Permissions affect the rename function in various ways. To rename a topic, you need both change and rename permissions. To alter refer4ing topics, you need change permission. See [[TWikiDocumentation#TWiki_Access_Control]] for information on setting up access permissions.
 
-### <a name="Procedure"></a> Procedure
+### <a name="How Rename/move Works"></a> How Rename/move Works
 
-- %SEARCH% is used with a special template to show text in topics that requires alteration to point to the new topic name. This includes relavent [[meta data|Main/TWikiDocumentation#Meta_Data_Definition]]
+- %SEARCH% is used with a special template to show text in topics that requires updating to point to the new topic and/or web name. This includes relevent [[MetaData|Main/TWikiDocumentation#Meta_Data_Definition]]
   - User chooses which topics will be altered
-- &lt;PRE&gt; and &lt;verbatim&gt; are honoured - no changes to text within these areas
+- &lt;PRE&gt; and &lt;VERBATIM&gt; are honoured - no changes are made to text within these areas
 - Topic is moved (if locks allow)
-- References are changed (locks and permissions allowing)
-- Any refering topics that can't be changed due to locks are listed - user can try getting these references changed at any time.
+- References are changed (locks and permissions permitting)
+- Any referring topics that can't be changed due to locks are listed - user can change them at another time.
 
 ### <a name="Known Limitations"></a> Known Limitations
 
-Rename in TWiki is fairly complicated due to the dynamic generation of links. Ideally it would be possible to run the required part of rendering in a way that would allow identification of the text to be changed. Unfortunately, these hooks don't exist in TWiki at present. Instead, %SEARCH% is used with a special template to show the text to be changed. And the selected topics and then altered. Search can show matches that will not be updated e.g. because of case differences. Other mis-matches to actual rendered output are also possible as the approaches are so different.
+**Rename/move** in is fairly complicated due to the dynamic generation of links. Ideally, it would be possible to run the required part of rendering in a way that would allow identification of the text to be changed. Unfortunately, these hooks don't exist in TWiki at present. Instead, %SEARCH% is used with a special template to show the text to be changed, and the selected topics are then altered. One drawback is that `search` can show matches that will not be updated because of case differences. Other mismatches to actual rendered output are also possible as the approaches are so different.
 
 The following shows some limitations of square bracket processing.
 
diff --git a/TWiki/TWikiUserAuthentication.mdwn b/TWiki/TWikiUserAuthentication.mdwn
index 0210c8b..0b30ca4 100644
--- a/TWiki/TWikiUserAuthentication.mdwn
+++ b/TWiki/TWikiUserAuthentication.mdwn
@@ -2,8 +2,10 @@
   <ul>
     <li><a href="#TWiki User Authentication"> TWiki User Authentication</a><ul>
         <li><a href="#Overview"> Overview</a></li>
-        <li><a href="#Authentication Options"> Authentication Options</a></li>
-        <li><a href="#Tracking by IP Address"> Tracking by IP Address</a></li>
+        <li><a href="#Authentication Options"> Authentication Options</a><ul>
+            <li><a href="#Partial Authentication"> Partial Authentication</a></li>
+          </ul>
+        </li>
         <li><a href="#TWiki Username vs. Login Usernam"> TWiki Username vs. Login Username</a></li>
         <li><a href="#Changing Passwords"> Changing Passwords</a></li>
       </ul>
@@ -23,19 +25,27 @@ TWiki uses visitor identification to keep track of who made changes to topics at
 
 ### <a name="Authentication Options"></a> Authentication Options
 
-No special installation steps need to be performed if the server is already authenticated. If not, you have three remaining options to controlling user access:
+No special installation steps need to be performed if the server is already authenticated. If not, you have three standard options for controlling user access:
 
-1. **Forget about authentication.** All changes are registered to [[TWikiGuest]] user, so you can't tell who made changes. Your site is completely open and public - anyone can browse and edit freely, in classic Wiki mode.<br />
-2. **Use Basic Authentication** for the <code>**edit**</code> and <code>**attach**</code> scripts. This uses .htaccess and generates the familiar grey log-in window. The [[TWiki Installation Guide|Main/TWikiDocumentation#TWiki_Installation_Notes]] has step-by-step instructions.<br />
-3. **Use SSL** to authenticate and secure the whole server.
+1. **Forget about authentication** to make your site completely public - anyone can browse and edit freely, in classic Wiki mode. All visitors are assigned the [[TWikiGuest]] default identity, so you can't track individual user activity. <br />
+2. **Use SSL** (Secure Sockets Layer; HTTPS) to authenticate and secure the whole server. <br />
+3. **Use Basic Authentication (HTAccess)** to control access by protecting key scripts: `attach`, `edit=`, `installpasswd`, `password`, `preview`, `rename`, `save`, `upload`, `view`, `viewfile` using .htaccess files. The [[TWiki Installation Guide|Main/TWikiDocumentation#TWiki_Installation_Notes]] has step-by-step instructions.
 
-### <a name="Tracking by IP Address"></a> Tracking by IP Address
+#### <a name="Partial Authentication"></a> Partial Authentication
 
-The <code>**REMOTE\_USER**</code> environment variable is only set for the scripts that are under authentication. If, for example, the <code>**edit**</code>, <code>**save**</code> and <code>**preview**</code> scripts are authenticated, but not <code>**view**</code>, you would get your [[WikiName]] in <code>**preview**</code> for the <code>**%WIKIUSERNAME%**</code> variable, but <code>**view**</code> will show <code>**TWikiGuest**</code> instead of your WikiName.
+**Tracking by IP address** is an experimental feature, enabled in `lib/TWiki.cfg`. It lets you combine open access to some functions, with authentication on others, with full user activity tracking:
 
-There is a way to tell TWiki to remember the user for the scripts that are not authenticated, ex: in case the <code>**REMOTE\_USER**</code> environment variable is not set. TWiki can be configured to remember the IP address/username pair whenever an authentication happens (edit topic, attach file). Once remembered, the non-authenticated scripts like <code>**view**</code> will show the correct username instead of <code>**TWikiGuest**</code>. You can enable this by setting the <code>**$doRememberRemoteUser**</code> flag in <code>**TWiki.cfg**</code>. TWiki persistently stores the IP address/username pairs in the file <code>**$remoteUserFilename**</code>, which is <code>**"$dataDir/remoteusers.txt"**</code> by default. Please note that this can fail if the IP address changes due to dynamically assigned IP addresses or proxy servers.
+- Normally, the <code>**REMOTE\_USER**</code> environment variable is set for the scripts that are under authentication. If, for example, the <code>**edit**</code>, <code>**save**</code> and <code>**preview**</code> scripts are authenticated, but not <code>**view**</code>, you would get your [[WikiName]] in <code>**preview**</code> for the <code>**%WIKIUSERNAME%**</code> variable, but <code>**view**</code> will show <code>**TWikiGuest**</code> instead of your WikiName.
 
-**Authentication Test:** You are Main.admin (%WIKIUSERNAME%)
+- TWiki can be configured to remember the IP address/username pair whenever an authentication happens (edit topic, attach file). Once remembered, the non-authenticated scripts, like <code>**view**</code>, will show the correct username instead of [[TWikiGuest]].
+
+- Enable this feature by setting the <code>**$doRememberRemoteUser**</code> flag in `TWiki.cfg`. TWiki then persistently stores the IP address/username pairs in the file, `$remoteUserFilename`, which is `"$dataDir/remoteusers.txt"` by default.
+
+- **_NOTE:_** This approach can fail if the IP address changes due to dynamically assigned IP addresses or proxy servers.
+
+**Quick Authentication Test** - Use the %WIKIUSERNAME% variable to return your current identity:
+
+- You are Main.admin
 
 ### <a name="TWiki Username vs. Login Usernam"></a> TWiki Username vs. Login Username
 
@@ -44,11 +54,12 @@ This section applies only if your %WIKITOOLNAME% is installed on a server that i
 %WIKITOOLNAME% internally manages two usernames: Login username and TWiki username.
 
 - **Login username:** When you login to the intranet, you use your existing login username, ex: <code>**pthoeny**</code>. This name is normally passed to %WIKITOOLNAME% by the <code>**REMOTE\_USER**</code> environment variable, and used by internally by %WIKITOOLNAME%. Login usernames are maintained by your system administrator.
+
 - **TWiki username:** Your name in [[WikiNotation]], ex: <code>**PeterThoeny**</code>, is recorded when you register using [[TWikiRegistration]]; doing so also generates a personal home page in the Main web.
 
 %WIKITOOLNAME% can automatically map an intranet username to a TWiki username, provided that the username pair exists in the [[TWikiUsers]] topic. This is also handled automatically when you register.
 
-> **NOTE:**
+> **_NOTE:_**
 >
 > **To correctly enter a [[WikiName]]**
 >
@@ -72,13 +83,13 @@ This section applies only if your %WIKITOOLNAME% is installed on a server that i
 
 ### <a name="Changing Passwords"></a> Changing Passwords
 
-Change and reset passwords using forms on regular pages. Use topic-level [[TWikiAccessControl]] to restrict use as required.
+Change and reset passwords using forms on regular pages. Use [[TWikiAccessControl]] to restrict use as required.
 
-- The [[ChangePassword]] form, <code>**TWiki/ChangePassword**</code>:
+- The [[ChangePassword]] form ( <code>**TWiki/ChangePassword**</code> ):
 
 >
 
-- The [[ResetPassword]] form <code>**TWiki/ResetPassword**</code>:
+- The [[ResetPassword]] form ( <code>**TWiki/ResetPassword**</code> ):
 
 >
 
-- 
1.7.1