Index: openacs-4/packages/acs-core-docs/www/install-next-add-server.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/install-next-add-server.html,v diff -u -N -r1.13.2.2 -r1.13.2.3 --- openacs-4/packages/acs-core-docs/www/install-next-add-server.html 12 Dec 2010 00:07:02 -0000 1.13.2.2 +++ openacs-4/packages/acs-core-docs/www/install-next-add-server.html 12 Dec 2010 01:37:24 -0000 1.13.2.3 @@ -1,12 +1,6 @@ -<<<<<<< install-next-add-server.html - -Running multiple services on one machine

Running multiple services on one machine

Services on different ports. To run a different service on another port but the same - ip, simply repeat Install OpenACS 5.6.0 replacing -======= Running multiple services on one machine

Running multiple services on one machine

Services on different ports. To run a different service on another port but the same ip, simply repeat Install OpenACS 5.6.0 replacing ->>>>>>> 1.15 $OPENACS_SERVICE_NAME, and change the

set httpport              8000
 set httpsport             8443