Index: openacs-4/packages/acs-core-docs/www/configuring-install-packages.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/configuring-install-packages.html,v diff -u -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/acs-core-docs/www/configuring-install-packages.html 12 Dec 2010 00:07:02 -0000 1.6.2.2 +++ openacs-4/packages/acs-core-docs/www/configuring-install-packages.html 12 Dec 2010 01:37:24 -0000 1.6.2.3 @@ -2,11 +2,7 @@ Installing OpenACS packages

Installing OpenACS packages

by Jade Rubick

OpenACS docs are written by the named authors, and may be edited by OpenACS documentation staff. -<<<<<<< configuring-install-packages.html -

Installing OpenACS packages

An OpenACS package extends your website and lets it do -======= -

Installing OpenACS packages

An OpenACS package extends your website and lets it do ->>>>>>> 1.8 +

Installing OpenACS packages

An OpenACS package extends your website and lets it do things it wasn't able to do before. You can have a weblog, a forums, a calendar, or even do sophisticated project-management via your website.

After you've installed OpenACS, you can congratulate