Index: openacs-4/packages/acs-core-docs/www/security-design.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/security-design.html,v diff -u -r1.31.2.2 -r1.31.2.3 --- openacs-4/packages/acs-core-docs/www/security-design.html 12 Dec 2010 00:07:02 -0000 1.31.2.2 +++ openacs-4/packages/acs-core-docs/www/security-design.html 12 Dec 2010 01:37:25 -0000 1.31.2.3 @@ -1,10 +1,5 @@ -<<<<<<< security-design.html - -Security Design
Alex logo
Prev Chapter 15. Kernel Documentation Next

Security Design

By Richard Li and Archit Shah

-======= -Security Design
Alex logo
Prev Chapter 14. Kernel Documentation Next

Security Design

By Richard Li and Archit Shah

->>>>>>> 1.33 +Security Design
Alex logo
Prev Chapter 15. Kernel Documentation Next

Security Design

By Richard Li and Archit Shah

OpenACS docs are written by the named authors, and may be edited by OpenACS documentation staff.

Essentials

Introduction