You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2009/03/03 01:43:47 UTC

svn commit: r749499 - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE: components/prefs/xdocs/ components/prefs/xdocs/images/ xdocs/adminguide/ xdocs/devguide/ xdocs/devguide/images/

Author: taylor
Date: Tue Mar  3 00:43:47 2009
New Revision: 749499

URL: http://svn.apache.org/viewvc?rev=749499&view=rev
Log:
administrators guide, making some progress thanks to contributions from Jody McAlister, Jeff Maddux, Niels van Kampenout

Added:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-prefs.xml   (props changed)
      - copied unchanged from r747178, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/prefs/xdocs/index.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/preferences-c.gif   (props changed)
      - copied unchanged from r747178, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/prefs/xdocs/images/preferences-c.gif
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/preferences-schema.gif   (props changed)
      - copied unchanged from r747178, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/prefs/xdocs/images/preferences-schema.gif
Removed:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/prefs/xdocs/images/preferences-c.gif
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/prefs/xdocs/images/preferences-schema.gif
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/prefs/xdocs/index.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/prefs/xdocs/navigation.xml
Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/credentials.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/index.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/navigation.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/permissions.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/roles.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/statistics.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/subsites.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-attributes.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-profiler.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/users.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/credentials.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/credentials.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/credentials.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/credentials.xml Tue Mar  3 00:43:47 2009
@@ -34,7 +34,7 @@
               If enabled, this portlet can display the current expiration date of a password and also allows to change
               its value:</p>
               <p align="center">
-                <img src="adminguide/images/password-expiration.jpg" border="0"/>
+                <img src="images/password-expiration.jpg" border="0"/>
               </p>              
               <p>
               As you can see, through the radio group, the password expiration date can be changed to:</p>
@@ -50,7 +50,7 @@
               <p>
               This feature can be enabled through the edit/preferences page of the <code>UserDetailsPortlet</code>:</p>
               <p align="center">
-                <img src="adminguide/images/user-detail-prefs.jpg" border="0"/>
+                <img src="images/user-detail-prefs.jpg" border="0"/>
               </p>
               <p>
               Note: when a new password value is specified selected password expiration action <code>Expired</code>
@@ -66,7 +66,7 @@
               <p>
               With the preferences set as in the example shown above, the <code>Add User</code> dialog will look like this:</p>
               <p align="center">
-                <img src="adminguide/images/add-user.jpg" border="0"/>
+                <img src="images/add-user.jpg" border="0"/>
               </p>
               <p>
               A user added with the example preferences set, will have the <code>updateRequired</code> property set to

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/index.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/index.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/index.xml Tue Mar  3 00:43:47 2009
@@ -32,32 +32,33 @@
 			</p>
 			<subsection name="Security Administration">
 			<p>
-			JODY TODO: put links here, not sure if you think its good to repeat links, if they are on the left, note the lists are not complete, see navigation.xml
 			<ul>
-			  <li>User Management</li>
-			  <li>Role Management</li>
-			  <li>Group Management</li>
-			  <li>Constraints</li>
-			  <li>Permissions</li>
-			  <li>Single Sign-on Management</li>
+			  <li><a href="users.html">User Management</a></li>
+			  <li><a href="roles.html">Role Management</a></li>
+			  <li><a href="groups.html">Group Management</a></li>
+			  <li><a href="constraints.html">Constraints</a></li>
+			  <li><a href="credentials.html">Credentials</a></li>
+			  <li><a href="permissions.html">Permissions</a></li>
+			  <li><a href="user-attributes.html">User Attributes</a></li>
+			  <li><a href="user-profiler.html">User Profile</a></li>
+			  <li><a href="sso.html">Single Sign-on Management</a></li>
 			</ul>			
 			</p>
 			</subsection>
 			<subsection name="Portal Administration">
 			<p>
-			Portal administration JODY TODO: put links    
 			<ul>
-			  <li>Remote Portlet Application Manager</li>
-			  <li>Portlet Application Manager</li>
-			  <li>Portal Site Manager</li>
-			  <li>Portlet Application Lifecycle Manager</li>
-			  <li>Profiler Administration</li>
-			  <li>Portlet Entity Manager</li>
-			  <li>Portal Statistics</li>
-			  <li>Portlet Selector</li>
-			  <li>Portlet Tracking</li>
-			  <li>Import Export Service</li>
-			  <li>Subsites</li>
+			  <li><a href="rpad.html">Remote Portlet Application Manager</a></li>
+			  <li><a href="pam.html">Portlet Application Manager</a></li>
+			  <li><a href="site.html">Portal Site Manager</a></li>
+			  <li><a href="palm.html">Portlet Application Lifecycle Manager</a></li>
+			  <li><a href="profiler.html">Profiler Administration</a></li>
+			  <li><a href="search.html">Search</a></li>
+			  <li><a href="statistics.html">Portal Statistics</a></li>
+			  <li><a href="portlet-selector.html">Portlet Selector</a></li>
+			  <li><a href="tracking.html">Portlet Tracking</a></li>
+			  <li><a href="import.html">Import Export Service</a></li>
+			  <li><a href="subsites.html">Subsites</a></li>
 			 </ul> 
 			</p>
 			</subsection>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/navigation.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/navigation.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/navigation.xml Tue Mar  3 00:43:47 2009
@@ -22,7 +22,7 @@
         	<item name="Deployment Guide" href="deployguide/index.html" />
         	<item name="Developers Guide" href="devguide/index.html" />
         	<item name="Users Guide" href="usersguide/index.html" />
