Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml,v
diff -u -r1.52 -r1.52.2.1
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	27 Jun 2015 17:19:13 -0000	1.52
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	10 Jun 2016 07:35:08 -0000	1.52.2.1
@@ -520,7 +520,7 @@
           file:
           </para>
           <programlisting>
-   			&lt;a href="@category_map_url@"&lt;#categories.Site_wide_Categories#&lt;/a&gt;
+   	          &lt;a href="@category_map_url@"&gt;#&shy;categories.Site_wide_Categories#&lt;/a&gt;
           </programlisting>     
           <para>The link created by the above code (<computeroutput>category_map_url</computeroutput>) 
           will take the admin to the generic
@@ -547,8 +547,8 @@
           switch to the <computeroutput>ad_form</computeroutput> command. Here's the "meat" of the
           <computeroutput>note-edit.tcl</computeroutput> page:</para>
           <programlisting>
-			    #extend the form to support categories
-			    set package_id [ad_conn package_id]
+			# extend the form to support categories
+			set package_id [ad_conn package_id]
 			    
     			category::ad_form::add_widgets -form_name note -container_object_id $package_id -categorized_object_id [value_if_exists item_id]
 
@@ -608,7 +608,8 @@
 &lt;/queryset&gt;</programlisting>
       <para>And the adp page:</para>
       <screen>[$OPENACS_SERVICE_NAME@yourserver www]$ <userinput>emacs note-delete.adp</userinput></screen>
-      <programlisting>&lt;master&gt;
+      <programlisting>
+&lt;master&gt;
 &lt;property name="title"&gt;@title@&lt;/property&gt;
 &lt;property name="context"&gt;{@title@}&lt;/property&gt;
 &lt;h2&gt;@title@&lt;/h2&gt;
@@ -635,7 +636,7 @@
           <programlisting>
 			&lt;a href=configure?&lt;%=[export_vars -url {return_url}]%&gt;&gt;Configure&lt;/a&gt;
 			&lt;if @use_categories_p@&gt;
-   			&lt;a href="@category_map_url@"&lt;#categories.Site_wide_Categories#&lt;/a&gt;
+   			&lt;a href="@category_map_url@"&gt;#&shy;categories.Site_wide_Categories#&lt;/a&gt;
    			&lt;/if&gt;
           </programlisting>
           <para>Now create a configure page</para>
@@ -782,13 +783,12 @@
  	  <para>Finally you need a an <computeroutput>index.vuh</computeroutput> in your 
  	  www folder to rewrite the URLs correctly, <xref linkend="tutorial-vuh"/>:</para>
  	  <programlisting>
- 	  	set url /[ad_conn extra_url]
+ 	  set url /[ad_conn extra_url]
 
-		if {[regexp {^/+cat/+([^/]+)/*} $url \
-          ignore_whole category_id]} {
-          rp_form_put category_id $category_id
-		}
-		rp_internal_redirect "/packages/YOURPACKAGE/www/index" 	  
+	  if {[regexp {^/+cat/+([^/]+)/*} $url ignore_whole category_id]} {
+              rp_form_put category_id $category_id
+	  }
+	  rp_internal_redirect "/packages/YOURPACKAGE/www/index" 	  
  	  </programlisting>
  	  <para>Now when ever the user select a category only notes that belong to this category are displayed.</para>
  	  </listitem>  
@@ -1494,34 +1494,34 @@
 	<para>All you need now is a configuration page where the user can change this setting. Create a 
 	<code>configure.tcl</code> file:</para>
 	<programlisting>
-	ad_page_contract {
+ad_page_contract {
 
-    	This page allows a faq admin to change the UseWysiwygP setting
+    This page allows a faq admin to change the UseWysiwygP setting
 
-	} {
-    	{return_url ""}
-	}
+} {
+    {return_url ""}
+}
 
-	set title "Should we support WYSIWYG?"
-	set context [list $title]
+    set title "Should we support WYSIWYG?"
+    set context [list $title]
 
-	set use_wysiwyg_p
+    set use_wysiwyg_p
 
-	ad_form -name categories_mode -form {
-    	{enabled_p:text(radio)
-        	{label "Enable WYSIWYG"}
-        	{options {{Yes t} {No f}}}
-        	{value $use_wysiwyg_p}
-    	}
-    	{return_url:text(hidden) {value $return_url}}
-    	{submit:text(submit) {label "Change"}}
-	} -on_submit {
-    	parameter::set_value  -parameter "UseWysiwygP" -value $enabled_p
-    	if {$return_url ne ""} {
-        	ns_returnredirect $return_url
-    	}
-	}
-	</programlisting>
+    ad_form -name categories_mode -form {
+        {enabled_p:text(radio)
+       	    {label "Enable WYSIWYG"}
+            {options {{Yes t} {No f}}}
+            {value $use_wysiwyg_p}
+        }
+        {return_url:text(hidden) {value $return_url}}
+        {submit:text(submit) {label "Change"}}
+    } -on_submit {
+        parameter::set_value  -parameter "UseWysiwygP" -value $enabled_p
+        if {$return_url ne ""} {
+            ns_returnredirect $return_url
+        }
+    }
+</programlisting>
 	<para>In the corresponding ADP file write</para>
 	<programlisting>
 	&lt;master&gt;