Index: openacs-4/packages/acs-core-docs/www/tutorial-categories.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-categories.html,v diff -u -N -r1.11.2.2 -r1.11.2.3 --- openacs-4/packages/acs-core-docs/www/tutorial-categories.html 12 Dec 2010 00:07:03 -0000 1.11.2.2 +++ openacs-4/packages/acs-core-docs/www/tutorial-categories.html 12 Dec 2010 01:37:25 -0000 1.11.2.3 @@ -1,10 +1,5 @@ -<<<<<<< tutorial-categories.html - -Categories

Categories

extended by Nima Mazloumi

-======= -Categories

Categories

extended by Nima Mazloumi

->>>>>>> 1.13 +Categories

Categories

extended by Nima Mazloumi

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

You can associate any ACS Object with one or more categories.