-            <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
+            <!--<item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />-->
         </links>
         <menu name="Installer">
             <item name="Getting Started" href="getting-started-installer.html" />
@@ -54,7 +54,7 @@
 		</menu>
 		<menu name="Deployment">
 			<item name="Tomcat 5" href="deployguide/guide-tomcat.html"/>
-			<item name="Websphere" href="deployguide/deploying-to-websphere.xml"/>
+			<item name="Websphere" href="deployguide/deploying-jetspeed-to-websphere.html"/>
 		</menu>
     </body>
 </project>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/permissions.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/permissions.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/permissions.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/permissions.xml Tue Mar  3 00:43:47 2009
@@ -16,73 +16,168 @@
 	limitations under the License.
 -->
 <document>
-	<properties>
-		<title>Permissions Administration Guide</title>
-		<subtitle>Guide to Administering Security Permissions</subtitle>
-		<authors>
-			<person name="David Sean Taylor" email="taylor@apache.org" />
-			<person name="Jody McAlister" email="jmcalister@onehippo.com" />
-		</authors>
-	</properties>
-	<body>
-		<section name="Security Permissions Administration Guide">
-			<p> 
-Security permissions restrict access to resources in the portal. Portal resources (folders, links, pages, portlets) can be secured with either:
-<ul>
-<li>Security Constraints (based on Jetspeed-specific security constraints)</li> 
-<li>Security Permissions (based on a Java Security Policy)</li>
-</ul> 
-The default security is Constraints as they are easier to configure by a portal administrator. The advantage of Permissions is that they 
-are stored in a central repository in the Jetspeed database, and  they adhere to the Java Security Standard.  Both constraints and permissions inherit. Meaning that if you set a 
-permission or constraint on a folder, it is inherited by all subfolders and pages. Permissions are an implementation of a Java Security Policy stored in a database.  
-</p>
-<p>
-A permission grants a permission to a security principal, either: 
-<ul>
-<li>a role</li> 
-<li>a group</li> 
-<li>a user</li> 
-<li>or * for all users</li>
-</ul> 
-A permission defines the action, which can be standard portlet modes:
-<ul> 
-<li>view</li> 
-<li>edit</li> 
-<li>help</li>
-</ul> 
-Or Jetspeed extended portlet modes: 
-<ul> 
-<li>edit_defaults</li> 
-<li>about </li>
-<li>config </li>
-<li>print</li> 
-</ul>
-</p>
-<subsection name="Permission Management">
-<p> 
-TODO: describe UI, screen shots
-</p>
-</subsection>
-<subsection name="Permission Usage">
-<p> 
-A security definition is referenced by portal resources to secure that particular resource. The following resources can be secured: 
-<ul>
-<li>Folder: in the folder metadata</li> 
-<li>Page: in a PSML file </li>
-<li>Link: in a .link file </li>
-<li>Portlet Window: one instance of a portlet on a page</li>
-<li>Portlet Definition: all instances of a portlet on all pages</li>
-<li>Portlet Application: all portlets in a portlet application</li>
-</ul>
-Securing a resource is as simple as defining a permission definition using the administrative portlet defined above. You can do this from several areas of the portal:
-<ul>
-<li>1. The Site Manager to secure a folder, page or link</li>
-<li>2. Portlet Application Manager, to secure a Portlet Application or Portlet Definition</li>
-<li>3. Config Mode, if available for a portlet, you can secure a portlet instance</li>
-</ul>
-Additionally, portlets can be secured in the deployment descriptors. See the <a href="">deployment</a> guide for more details.
-</p>
-</subsection>
-</section>
-	</body>
-</document>
\ No newline at end of file
+    <properties>
+        <title>Permissions Administration Guide</title>
+        <subtitle>Guide to Administering Security Permissions</subtitle>
+        <authors>
+            <person name="David Sean Taylor" email="taylor@apache.org"/>
+            <person name="Jody McAlister" email="jmcalister@onehippo.com"/>
+            <person name="Niels van Kampenhout" email="n.vankampenhout@onehippo.com"/>
+        </authors>
+    </properties>
+    <body>
+        <section name="Security Permissions Administration Guide">
+            <p> 
+                Security permissions restrict access to resources in the portal. Portal resources (folders, links,
+                pages, portlets) can be secured with either: 
+                <ul>
+                    <li>Security Constraints (based on Jetspeed-specific security constraints)</li>
+                    <li>Security Permissions (based on a Java Security Policy)</li>
+                </ul> 
+                The default security is Constraints as they are easier to configure by a portal administrator. The
+                advantage of Permissions is that they are stored in a central repository in the Jetspeed database, and
+                they adhere to the Java Security Standard. Both constraints and permissions inherit. Meaning that if you
+                set a permission or constraint on a folder, it is inherited by all subfolders and pages. Permissions are
+                an implementation of a Java Security Policy stored in a database. 
+            </p>
+            <p> A permission grants a permission to a security principal, either: 
+                <ul>
+                    <li>a role</li>
+                    <li>a group</li>
+                    <li>a user</li>
+                    <li>or * for all users</li>
+                </ul> 
+                A permission defines the action, which can be standard portlet modes: 
+                <ul>
+                    <li>view</li>
+                    <li>edit</li>
+                    <li>help</li>
+                </ul> 
+                Or Jetspeed extended portlet modes: <ul>
+                    <li>edit_defaults</li>
+                    <li>about </li>
+                    <li>config </li>
+                    <li>print</li>
+                </ul>
+            </p>
+            <subsection name="Permission Management">
+                <p>
+                    Permission Management is located on the fourth tab from the left on the Jetspeed Administrative Portlets page.
+                    It contains one portlet, Security Permissions, which allows you to set permissions for a role on three
+                    different resource types: portlets, folders, and pages.
+                </p>
+                <p>TODO screenshot of permissions portlet</p>
+                <h4>The Permissions User Interface</h4>
+                <p>
+                    The UI of the Permissions portlet is devided into the following sections:
+                </p>
+                <table>
+                    <tr>
+                        <th>UI section</th>
+                        <th>Description</th>
+                    </tr>
+                    <tr>
+                        <td>Resource type tabs</td>
+                        <td>
+                            <p>
+                                Select the resource type you want to define permissions for by
+                                clicking on the correpsonding tab.
+                            </p>
+                            <p>
+                                The resource types are:
+                            </p>
+                            <ul>
+                                <li>Portlets</li>
+                                <li>Folders</li>
+                                <li>Pages</li>
+                            </ul>
+                            <p>TODO: screenshot of tabs</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Permissions listing</td>
+                        <td>
+                            <p>
+                                The list of permissions defined for the selected resource type. Each permission displays
+                                the resource name, the permitted actions, and the roles to which this permission applies.
+                            </p>
+                            <p>TODO screenshot of permissions listing</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Permission form</td>
+                        <td>
+                            <p>
+                               This form allows you to edit the permission selected in the list, or create a new permission.
+                            </p>
+                            <p>
+                                "Roles" display a list of roles in which you can select the roles to which this permission applies,
+                                by checking the corresponding checkboxes. 
+                            </p>
+                            <p>
+                                "Actions" displays a list of actions in which you can select the actions that are permitted 
+                                to the selected roles, on the selected resource, by checking the corresponding checkboxes.
+                                Available actions are:
+                            </p>
+                            <ul>
+                                <li>View</li>
+                                <li>Edit</li>
+                                <li>Help</li>
+                                <li>About</li>
+                                <li>Config</li>
+                                <li>Edit Defaults</li>
+                                <li>Print</li>
+                            </ul>
+                            <p>
+                                Finally, in the top right corner of the form are four buttons to create a new permission, or
+                                to save, revert or delete the selected permission.
+                            </p>
+                            <p>TODO screenshot of the permission edit form</p>
+                        </td>
+                    </tr>
+                </table>
+                <h4>Editing a Permission</h4>
+                <p>
+                    To edit a permission, select one in the permission listing. The permission settings will be loaded in the
+                    form. Select the roles this permission should apply to by checking the appropriate checkboxes. Check the actions
+                    that you want to permit by checking the appropriate checkboxes. Save the permission by clicking on the
+                    "Save" button. As long as you have not saved, you can revert your changes by clicking on the "Revert" button.
+                </p>
+                <h4>Deleting a permission</h4>
+                <p>
+                    To delete a permission, select on in the permission listing, and then click on the "Delete" button.
+                </p>
+                <h4>Creating a New Permission</h4>
+                <p>
+                    To create a new permission, click on the "New" button. The "Resource" text field will be enabled for editing, enter
+                    the resource name here. The new permission will show up immediately in the listing. Select the roles and actions as 
+                    described above for editing an existing permission. Click on "Save" to store the permission. If you decide you
+                    do not want to create the new permission after all, click on "Delete" to remove it.
+                </p>
+            </subsection>
+            <subsection name="Permission Usage">
+                <p> 
+                    A security definition is referenced by portal resources to secure that particular resource. The
+                    following resources can be secured: 
+                    <ul>
+                        <li>Folder: in the folder metadata</li>
+                        <li>Page: in a PSML file </li>
+                        <li>Link: in a .link file </li>
+                        <li>Portlet Window: one instance of a portlet on a page</li>
+                        <li>Portlet Definition: all instances of a portlet on all pages</li>
+                        <li>Portlet Application: all portlets in a portlet application</li>
+                    </ul> 
+                    Securing a resource is as simple as defining a permission definition using the administrative
+                    portlet defined above. You can do this from several areas of the portal: 
+                    <ul>
+                        <li>1. The Site Manager to secure a folder, page or link</li>
+                        <li>2. Portlet Application Manager, to secure a Portlet Application or Portlet Definition</li>
+                        <li>3. Config Mode, if available for a portlet, you can secure a portlet instance</li>
+                    </ul> 
+                    Additionally, portlets can be secured in the deployment descriptors. See the 
+                    <a href="../deployguide/index.html">deployment</a> guide for more details. 
+                </p>
+            </subsection>
+        </section>
+    </body>
+</document>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/roles.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/roles.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/roles.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/roles.xml Tue Mar  3 00:43:47 2009
@@ -22,89 +22,171 @@
 		<authors>
 			<person name="David Sean Taylor" email="taylor@apache.org" />
 			<person name="Jody McAlister" email="jmcalister@onehippo.com" />
