From a7f3ecea32770be248fd8294464c1f006525adb2 Mon Sep 17 00:00:00 2001
From: PeterThoeny <PeterThoeny>
Date: Mon, 14 Apr 2003 07:19:22 +0000
Subject: [PATCH] none

---
 TWiki/TWikiAccessControl.mdwn      |  7 +++++++
 TWiki/TWikiUserAuthentication.mdwn | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/TWiki/TWikiAccessControl.mdwn b/TWiki/TWikiAccessControl.mdwn
index 1cb7097..754159a 100644
--- a/TWiki/TWikiAccessControl.mdwn
+++ b/TWiki/TWikiAccessControl.mdwn
@@ -2,6 +2,7 @@
   <ul>
     <li><a href="#TWiki Access Control"> TWiki Access Control</a><ul>
         <li><a href="#An Important Control Considerati"> An Important Control Consideration</a></li>
+        <li><a href="#Authentication vs. Access Contro"> Authentication vs. Access Control</a></li>
         <li><a href="#Users and Groups"> Users and Groups</a><ul>
             <li><a href="#Managing Users"> Managing Users</a></li>
             <li><a href="#Managing Groups"> Managing Groups</a></li>
@@ -57,6 +58,12 @@ As a **collaboration guideline**:
 - Create broad-based Groups (for more and varied input), and...
 - Avoid creating view-only Users (if you can read it, you should be able to contribute to it).
 
+## <a name="Authentication vs. Access Contro"></a> Authentication vs. Access Control
+
+**Authentication:** Identifies who a user is based on a login procedure. See [[TWikiUserAuthentication]].
+
+**Access control:** Restrict access to content based on users and groups once a user is identified.
+
 ## <a name="Users and Groups"></a> Users and Groups
 
 Access control is based on the familiar concept of Users and Groups. Users are defined by their [[WikiNames]]. They can then be organized in unlimited combinations by inclusion in one or more user Groups. For convenience, Groups can also be included in other Groups.
diff --git a/TWiki/TWikiUserAuthentication.mdwn b/TWiki/TWikiUserAuthentication.mdwn
index e920c59..5f656fc 100644
--- a/TWiki/TWikiUserAuthentication.mdwn
+++ b/TWiki/TWikiUserAuthentication.mdwn
@@ -22,11 +22,18 @@ 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 are required if the server is already authenticated. If it isn't, you have three standard options for controlling user access:
-
-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`, `preview`, `rename`, `save`, `upload` using the <code>**.htaccess file**</code>. The [[TWikiInstallationGuide]] has step-by-step instructions.
+No special installation steps are required if the server is already authenticated. If it isn't, you have these options for controlling user access:
+
+1. **No login at all:** 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.
+  - **How:** Default, no web server configuration necessary
+2. **No login to view; require login to edit:** Keeping track of who changed what and when, while keeping view access unrestricted is desirable in most TWiki deployments. This option is not suitable if you need [[TWikiAccessControl]] for view restricted content since TWiki does not know who a user is when looking at content.
+  - **How:** Use Basic Authentication (`.htaccess`) to control access by protecting key scripts: `attach`, `edit`, `installpasswd`, `manage`, `preview`, `rename`, `save`, `upload` using the <code>**.htaccess file**</code>. The [[TWikiInstallationGuide]] has step-by-step instructions.
+3. **No login to view _unless necessary_; require login to edit:** You prefer not to bother the user with login for unrestricted content, but you need [[TWikiAccessControl]] for view restricted content. There are two ways to accomplish this:
+  - **How 1:** Use Basic Authentication with Partial Authentication (described below)
+  - **How 2:** Use one of the Session TWiki:Plugins where you give the user the option to login and logout.
+4. **Require login to view and edit:** Most restrictive, but TWiki knows who the user is at all times. There are two ways to accomplish this:
+  - **How 1:** Use Basic Authentication to authenticate the whole `twiki/bin` directory. Consult your web server documentation.
+  - **How 1:** Use SSL (Secure Sockets Layer; HTTPS) to authenticate and secure the whole server. Consult your web server documentation.
 
 ### <a name="Partial Authentication"></a> Partial Authentication
 
-- 
1.9.4