Overview

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 -r1.27.2.2 -r1.27.2.3 --- openacs-4/packages/acs-core-docs/www/kernel-overview.html 12 Dec 2010 00:07:02 -0000 1.27.2.2 +++ openacs-4/packages/acs-core-docs/www/kernel-overview.html 12 Dec 2010 01:37:24 -0000 1.27.2.3 @@ -1,10 +1,5 @@ -<<<<<<< kernel-overview.html - -Overview

Prev	Chapter 15. Kernel Documentation	Next

Overview

-======= -Overview
Prev Chapter 14. Kernel Documentation Next
Overview
- ->>>>>>> 1.29 +Overview
  Prev Chapter 15. Kernel Documentation Next
  Overview
  The OpenACS Kernel, which handles system-wide necessities such as metadata, security, users and groups, subsites, and package @@ -27,10 +22,5 @@
  This document provides a high level overview of the kernel -<<<<<<< kernel-overview.html - package. Documentation for other packages on this server -
  Prev Home Next
  Chapter 15. Kernel Documentation Up Object Model Requirements
  docs@openacs.org
  View comments on this page at openacs.org -======= package. Documentation for other packages on this server -
Prev Home Next
Chapter 14. Kernel Documentation Up Object Model Requirements
docs@openacs.org
View comments on this page at openacs.org ->>>>>>> 1.29 +
Prev Home Next
Chapter 15. Kernel Documentation Up Object Model Requirements
docs@openacs.org
View comments on this page at openacs.org