+			<person name="Jeff Maddux" email="jmaddux@onehippo.com" />
 		</authors>
 	</properties>
 	<body>
 		<section name="Role Administration Guide">
 			<p>
-				Administering roles with Jetspeed. 
-				<br/><br/>
+			Role Management is where you manage individual portal roles. You can create new roles and remove existing roles.
+			You can assign users to roles. The Role Management page is located inside the Jetspeed Administrative Portlets section.
+			The Role Management page is the second tab on the administrative menu across the top. Here you see the Role Admin
+			on the left, and the Role Detail Information on the right. 																						
 			</p>
 		</section>
-		<section name="The Role Browser">
+		<section name="Role Admin">
 			<p>
-			TODO: overview, screenshot			
+			The Role Admin portlet lists all portal roles and allows you to search for a particular role.
 			</p>
-			<subsection name="Paging">
-			<p>
+			<p>			
+			TODO: screenshot of complete role admin portlet 								
 			</p>
+			<subsection name="Paging">
+				<p>
+				If there are more than ten roles in the system, the role listing is spread over several pages each displaying ten roles.
+				You can navigate through the pages using the buttons right below the listing.
+				Clicking on the "Refresh" button will reset the role listing to the first page.
+				</p>
+				<p>				
+				TODO: screenshot of paging buttons 			
+				</p>
 			</subsection>
 			<subsection name="Searching">
