Index: trunk/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.css (revision 2201)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.css (revision 2234)
@@ -975,4 +975,7 @@
   width: 200px;
 }
+#viewsTable table.subscriptionsListSubs td {
+  white-space: nowrap;
+}
 #viewsTable table td.arrows {
   width: 15px;
@@ -992,4 +995,8 @@
   margin: 0;
   padding: 0;
+  font-size: 0.8em;
+  font-style: italic;
+}
+ul.note {
   font-size: 0.8em;
   font-style: italic;
Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 2225)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 2234)
@@ -835,9 +835,9 @@
         <li>
           <a href="{$subscriptions-fetch}" title="subscriptions to calendars">
-            Manage topical areas
+            Manage subscriptions
           </a>
         </li>
         <li>
-          <a href="{$view-fetch}" title="collections of topical areas">
+          <a href="{$view-fetch}" title="collections of subscriptions">
             Manage views
           </a>
@@ -2559,6 +2559,5 @@
 
         <!-- Topical area  -->
-        <!-- These are the subscriptions (aliases) where the events should show up.
-             By selecting one or more of these, appropriate categories will be set on the event -->
+        <!-- By selecting one or more of these, appropriate categories will be set on the event -->
         <tr>
           <td class="fieldName">
@@ -4137,4 +4136,17 @@
           </td>
         </tr>
+        <xsl:if test="/bedework/page = 'modSubscription'">
+          <tr>
+            <th>Topical Area:</th>
+            <td>
+              <input type="radio" name="calendar.isTopicalArea" value="true">
+                <xsl:if test="isTopicalArea = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
+              </input> true
+              <input type="radio" name="calendar.isTopicalArea" value="false">
+                <xsl:if test="isTopicalArea = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
+              </input> false
+            </td>
+          </tr>
+        </xsl:if>
         <tr>
           <th>Description:</th>
@@ -4791,5 +4803,5 @@
       <tr>
         <td class="cals">
-          <h3>Topical Areas</h3>
+          <h3>Subscriptions</h3>
           <ul class="calendarTree">
             <xsl:apply-templates select="calendar" mode="listForUpdateSubscription">
@@ -4819,10 +4831,29 @@
 
   <xsl:template name="subscriptionIntro">
-    <h3>Managing Topical Areas</h3>
+    <h3>Managing Subscriptions</h3>
     <ul>
-      <li>Select an item from the tree on the left to modify a topical area.</li>
-      <li>Select the
-      <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="true" border="0"/>
-      icon to add a new topical area to the tree.
+      <li>
+        Select an item from the tree on the left to modify a subscription.
+      </li>
+      <li>
+        Select the
+        <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="true" border="0"/>
+        icon to add a new subscription or folder to the tree.
+      </li>
+    </ul>
+    <ul>
+      <li>
+        <strong>Topical Areas:</strong>
+        <ul>
+          <li>
+            A subscription marked as a "Topical Area" will be presented to event administrators when creating events.
+            These are used for input (tagging) and output (if added to a view).
+          </li>
+          <li>
+            A subscription not marked as a "Topical Area" can be used in Views,
+            but will not appear when creating events.  Such subscriptions are used for output only,
+            e.g. an ical feed of holidays from an external source.
+          </li>
+        </ul>
       </li>
     </ul>
@@ -5162,5 +5193,5 @@
     <h2>Manage Views</h2>
     <p>
-      Views are named aggregations of topical areas used
+      Views are named aggregations of subscriptions used
       to display sets of events within a calendar suite.
     </p>
@@ -5176,5 +5207,5 @@
       <tr>
         <th>Name</th>
-        <th>Included topical areas</th>
+        <th>Included subscriptions</th>
       </tr>
 
@@ -5208,9 +5239,22 @@
     <h2>Update View</h2>
 
-    <p class="note">
-      Note: In some configurations, changes made here will not show up in the calendar suite until
-      the cache is flushed (approx. 5 minutes) or you start a new session (e.g. clear your cookies).
-      Deleting a view on a production system should be followed by a server restart to clear the cache for all users.
-    </p>
+    <ul class="note">
+      <li>
+        In some configurations, changes made here will not show up in the calendar suite until
+        the cache is flushed (approx. 5 minutes) or you start a new session (e.g. clear your cookies).
+      </li>
+      <li>
+        Deleting a view on a production system should be followed by a server restart to clear the cache for all users.
+      </li>
+      <li>
+        To see underlying subscriptions in a local folder, open the folder in the
+        "<a href="{$subscriptions-fetch}" title="subscriptions to calendars">Manage Subscriptions</a>" tree
+        (this will be improved in a later version...).
+      </li>
+      <li>
+        If you include a folder in a view, you do not need to
+        include its children.
+      </li>
+    </ul>
 
     <h3 class="viewName">
@@ -5220,13 +5264,20 @@
       <tr>
         <td class="subs">
-          <h3>Available topical areas:</h3>
+          <h3>Available subscriptions:</h3>
 
           <table class="subscriptionsListSubs">
-            <xsl:for-each select="/bedework/calendars/calendar/calendar[isSubscription = 'true']">
-              <xsl:sort select="name" order="ascending" case-order="upper-first"/>
+            <xsl:for-each select="/bedework/calendars/calendar//calendar[isSubscription = 'true' or calType = '0']">
+              <xsl:sort select="substring-after(path, $userPath)" order="ascending" case-order="upper-first"/>
               <xsl:if test="not(/bedework/currentView//path = path)">
                 <tr>
                   <td>
