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

Security Requirements

By Richard Li

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

Security Requirements

By Richard Li

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

Security Requirements

By Richard Li

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

Introduction