Index: openacs-4/packages/acs-core-docs/www/kernel-overview.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/kernel-overview.html,v diff -u -N -r1.27.2.1 -r1.27.2.2 --- openacs-4/packages/acs-core-docs/www/kernel-overview.html 18 Jun 2010 21:29:35 -0000 1.27.2.1 +++ openacs-4/packages/acs-core-docs/www/kernel-overview.html 12 Dec 2010 00:07:02 -0000 1.27.2.2 @@ -1,17 +1,22 @@ +<<<<<<< kernel-overview.html
+======= + +
+>>>>>>> 1.29 The OpenACS Kernel, which handles system-wide necessities such as metadata, security, users and groups, subsites, and package management and deployment. -
+
The OpenACS Core, which comprises all the other packages that ship with the kernel and are most frequently needed by users, such as templating, forums, and user registration/management. The packages tend to be developed and distributed with the kernel. -
+
OpenACS Application packages, which typically provide user-level @@ -22,5 +27,10 @@
This document provides a high level overview of the kernel +<<<<<<< kernel-overview.html package. Documentation for other packages on this server