-			<p>
-			</p>
+				<p>
+				You can search for a particular role by entering the role name or part of the role name in the search text box.
+				After clicking on the "Search" button, the role listing will show the search results, starting with the role that
+				best matched your search query, followed by increasingly less matching roles.
+				</p>
+				<p>				
+				TODO: screenshot of search text box and button 			
+				</p>
 			</subsection>
 			<subsection name="Filtering">
+				<p>
+				To get only exact matches when searching for (or part of) a particular role name, check the "filter" checkbox below the
+				search text box.
+				</p>
+				<p>				
+				TODO: screenshot of the filter check box 			
+				</p>
+			</subsection>		
+		</section>
+		<section name="Adding and Deleting Roles">
 			<p>
+			The Role Detail Information portlet allows you to add and/or remove roles.
 			</p>
-			</subsection>
-			<subsection name="Selecting for Edit">
 			<p>
+			TODO: screenshot of role admin and role detail information portlet
 			</p>
+			<subsection name="Adding a Role">
+				<p>
+				To add a role, depending on the Role Detail Information portlets state, you either need to...
+	                <ul>
+	                    <li>enter a role name and press "Save", or</li>
+	                    <li>select "Add New Role", enter a role name and press "Save",</li>
+	                </ul> 					
+				</p>		
+				<p>
+				TODO: screenshot of two states of Role Detail Information portlet
+			
+				<table>
+				<tr>
+				<th>Field</th>
+				<th>Description</th>			
+				</tr>
+				<tr>
+				<td>New Role Name</td>
+				<td>Sets the name for role</td>
+				</tr>
+				</table>
+				</p>
 			</subsection>		
-		</section>
-		<section name="Adding a New Role">
-			<p>
-			TODO: overview, screenshot
-			<table>
-			<tr>
-			<th>Field</th>
-			<th>Description</th>			
-			</tr>
-			<tr>
-			<td>New Role Name</td>
-			<td></td>
-			</tr>
-			</table>
+			<subsection name="Removing a Role">
+				<p>
+				To remove a role from the system, click on the desired role in the Role Admin portlet. A small arrow will appear in front of the
+				role name to indicate it is currently selected, and the role's existing users will be loaded in the Role Details Information portlet.				
+				Click the "Remove Role" button. Be aware that this action is permanent!
+				</p>
+				<p>			
+				TODO: screenshot of Remove Role button		
+				</p>
+			</subsection>			
+		</section>		
+		<section name="Adding Users to Roles">
+			<p>	
+			To add or remove users assigned to a role, click on the role name in the Role Admin portlet. A small arrow will appear in front of the
+			role name to indicate it is currently selected, and the role's existing users will be loaded in the Role Details Information portlet.					
 			</p>
-		</section>
-		<section name="Role Detail Information">
-		<p>
-		</p>
-		<subsection name="Add Users to Role">
-		<p>
-		</p>
-		</subsection>
-		<subsection name="Remove Checked Users">
-		<p>
-		</p>
-		</subsection>
-		<subsection name="Search Users in Role">
-		<p>
-		</p>
-		</subsection>
-		<subsection name="Deleting a Role">
-		<p>
-		</p>
-		</subsection>
+			<p>			
+			TODO: screenshot of role admin and role detail information portlet	
+			</p>
+			<subsection name="Paging">
+				<p>
+				If there are more than ten users assigned to a role in the system, the role listing is spread over several pages
+				each displaying ten users. You can navigate through the pages using the buttons right below the listing.
+				Clicking on the "Refresh" button will reset the user listing to the first page.
+				</p>
+				<p>				
+				TODO: screenshot of paging buttons 			
+				</p>
+			</subsection>				
+			<subsection name="Add Users to Role">
+				<p>
+				The Role Detail Information portlet allows you to add users to a role. Select "Add Users to Role".
+				A pop-up window will appear.  Check the users you wish to add and click "Add Users". The Role Detail Information portlet
+				will be populated with the selected users.	
+				</p>
+				<p>			
+				TODO: screenshot of the pop-up window		
+				</p>			
+			</subsection>
+			<subsection name="Remove Checked Users">
+				<p>
+				To remove a user from a role, select the user(s) you wish to remove and click on the "Remove Checked Users" button.
+				Be aware that this action is permanent!				
+				</p>
+				<p>			
+				TODO: screenshot of Remove Checked Users button		
+				</p>				
+			</subsection>
+			<subsection name="Search Users in Role">
+				<p>
+				You can search for a particular user by entering the users name or part of the users name in the search text box.
+				After clicking on the "Search" button, the "Users in Role" listing will show the search results, starting with the user that
+				best matched your search query, followed by increasingly less matching users.
+				</p>
+				<p>				
+				TODO: screenshot of search text box and button 			
+				</p>
+			</subsection>
+			<subsection name="Filter Users in Role">
+				<p>
+				To get only exact matches when searching for (or part of) a particular user name, check the "filter" checkbox below the
+				search text box.
+				</p>
+				<p>				
+				TODO: screenshot of the filter check box 			
+				</p>
+			</subsection>			
 		</section>	
 		<subsection name="Role Details Configuration">
