Index: openacs-4/packages/acs-core-docs/www/subsites-design.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/subsites-design.html,v diff -u -r1.31.2.2 -r1.31.2.3 --- openacs-4/packages/acs-core-docs/www/subsites-design.html 12 Dec 2010 00:07:03 -0000 1.31.2.2 +++ openacs-4/packages/acs-core-docs/www/subsites-design.html 12 Dec 2010 01:37:25 -0000 1.31.2.3 @@ -1,19 +1,10 @@ -<<<<<<< subsites-design.html - -Subsites Design Document

Subsites Design Document

By Rafael H. Schloming

-======= -Subsites Design Document

Subsites Design Document

By Rafael H. Schloming

->>>>>>> 1.33 +Subsites Design Document

Subsites Design Document

By Rafael H. Schloming

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

*Note* This document has not gone through the any of the required QA process yet. It is being tagged as stable due to high -<<<<<<< subsites-design.html -demand.

Introduction

An OpenACS 4 subsite is a managed suite of applications that work together for -======= demand.

Introduction

An OpenACS 4 subsite is a managed suite of applications that work together for ->>>>>>> 1.33 a particular user community. This definition covers a very broad range of requirements: from a Geocities style homepage where a user can install whatever available application he wants (e.g. a single user could have their @@ -220,8 +211,4 @@ a particular configuration of site nodes/packages. As we build more fundamental applications that can be applied in more general areas, this feature will become more and more in demand since more problems will be -<<<<<<< subsites-design.html -solvable by configuration instead of coding.

View comments on this page at openacs.org
-======= solvable by configuration instead of coding.

View comments on this page at openacs.org
->>>>>>> 1.33