-                    <xsl:value-of select="summary"/>
+                    <xsl:if test="calType = '0' and isSubscription = 'false'">
+                      <!-- display a folder icon for local folders... -->
+                      <img src="{$resourcesRoot}/resources/catIcon.gif"
+                          width="13" height="13" border="0"
+                          alt="folder"/>
+                      <xsl:text> </xsl:text>
+                    </xsl:if>
+                    <xsl:value-of select="substring-after(path, $userPath)"/>
                   </td>
                   <td class="arrows">
@@ -5235,5 +5286,5 @@
                       <img src="{$resourcesRoot}/resources/arrowRight.gif"
                           width="13" height="13" border="0"
-                          alt="add topical area"/>
+                          alt="add subscription"/>
                     </a>
                   </td>
@@ -5246,5 +5297,5 @@
         </td>
         <td class="view">
-          <h3>Active topical areas:</h3>
+          <h3>Active subscriptions:</h3>
           <table class="subscriptionsListView">
             <xsl:for-each select="/bedework/currentView/path">
@@ -5256,5 +5307,5 @@
                     <img src="{$resourcesRoot}/resources/arrowLeft.gif"
                         width="13" height="13" border="0"
-                        alt="add topical area"/>
+                        alt="add subscription"/>
                   </a>
                 </td>
Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 2224)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 2234)
@@ -891,5 +891,5 @@
   font-size: 0.9em;
 }
-#bedework #scheduling p.editAttendees {
+#bedework #scheduling .editAttendees {
   padding-top: 1em;
   clear: both;
Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 2232)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 2234)
@@ -2346,14 +2346,18 @@
               </xsl:for-each>
             </table>
-            <p>
-              <em>
-                <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes">
-                  change my status
-                </a>
-              </em>
-            </p>
+            <xsl:if test="not(organizerSchedulingObject)">
+              <p>
+                <em>
+                  <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes">
+                    change my status
+                  </a>
+                </em>
+              </p>
+            </xsl:if>
           </td>
         </tr>
       </xsl:if>
+      <!-- Recipients are deprecated -->
+      <!--
       <xsl:if test="recipient">
         <tr>
@@ -2386,4 +2390,5 @@
         </tr>
       </xsl:if>
+      -->
       <xsl:if test="cost!=''">
         <tr>
@@ -3908,5 +3913,6 @@
           </xsl:apply-templates>
         </xsl:if>
-
+        <!-- Recipients are deprecated -->
+        <!--
         <xsl:if test="form/recipients/recipient">
           <xsl:apply-templates select="form/recipients">
@@ -3914,8 +3920,18 @@
           </xsl:apply-templates>
         </xsl:if>
+        -->
         <div class="editAttendees">
           <xsl:choose>
-            <xsl:when test="form/scheduleMethod = '2'">
-              <input name="editEventAttendees" type="submit" value="edit attendees and recipients"/>
+            <xsl:when test="form/organizerSchedulingObject">
+              <input name="editEventAttendees" type="submit" value="edit attendees"/>
+            </xsl:when>
+            <xsl:when test="form/attendeeSchedulingObject">
+              <p>
+                <em>
+                  <a href="{$schedule-initAttendeeUpdate}&amp;initUpdate=yes">
+                    change my status
+                  </a>
+                </em>
+              </p>
             </xsl:when>
             <xsl:otherwise>
@@ -3925,5 +3941,5 @@
                 </xsl:when>
                 <xsl:otherwise>
-                  <input name="makeEventIntoMeeting" type="submit" value="make into meeting - invite attendees and recipients"/>
+                  <input name="makeEventIntoMeeting" type="submit" value="make into meeting - invite attendees"/>
                 </xsl:otherwise>
               </xsl:choose>
@@ -4130,5 +4146,5 @@
 
     <div id="recipientsAndAttendees">
-      <h4> Add attendees and recipients</h4>
+      <h4>Add attendees</h4>
       <form name="raForm" id="recipientsAndAttendeesForm" action="{$event-attendeesForEvent}" method="post">
         <div id="raContent">
@@ -4136,7 +4152,7 @@
             <input type="text" name="uri" width="40" id="bwRaUri"/>
             <input type="submit" value="add" />
-            &#160;
-            <input type="checkbox" name="recipient" value="true" checked="checked"/> recipient
-            <input type="checkbox" name="attendee"  value="true" checked="checked"/> attendee
+            <!-- Recipients are deprecated: default all to attendees -->
+            <input type="hidden" name="recipient" value="true"/>
+            <input type="hidden" name="attendee"  value="true"/>
             &#160;
             Role:
@@ -4162,7 +4178,10 @@
           </xsl:if>
 
+          <!-- Recipients are deprecated -->
+          <!--
           <xsl:if test="/bedework/recipients/recipient">
             <xsl:apply-templates select="/bedework/recipients"/>
           </xsl:if>
+          -->
 
           <xsl:apply-templates select="/bedework/freebusy" mode="freeBusyGrid">
@@ -4382,4 +4401,5 @@
   </xsl:template>
 
+  <!-- Recipients are deprecated -->
   <xsl:template match="recipients">
     <xsl:param name="trash">yes</xsl:param>