-		<p>
-		For some weird reason there is no Edit Mode here!	
-			<table>
-			<tr>
-			<th>Field</th>
-			<th>Description</th>			
-			</tr>
-			<tr>
-			<td></td>
-			<td></td>
-			</tr>
-			<tr>
-			<td></td>
-			<td></td>
-			</tr>
-			</table>
-		</p>		
+			<p>
+			For some weird reason there is no Edit Mode here!	
+				<table>
+				<tr>
+				<th>Field</th>
+				<th>Description</th>			
+				</tr>
+				<tr>
+				<td></td>
+				<td></td>
+				</tr>
+				<tr>
+				<td></td>
+				<td></td>
+				</tr>
+				</table>
+			</p>		
 		</subsection>				
 	</body>
 </document>
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/statistics.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/statistics.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/statistics.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/statistics.xml Tue Mar  3 00:43:47 2009
@@ -30,8 +30,8 @@
     		<p>
     		Jetpseed-2 provides administrative portlets that report on portal statistics.
     		<br/><br/>
-    		<img src="adminguide/images/portlet-statistics.gif" border="0"/><br/>
-    		<img src="adminguide/images/page-statistics.gif" border="0"/>
+    		<img src="images/portlet-statistics.gif" border="0"/><br/>
+    		<img src="images/page-statistics.gif" border="0"/>
     		</p>
     		</subsection>
 </section>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/subsites.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/subsites.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/subsites.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/subsites.xml Tue Mar  3 00:43:47 2009
@@ -46,7 +46,7 @@
         </ul>
         <subsection name='Virtual Hosting'>
         <p>In our Virtual Hosting example, we are hosting three different portal subsites:</p>
-        <img src='adminguide/images/subsites2.jpg' border="0"/>
+        <img src='images/subsites2.jpg' border="0"/>
         <p>Here we have three subsites (four including localhost) defined for three different companies:
         </p>
         <ul>
@@ -57,7 +57,7 @@
         </subsection>
         <subsection name='Single Organization'>
         <p>In our Single Organization example, we are hosting three different portal subsites within the organization:</p>
-        <img src='adminguide/images/subsites.jpg' border="0"/>        
+        <img src='images/subsites.jpg' border="0"/>        
         <p>Here we have three subsites (four including localhost) defined for three different companies:
         </p>
         <ul>
@@ -162,7 +162,7 @@
 <p>A profiling rule contains one or more criterion. Each criterion defines an instruction on how to locate a page in the physical portal site map.
 Criterion of the type <i>navigation</i> are used to navigate down the portal site tree. 
 The <i>fallBackOrder</i> tag should normally just be listed sequential. You can almost always get by with a <i>fallBackType</i> of 2.
-All of the available criterion <i>types</i> are documented in the online <a href='guide-profiler.html'>Profiler Guide</a>.
+All of the available criterion <i>types</i> are documented in the online <a href='profiler.html'>Profiler Guide</a>.
 The table below describes each criterion in our subsite rule and how it is used in a subsite location algorithm. This rule is a subsite location rule that uses a user-role-fallback algorithm.
 User-role-fallback algorithms first look for a page in the users home directory. If not found there, they then look for a page in each of the users corresponding role directories.
 There are other algorithms provided by out of the box such as role-fallback, group-fallback, mediatype/language fallback. Or you can create your own algorithms by creating new profiling rules in the XML seed data or with
@@ -181,7 +181,7 @@
 <p>
 The screenshot below shows the directory tree for a <i>localhost</i> subsite.
 </p>
-<img src='adminguide/images/localhost-site.jpg'/>
+<img src='images/localhost-site.jpg'/>
 <p>
 Notice the _user and _role directories. These are control directories based on the runtime parameters <i>user</i> and <i>role</i>.
 The user parameter represents the username of the currently logged on user. The role parameter can represent one or more roles of the current user.
@@ -240,7 +240,7 @@
 All users are either explicity or implicity associated with a profiling rule. 
 The User Administration utility has a tab to setup the profiling rule associated with a user:
 </p>            
-<img src='adminguide/images/user-profile.jpg' border="0"/>
+<img src='images/user-profile.jpg' border="0"/>
 <p>
 Additionally, you can associate users with profiling rules in the XML seed data configuration:
 </p>
@@ -316,12 +316,12 @@
         	<li><b>Profiling Rule:</b> choose a profiling rule to assign to the new user that has built in subsite support such as the example used in this document: <b>subsite-by-hostname</b>.</li>
         	<li><b>Subsites:</b> from the dropdown select the subsite to assign as the home subsite to the new user, or leave blank to use default /_user home.</li>
         	</ul>
