Index: openacs-4/packages/acs-core-docs/www/security-notes.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/security-notes.html,v diff -u -N -r1.45.2.2 -r1.45.2.3 --- openacs-4/packages/acs-core-docs/www/security-notes.html 12 Dec 2010 00:07:03 -0000 1.45.2.2 +++ openacs-4/packages/acs-core-docs/www/security-notes.html 12 Dec 2010 01:37:25 -0000 1.45.2.3 @@ -1,10 +1,5 @@ -<<<<<<< security-notes.html - -Security Notes

Security Notes

By Richard Li

-======= -Security Notes

Security Notes

By Richard Li

->>>>>>> 1.47 +Security Notes

Security Notes

By Richard Li

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

@@ -59,10 +54,5 @@

The set of string match expressions in the procedure above should be extended appropriately for other registration pages. This procedure does not use -<<<<<<< security-notes.html -ad_parameter or regular expressions for performance reasons, as -it is called by the request processor.

($Id$)
View comments on this page at openacs.org
-======= ad_parameter or regular expressions for performance reasons, as it is called by the request processor.

($Id$)
View comments on this page at openacs.org
->>>>>>> 1.47