Index: openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html,v diff -u -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html 12 Dec 2010 00:07:03 -0000 1.6.2.2 +++ openacs-4/packages/acs-core-docs/www/tutorial-wysiwyg-editor.html 12 Dec 2010 01:37:26 -0000 1.6.2.3 @@ -1,10 +1,5 @@ -<<<<<<< tutorial-wysiwyg-editor.html - -Enabling WYSIWYG

Enabling WYSIWYG

by Nima Mazloumi

-======= -Enabling WYSIWYG

Enabling WYSIWYG

by Nima Mazloumi

->>>>>>> 1.8 +Enabling WYSIWYG

Enabling WYSIWYG

by Nima Mazloumi

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

Most of the forms in OpenACS are created using the form builder, see Using Form Builder: building html forms dynamically. For detailed information on the