-        <img src='adminguide/images/newuser-subsite-admin.png' border="0"/>        
+        <img src='images/newuser-subsite-admin.png' border="0"/>        
         	<p>When using the <b>subsite-by-hostname</b> profiling rule, make sure to select a subsite from the subsites drop-down, as these two attributes work together.
         	The rule is the instructions on where to look for home pages, and the subsite selection tells the profiling rule which subsite will hold this user directory</p>
         	<p>Subsite management can also be delegated to managers of particular subsites. For example, you may want to setup User Manager Administration pages for each subsite.
         	By modifying the deployment descriptor for the j2-admin application, each User Manager details portlet can be configured with a different default subsite:</p>
-        <img src='adminguide/images/subsite-fields.png' border="0"/>                        	        	
+        <img src='images/subsite-fields.png' border="0"/>                        	        	
        </section> 	
         <section name="Administering Subsites with User Registration">
             <p>When creating a new user from the User Registration portlet, you can specify two fields to enable and configure subsite behavior for that new user:
@@ -330,7 +330,7 @@
         	<li><b>rulesValues:</b> choose a profiling rule to assign to the new user that has built in subsite support such as the example used in this document: <b>subsite-by-hostname</b>.</li>
         	<li><b>subsiteRootFolder:</b> the full path to one unique subsite root folder.</li>
         	</ul>        	
-        <img src='adminguide/images/user-reg-subsite.png' border="0"/>                        	
+        <img src='images/user-reg-subsite.png' border="0"/>                        	
         	<p>NOTE: the User Registration portlet will store these preference values on a per user basis. Usually this means the preferences are stored for the administrative user only.
         	If you will have administrators registering users, then this approach works fine. However, with <b>self-registration</b> portal, you will need to set these values in the defaults for the portlet.
         	The defaults are usually set in the portlet.xml, for example:

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-attributes.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-attributes.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-attributes.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-attributes.xml Tue Mar  3 00:43:47 2009
@@ -28,12 +28,12 @@
       <p>
         Jetspeed-2 is provided with several Administrative Portlets, including for User Management.<br/>
         Using the User Management Portlets, it is very easy to define or modify concrete attributes for a user:</p>      
-      <img src="adminguide/images/definingUserAttributes.jpg"/>
+      <img src="images/definingUserAttributes.jpg"/>
       <p>
         The User Info Test demo Portlet, default deployed in Jetspeed-2 and displayed on the start page, uses
         the above example User Attribute definitions and displays the values for the logged on user (also showing that
         these can be accessed from both the PortletRequest as well as the HttpServletRequest from within a servlet):</p>
-      <img src="adminguide/images/usingUserAttributes.jpg"/>
+      <img src="images/usingUserAttributes.jpg"/>
     </section>
   </body>
 </document>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-profiler.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-profiler.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/user-profiler.xml Tue Mar  3 00:43:47 2009
@@ -33,7 +33,7 @@
 has a tab for editing user profile information:
 </p>
 <p>    
-<img src="adminguide/images/user-profile-locator.jpg" border="1"/>               
+<img src="images/user-profile-locator.jpg" border="1"/>               
 </p>
 <p>
 Often, profiling rules are determined and then associated by portal-specific logic during user registration (or self-registration).    

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/users.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/users.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/users.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/adminguide/users.xml Tue Mar  3 00:43:47 2009
@@ -22,39 +22,281 @@
 		<authors>
 			<person name="David Sean Taylor" email="taylor@apache.org" />
 			<person name="Jody McAlister" email="jmcalister@onehippo.com" />
+			<person name="Niels van Kampenhout" email="n.vankampenhout@onehippo.com"/>
 		</authors>
 	</properties>
 	<body>
 		<section name="User Administration Guide">
 			<p>
-				Administering users with Jetspeed. 
-				<br/><br/>
+				User Management is where you manage individual portal users. You can create new users, and edit or remove existing users.
+				You can set a user's password, and manage a user's attributes, roles, group memberships, and profiling rules.
+				The User Management page is located inside the Jetspeed Administrative Portlets section.
+				The User Management page is the first tab on the administrative menu across the top.
+				Here you see the User Browser on the left, and the User Details on the right.
 			</p>
 		</section>
 		<section name="The User Browser">
 			<p>
-			TODO: overview, screenshot			
+				The User Browser portlet lists all portal users, and allows you to search for
+				a particular user.
 			</p>
-			<subsection name="Paging">
 			<p>
+				<img src="images/userbrowser.png"/>	
 			</p>
+			<subsection name="Paging">
+				<p>
+					If there are more than 10 users in the system, the user listing is spread over
+					several pages each displaying 10 users. You can navigate through the pages
+					using the buttons right below the listing. Clicking on the "Refresh" button
+					will reset the user listing to the first page.
+				</p>
+				<p>
+					<img src="images/pagingbuttons.png"/>
+				</p>
 			</subsection>
 			<subsection name="Searching">
-			<p>
-			</p>
+				<p>
+					You can search for a particular user by entering the username or part of the username
+					in the search text box. After clicking on the "Search" button, the user listing
+					will show the search results, starting with the user that best matched your search
+					query, followed by increasingly less matching users.
+				</p>
+				<p>
+					<img src="images/usersearch.png"/>
+				</p>
 			</subsection>
 			<subsection name="Filtering">
-			<p>
-			</p>
+				<p>
+					To get only exact matches when searching for (part of) a particular username, check the "filter"
+					checkbox below the search text box.
+				</p>
+				<p>
+					<img src="images/userfilter.png"/>
+				</p>
 			</subsection>
 			<subsection name="Selecting for Edit">
