svn commit: r1801299 - in /directory/site/trunk/content/fortress: history.mdtext user-guide.mdtext

[sm...@apache.org]

Author: smckinney
Date: Sat Jul  8 15:39:16 2017
New Revision: 1801299

URL: http://svn.apache.org/viewvc?rev=1801299&view=rev
Log:
add apacheds on docker link to user guide

Modified:
    directory/site/trunk/content/fortress/history.mdtext
    directory/site/trunk/content/fortress/user-guide.mdtext

Modified: directory/site/trunk/content/fortress/history.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/fortress/history.mdtext?rev=1801299&r1=1801298&r2=1801299&view=diff
==============================================================================
--- directory/site/trunk/content/fortress/history.mdtext (original)
+++ directory/site/trunk/content/fortress/history.mdtext Sat Jul  8 15:39:16 2017
@@ -2,7 +2,7 @@
 
 In 2009 a small team of developers[1], who are brothers, began work on the *Open Access Manager* project.  From its onset, the push behind this project was to build a fully functioning access control system that is based on  open standards and wholly open source.  In particular, Role-Based Access Control (ANSI INCITS 359) was a focal point, although that adherence brought with it a need for expanded coverage into other areas like auditing and administration.  After a couple of years of coding in their spare time, the brothers unveiled the project at the 2011 LDAPCon in Heidelberg, and with it a new name - *Fortress*.  At the same time, it was announced that the OpenLDAP foundation would sponsor the project and it would be released under a BSD-style variant of an Open Source Software license.
 
-That first release, back in 2011, included just the fortress core and realm components, but development of the web interface (commander) and rest server (enmasse) was already underway.  A few more years saw many more releases and the eventual completion of the commander and enmasse rounding out the entire product line into what's available today.
+That first release, back in 2011, included just the fortress core and realm components, but development of the web interface (commander) and rest server (enmasse) was already underway.  A few more years saw many more releases and the eventual completion of the others rounding out the entire product line into what's available today.
 
 Eventually, it was understood that nights and weekends of a few developers isn't enough and so if the fortress concept was to survive, it had to be carried into a larger field.  In 2014 the Fortress project moved from its OpenLDAP foundation home into the ASF as a subproject of the Apache Directory.
 

Modified: directory/site/trunk/content/fortress/user-guide.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/fortress/user-guide.mdtext?rev=1801299&r1=1801298&r2=1801299&view=diff
==============================================================================
--- directory/site/trunk/content/fortress/user-guide.mdtext (original)
+++ directory/site/trunk/content/fortress/user-guide.mdtext Sat Jul  8 15:39:16 2017
@@ -18,11 +18,11 @@ Notice: Licensed to the Apache Software
 
 # Fortress User's Guide
 
-This guide is primarily for people new to Fortress. It will guide through the concepts and how to use Fortress.
+This guide is primarily for people new to Fortress. It will guide through basic concepts.
 
 ## About this guide
 
-Learn the basics of how to download, install and configure an Apache Fortress instance using ApacheDS or OpenLDAP as the datastore.  Over time we'll add documents covering more advanced topics.
+Learn what RBAC is and how to download, install and configure an Apache Fortress instance using ApacheDS or OpenLDAP as the datastore.  Over time we'll add documents covering more advanced topics.
 
 ## Table of contents
 
@@ -42,7 +42,7 @@ Learn the basics of how to download, ins
 * [3 - Fortress Configuration](user-guide/3-configuration.html)
 * 4 - Install
     * [4.1 - Apache Fortress Core & ApacheDS QUICKSTART](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-APACHEDS.md)
-    * [4.2 - Apache Fortress Core & OpenLDAP QUICKSTART](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-SLAPD.md)
-    * [4.3 - Apache Fortress Core & OpenLDAP QUICKSTART on DOCKER](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-DOCKER-SLAPD.md)
-    * [4.4 - Apache Fortress Web & Tomcat QUICKSTART](https://github.com/apache/directory-fortress-commander/blob/master/README-QUICKSTART.md)
-
+    * [4.2 - Apache Fortress Core & ApacheDS QUICKSTART on DOCKER](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-DOCKER-APACHEDS.md)
+    * [4.3 - Apache Fortress Core & OpenLDAP QUICKSTART](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-SLAPD.md)
+    * [4.4 - Apache Fortress Core & OpenLDAP QUICKSTART on DOCKER](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-DOCKER-SLAPD.md)
+    * [4.5 - Apache Fortress Web & Tomcat QUICKSTART](https://github.com/apache/directory-fortress-commander/blob/master/README-QUICKSTART.md)