-			<p>
-			</p>
+				<p>
+					To select one of the users in the listing for editing, click on the username.
+					A small arrow will appear in front of the username to indicate it is currently
+					selected, and the user's details will be loaded in the User Details Information
+					portlet.
+				</p>
+				<p>
+					<img src="images/userselected.png"/>
+				</p>
 			</subsection>		
 		</section>
+		
+		<section name="User Detail Information">
+			<p>
+				The User Detail Information portlet allows you to manage a particular user's
+				attributes, credentials, roles, group memberships, and profiles. Each of these
+				is represented on a different tab in the portlet.
+			</p>
+			<p>
+				<img src="images/userdetailsmall.png"/>
+			</p>
+			<subsection name="User Attributes">
+				<p>
+					User attributes are any kind of information you might want to store about your
+					users in your portal. Examples are first and last name, address, phone number,
+					or organization dependant attributes such as employee or student number.
+					Each attribute is a simple name-value pair. You can create as many attributes
+					as you like.
+				</p>
+				<p>
+					User attributes for a user are managed within the "Attributes" tab. Existing
+					attributes for the selected user are displayed in a list. The values of the attributes
+					can be edited directly in the text boxes in the "Value" column. To store your
+					changes, check the checkbox in front of each attribute you changed, and click
+					on the "Update" button. To remove attributes, check the checkbox in front of each attribute
+					you wish to delete, and click on  the "Remove" button.
+				</p>
+				<p>
+					To create a new attribute, enter a name and a value in the form directly below the
+					attribute listing. You can enter anything for the name and value. Click on the "Add"
+					button to store the new attribute. Note that if you use the name of an
+					existing attribute, its value will be overwritten.
+				</p>
+				<p>
+					For more details on user attributes see <a href="user-attributes.html">User Attributes</a>.
+				</p>
+				<p>
+					<img src="images/userdetailattribute.png"/>
+				</p>
+			</subsection>
+			<subsection name="Password Credentials">
+				<p>
+					For details on managing user credentials see <a href="credentials.html">Credentials</a>.
+				</p>
+			</subsection>
+			<subsection name="Role">
+				<p>
+					On the "Role" tab you can manage the roles that the currently selected user has been assigned. The roles itself
+					can be managed on the <a href="roles.html">Role Management</a> page. The roles the selected user
+					currently has been assigned are listed. You can assign a new role to the user by selecting a role
+					from the dropdown, and clicking on the "Add" button. The new role will immediately appear in the listing.
+					To remove a role, check the role's checkbox in the listing and click on the "Remove" button. The role
+					will disappear from the listing.
+				</p>
+				<p>
+					<img src="images/userdetailrole.png"/>
+				</p>
+			</subsection>
+			<subsection name="Group">
+				<p>
+					On the "Group" tab you can manage the group memberships of the currently selected user. The groups itself
+					can be managed on the <a href="groups.html">Group Management</a> page. The groups the selected user
+					currently is a member of are listed. You can add a user to a group by selecting the group
+					from the dropdown, and clicking on the "Add" button. The group will immediately appear in the listing.
+					To remove a user from a group, check the group's checkbox in the listing and click on the "Remove" button. The group
+					will disappear from the listing.
+				</p>
+				<p>
+					<img src="images/userdetailgroup.png"/>
+				</p>
+			</subsection>
+			<subsection name="Profile">
+				<p>
+					See <a href="user-profiler.html">User Profile</a> for details.
+				</p>
+			</subsection>
+			<subsection name="Deleting a User">
+				<p>
+					To remove a user from the system, click on the "Remove User" button.
+					A message will be shown "Node has been removed". Be aware that this action is permanent! 
+				</p>
+				<p>
+					<img src="images/userremoveuser.png"/> 
+				</p>
+				<p>
+					TODO screenshot of feedback message "Node has been removed"
+				</p>
+			</subsection>
+			<subsection name="User Details Configuration">
+				<p>
+					Configuring a User Details portlet in Edit Mode allows you to customize the view of the User Details administration window. 
+					Each tab can be optionally shown or hidden. Also, default values for roles, new user, required role, profile, user template, 
+					subsite root folder and default subsite new user can be set.
+				</p>
+				<p>
+					<img src="images/userdetailedit.png"/>
+				</p>
+				<table>
+					<tr>
+						<th>Field</th>
+						<th>Description</th>            
+					</tr>
+					<tr>
+						<td>Show User Tab</td>
+						<td>Show or hide the User tab.</td>
+					</tr>
+					<tr>
+						<td>Show Attributes Tab</td>
+						<td>Show or hide the Attributes tab.</td>
+					</tr>
+					<tr>
+						<td>Show Password Tab</td>
+						<td>Show or hide the Password tab.</td>
+					</tr>
+					<tr>
+						<td>Show Password Expiration</td>
+						<td>Show the password expiration date on the Password tab, and the options to activate/expire/extend the password.</td>
+					</tr>
+					<tr>
+						<td>Show Role Tab</td>
+						<td>Show or hide the Role tab.</td>
+					</tr>
+					<tr>
+						<td>Show Group Tab</td>
+						<td>Show or hide the Group tab.</td>
+					</tr>
+					<tr>
+						<td>Show Profile Tab</td>
+						<td>Show or hide the Profile tab.</td>
+					</tr>
+					<tr>
+						<td>Show Password on User Tab</td>
+						<td>Show or hide password information User tab. If enabled, User Tab effectively offers the same functionality as the Password tab.</td>
+					</tr>
+					<tr>
+						<td>Define default "Change Password Required on First Login" for new User</td>
+						<td>Show or hide the option to set "Change Password Required on First Login" in the Add User form.</td>
+					</tr>
+					<tr>
+						<td>Define default Role for new User</td>
+						<td>Show or hide the option to define a default role in the Add User form.</td>
+					</tr>
+					<tr>
+						<td>Define default Profile for new User</td>
+						<td>Show or hide the option to define a default profile in the Add User form.</td>
+					</tr>
+					<tr>
+						<td>Allow assignment of Subsite for new User</td>
+						<td>Show or hide the option to define a default subsite in the Add User form.</td>
+					</tr>
+					<tr>
+						<td>Default "Change Password Required on First Login"</td>
+						<td>Check or uncheck the "Change Password Required on First Login" checkbox in the Add User form (if enabled by checking Define 
+							default "Change Password Required on First Login" for new User, see above).</td>
+					</tr>
+					<tr>
+						<td>Default Role for new User</td>
+						<td>Pre-select a role in the Default Role dropdown in the Add User form.</td>
+					</tr>
+					<tr>
+						<td>Required Role for new User</td>
+						<td>Sets a required role for new users, that gets assigned to each new user regardless of the Default Role setting.</td>
+					</tr>
+					<tr>
+						<td>Default Profile for new User</td>
+						<td>Pre-select a profile in the Defaylt Profile dropdown in the Add User form.</td>
+					</tr>
+					<tr>
+						<td>New User Template Directory</td>
+						<td>TODO</td>
+					</tr>
+					<tr>
+						<td>Subsite Root Folder</td>
+						<td>TODO</td>
+					</tr>
+					<tr>
+						<td>Default Subsite for new User</td>
+						<td>TODO</td>
+					</tr>
+				</table>
+				<!--
+				<p>
+					The User Details configuration is useful for delegated security scenarios. For example, setting up a User Management 
+					page for all users with the Developer role. First, setup the User Browser preference to FilterByRole on Developer. 
+					Then you can assign a default role, required role, new user template, and subsite area all for new developers, managed 
+					by a user with the DeveloperManager role. This user then can create only developer type users complete with the correct 
+					roles and user templates. The edit mode of the User Details portlet can be secured so that the global admin can only 
+					edit the configuration, limiting the development manager to only creating or deleting developers.
+				</p>
+				-->
+			</subsection>               
+		</section>  
+		
+		
 		<section name="Adding a New User">
 			<p>
-			TODO: overview, screenshot
+				New users can be entered through the User Details portlet. If you haven't selected any user from the 
+				User Browser yet, the User Details portlet will show the "Add User" form. If you did select a user,
+				click on the "Add New User" button in the bottom of the portlet to go to the "Add User" form.
+			</p>
+			<p>
+				<img src="images/useradduserbutton.png"/>
+			</p>
+			<p>
+				<img src="images/userdetailnormal.png"/>
+			</p>
+			<p>
+				From here you can create a new user. Choose a unique username with no spaces. Then enter a secure password. 
+				You can require the password to be changed on the first login. You can also select the default role assigned 
+				to this user, as well as a default profiling rule. Last, you can assign this user to a subsite.
+			</p>
+			<!--
 			<table>
 			<tr>
 			<th>Field</th>
@@ -85,58 +327,8 @@
 			<td></td>
 			</tr>
 			</table>
-			</p>
+			-->
 		</section>
-		<section name="User Detail Information">
-		<p>
-		</p>
-		<subsection name="User Attributes">
-		<p>
-		</p>
-		</subsection>
-		<subsection name="Password Credentials">
-		<p>
-		see Security docs, screenshot, paste in here
-		</p>
-		</subsection>
-		<subsection name="Role">
-		<p>
-		</p>
-		</subsection>
-		<subsection name="Group">
-		<p>
-		</p>
-		</subsection>
-		<subsection name="Profile">
-		<p>
-		</p>
-		</subsection>
-		<subsection name="Deleting a User">
-		<p>
-		</p>
-		</subsection>
-		</section>	
-		<subsection name="User Details Configuration">
-		<p>
-		Configuring a User Details portlet in Edit Mode allows you to customize the view of the User Details administration window. 
-		Each tab can be optoinally show or hidden. Also, default values for roles, new user, required role, profile, user template, subsite root folder and default subsite new user can be set.
-	
-			TODO: overview, screenshot -- convert http://portals.apache.org/jetspeed-2.1.3/faq.html to here, put a link on FAQ to this page
-			<table>
-			<tr>
-			<th>Field</th>
-			<th>Description</th>			
-			</tr>
-			<tr>
-			<td></td>
-			<td></td>
-			</tr>
-			<tr>
-			<td></td>
-			<td></td>
-			</tr>
-			</table>
-		</p>		
-		</subsection>				
+
 	</body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-prefs.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-prefs.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/preferences-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/preferences-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/preferences-schema.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/preferences-schema.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml?rev=749499&r1=749498&r2=749499&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml Tue Mar  3 00:43:47 2009
@@ -71,6 +71,7 @@
             <item name="Statistics" href="devguide/dev-statistics.html" />
 	        <item name="Localization" href="devguide/guide-l10n.html" />
             <item name="Pipeline" href="devguide/pipeline.html" />
+            <item name="Preferences" href="devguide/dev-prefs.html"/>
             <item name="Profiler" href="devguide/guide-profiler.html" />
             <item name="Profiler IP" href="devguide/guide-profiler-ip.html" />
             <item name="PSML" href="devguide/guide-psml.html" />



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org