Index: openacs-4/packages/wiki/wiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/wiki.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wiki/wiki.info	13 Jun 2005 09:48:50 -0000	1.3
+++ openacs-4/packages/wiki/wiki.info	27 Sep 2005 12:46:10 -0000	1.4
@@ -7,16 +7,13 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.2d" url="http://openacs.org/repository/download/apm/wiki-0.2d.apm">
+    <version name="0.9d" url="http://openacs.org/repository/download/apm/wiki-0.9d.apm">
         <owner url="mailto:dave@thedesignexperience,org">Dave Bauer</owner>
-        <owner url="mailto:frank.bergmann@project-open.com">Frank Bergmann</owner>
         <summary>Wiki</summary>
         <description format="text/plain">Wiki implementation on the CR</description>
 
-        <provides url="wiki" version="0.2d"/>
-        <requires url="acs-kernel" version="5.1.4"/>
-        <requires url="cms" version="4.1.1"/>
-
+        <provides url="wiki" version="0.9d"/>
+        <requires url="acs-kernel" version="5.2.0a1"/>
         <callbacks>
             <callback type="after-install"  proc="wiki::install::package_install"/>
             <callback type="after-instantiate"  proc="wiki::install::after_instantiate"/>
Index: openacs-4/packages/wiki/lib/footer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/footer.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wiki/lib/footer.adp	13 Jun 2005 09:48:50 -0000	1.4
+++ openacs-4/packages/wiki/lib/footer.adp	27 Sep 2005 12:46:10 -0000	1.5
@@ -1,16 +1,5 @@
+<hr />
 <div>
-
-  [<a href="index">Home</a>]
-  | [<a href="Editing">Help</a>]
-  | [<a href="Category">Categories</a>]
-
-  <if @edit_link_p@ true> 
-    | [<a href="?edit">Edit This Page</a>]
-  </if>
-
-  <if @admin_p@ true> 
-    | [<a href="admin/index?folder_id=@folder_id@">Admin</a>]
-    | [<a href="admin/index?folder_id=@folder_id@&modified_only=1">Changes</a>]
-  </if>
-
-</div>
+<a href="doc/wiki-help">Help</a></li></ul>
+  <if @edit_link_p@ true> | <a href="?edit">Edit</a></if>
+    </div>
Index: openacs-4/packages/wiki/lib/footer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/footer.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wiki/lib/footer.tcl	13 Jun 2005 09:48:50 -0000	1.3
+++ openacs-4/packages/wiki/lib/footer.tcl	27 Sep 2005 12:46:10 -0000	1.4
@@ -5,7 +5,3 @@
     set edit_link_p "f"
 }
 
-if {![exists_and_not_null admin_p]} {
-    set admin_p "f"
-}
-
Index: openacs-4/packages/wiki/lib/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/new.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wiki/lib/new.tcl	13 Jun 2005 09:48:50 -0000	1.4
+++ openacs-4/packages/wiki/lib/new.tcl	27 Sep 2005 12:46:10 -0000	1.5
@@ -5,8 +5,6 @@
     item_id:integer,optional
 }
 
-if {"" == $name} { ad_return_complaint 1 "name is empty" }
-
 set folder_id [wiki::get_folder_id]
 set user_id [ad_conn user_id]
 set ip_address [ad_conn peeraddr]
@@ -21,30 +19,18 @@
 set edit ""
 ad_form -name new -action "new" -export {name edit} -form {
     item_id:key
-    {title:text {label "Title"} {html {size 60}}}
-    {content:text(textarea),optional,nospell {label "Content"} {html {rows 15 cols 60}}}
-    {revision_notes:text(textarea),optional,nospell {label "Revision Notes"} {html {rows 5 cols 60}}}
-
+    title:text
+    content:text(textarea)
+    revision_notes:text(textarea),optional
+    
 } -edit_request {
 
     #    content::item::get -item_id $item_id
-    db_1row get_item "
-	select 
-		cr_items.item_id, 
-		title, 
-		content 
-	from 
-		cr_items, 
-		cr_revisions 
-	where 
-		name=:name 
-		and parent_id=:folder_id 
-		and latest_revision=revision_id
-    "
-
+    db_1row get_item "select cr_items.item_id, title, content from cr_items, cr_revisions where name=:name and parent_id=:folder_id and latest_revision=revision_id"
+    
 }  -new_data {
 
-    set item_id [content::item::new \
+    content::item::new \
         -name $name \
         -parent_id $folder_id \
         -creation_user $user_id \
@@ -54,8 +40,9 @@
         -description $revision_notes \
         -is_live "t" \
         -storage_type "text" \
-        -mime_type "text/x-openacs-wiki"]
+        -mime_type "text/x-openacs-wiki"
 
+    
 } -edit_data {
 
     content::revision::new \
@@ -64,34 +51,16 @@
         -content $content \
         -description $revision_notes
 
-# fraber: After discussion with Dave: Let's use "live_version" to indicated an approved
-# version and use the latest_version for display.
-#    db_dml set_live "update cr_items set live_revision=latest_revision where item_id=:item_id"
+    db_dml set_live "update cr_items set live_revision=latest_revision where item_id=:item_id"
 
 } -after_submit {    
-
     # do something clever with internal refs
     set stream [Wikit::Format::TextToStream $content]
     set refs [Wikit::Format::StreamToRefs $stream "wiki::get_info"]
     if {![llength $refs]} {
         set refs [list ""]
     }
-
-    ns_log Notice "/wiki/lib/new.tcl: refs=$refs"
-
-    db_foreach get_ids "
-	select 
-		ci.item_id as ref_item_id 
-	from 
-		cr_items ci left join cr_item_rels cr on (cr.related_object_id=:item_id) 
-	where 
-		ci.parent_id = :folder_id 
-		and ci.name in ([template::util:::tcl_to_sql_list $refs]) 
-		and cr.rel_id is null
-    " {
-
-	ns_log Notice "/wiki/lib/new.tcl: content::item::relate: item_id=$item_id, ref_item_id=$ref_item_id, relation_tag=wiki_reference"
-
+    db_foreach get_ids "select ci.item_id as ref_item_id from cr_items ci left join cr_item_rels cr on (cr.related_object_id=:item_id) where ci.parent_id=:folder_id and ci.name in ([template::util:::tcl_to_sql_list $refs]) and cr.rel_id is null" {
         content::item::relate \
             -item_id $item_id \
             -object_id $ref_item_id \
Index: openacs-4/packages/wiki/lib/page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/page.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wiki/lib/page.adp	13 Jun 2005 09:48:50 -0000	1.4
+++ openacs-4/packages/wiki/lib/page.adp	27 Sep 2005 12:46:10 -0000	1.5
@@ -3,24 +3,13 @@
   <property name="header_stuff">@header_stuff@</property>
   <property name="context">@context@</property>
   <property name="focus">@focus@</property>
-
-<hr />
-<include src="footer" edit_link_p="@edit_link_p@" admin_p="@admin_p@" folder_id="@folder_id@" >
-<hr />
   
-<h1>@title@</h1>
-  
 @content;noquote@
 
-<if @related_items:rowcount@ gt 0>
-Pages that link to his page:
-<ul>
+<if @related_items:rowcount@ gt 0><p>Pages that link to his page:
 <multiple name="related_items">
-  <li><a href="@related_items.name@">@related_items.title@</a>
-</multiple>
-</ul>
-</if>
-
-<hr />
-<include src="footer" edit_link_p="@edit_link_p@" admin_p="@admin_p@" folder_id="@folder_id@">
-<hr />
+    <a href="@related_items.name@">@related_items.title@</a>
+    </multiple>
+    </p>
+    </if>
+<include src="footer" edit_link_p="@edit_link_p@" >
Index: openacs-4/packages/wiki/lib/page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/page.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wiki/lib/page.tcl	13 Jun 2005 09:48:50 -0000	1.4
+++ openacs-4/packages/wiki/lib/page.tcl	27 Sep 2005 12:46:10 -0000	1.5
@@ -5,8 +5,8 @@
     revision_id:optional
 }
 
-
-
+# 
+#
 # Show or edit wiki pages
 #
 # @author Dave Bauer (dave@thedesignexperience.org)
@@ -16,7 +16,7 @@
 
 set folder_id [wiki::get_folder_id]
 set name [ad_conn path_info]
-if {$name == ""} {
+if {$name eq ""} {
     # the path resolves directly to a site node
     set name "index"
 }
@@ -51,67 +51,21 @@
 }
 
 
-if {![info exists revision_id]} {
-    db_1row get_content "
-    	select 
-		content,
-		title 
-    	from 
-		cr_revisions, 
-		cr_items 
-    	where 
-		revision_id = latest_revision 
-		and cr_items.item_id=:item_id
-    "
-} else {
-    db_1row get_content "
-    	select 
-		content,
-		title 
-    	from 
-		cr_revisions
-    	where 
-		revision_id = :revision_id
-    "
-}
+db_1row get_content "select content,title from cr_revisions, cr_items where revision_id=live_revision and cr_items.item_id=:item_id"
 
-
 set stream [Wikit::Format::TextToStream $content]
 set refs [Wikit::Format::StreamToRefs $stream "wiki::get_info"]
+db_multirow related_items get_related_items "select cr.name, cr.title, cr.description from cr_revisionsx cr, cr_items ci, cr_item_rels cir where cir.related_object_id=:item_id and cir.relation_tag='wiki_reference' and ci.live_revision=cr.revision_id and ci.item_id=cir.item_id"
 
-db_multirow related_items get_related_items "
-	select distinct
-		cr.name, 
-		cr.title, 
-		cr.description 
-	from 
-		cr_revisionsx cr, 
-		cr_items ci, 
-		cr_item_rels cir 
-	where 
-		cir.related_object_id=:item_id 
-		and cir.relation_tag='wiki_reference' 
-		and ci.live_revision=cr.revision_id 
-		and ci.item_id=cir.item_id
-"
-
 set content [ad_wiki_text_to_html $content "wiki::get_info"]
 set context [list $title]
 set focus ""
 set header_stuff ""
-set page_title $title
 
 set edit_link_p [permission::permission_p \
                  -object_id $item_id \
                  -party_id [ad_conn user_id] \
                  -privilege "write"
              ]
 
-set edit_link_p "t"
-
-set admin_p [permission::permission_p \
-                 -object_id $folder_id \
-                 -party_id [ad_conn user_id] \
-                 -privilege "admin"
-             ]
-
+ad_return_template "page"
Index: openacs-4/packages/wiki/sql/postgresql/wiki-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/sql/postgresql/wiki-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wiki/sql/postgresql/wiki-create.sql	13 Jun 2005 09:48:50 -0000	1.3
+++ openacs-4/packages/wiki/sql/postgresql/wiki-create.sql	27 Sep 2005 12:46:10 -0000	1.4
@@ -2,18 +2,10 @@
 -- 
 -- 
 -- @author Dave Bauer (dave@thedesignexperience.org)
--- @author Frank Bergmann (frank.bergmann@project-open.com)
 -- @creation-date 2004-09-06
 -- @arch-tag: 0d6b6723-0e95-4c00-8a84-cb79b4ad3f9d
 -- @cvs-id $Id$
 --
 
--- there seems to be an error in CMS 4.1.x with 
--- the view "cr_revisioni". This error seems to be due
--- to the fact that the content type "content_revision" hasn't
--- been created correctly. Strange stuff...
---
-select content_type__refresh_view ('content_revision');
-
 insert into cr_mime_types values ('Text - Wiki','text/x-openacs-wiki','');
 insert into cr_mime_types values ('Text - Markdown','text/x-openacs-markdown','');
\ No newline at end of file
Index: openacs-4/packages/wiki/tcl/wiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/tcl/wiki-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wiki/tcl/wiki-procs.tcl	13 Jun 2005 09:48:50 -0000	1.4
+++ openacs-4/packages/wiki/tcl/wiki-procs.tcl	27 Sep 2005 12:46:10 -0000	1.5
@@ -35,25 +35,11 @@
     # ref doesn't exist yet
     # this sucks we have to hammer the databse for every link
     set package_id [ad_conn package_id]
-    set d [db_string get_lm "
-	select 
-		o.last_modified 
-	from 
-		acs_objects o, 
-		cr_items ci, 
-		cr_folders cf 
-	where 
-		cf.package_id = :package_id 
-		and ci.parent_id = cf.folder_id 
-		and ci.name = :ref 
-		and o.object_id = ci.item_id
-    " -default ""]
-
+    set d [db_string get_lm "select o.last_modified from acs_objects o, cr_items ci, cr_folders cf where cf.package_id=:package_id and ci.parent_id=cf.folder_id and ci.name=:ref and o.object_id=ci.item_id" -default ""]
     set ret [list "${ref}" "${ref}" "$d"]
-
     ns_log debug "
 DB --------------------------------------------------------------------------------
-DB DAVE debugging procedure wiki::get_info
+DB DAVE debugging procedure wiki::info
 DB --------------------------------------------------------------------------------
 DB ref = '${ref}'
 DB ret = '${ret}'
@@ -82,7 +68,7 @@
 } {
     # should really map site_nodes to cr_folders, but I
     # want to see what can be done with stock OpenACS
-    if {$package_id == ""} {
+    if {$package_id eq ""} {
        if  {[ad_conn -connected_p]} {
            set package_id [ad_conn package_id]
        } else {
@@ -116,8 +102,7 @@
     @creation-date 2004-09-03
 } {
     set stream [Wikit::Format::TextToStream $text]
-
-    # wiki::info will find the parent site node of a reference, and
+# wiki::info will find the parent site node of a reference, and
     # look for a proc called package-key::wiki_info which should
     # return the id, name, modified date of the item
     # (i think id means "url" but I might be wrong!)
@@ -150,7 +135,7 @@
     set ret [list "${ref}" "${ref}" "1"]
 #    ns_log debug "
 #DB --------------------------------------------------------------------------------
-#DB DAVE debugging procedure wiki::ad_wiki_info
+#DB DAVE debugging procedure wiki::info
 #DB --------------------------------------------------------------------------------
 #DB ref = '${ref}'
 #DB ret = '${ret}'
Index: openacs-4/packages/wiki/tcl/wikit-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/tcl/wikit-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wiki/tcl/wikit-procs.tcl	22 Feb 2005 16:15:13 -0000	1.2
+++ openacs-4/packages/wiki/tcl/wikit-procs.tcl	27 Sep 2005 12:46:10 -0000	1.3
@@ -111,20 +111,28 @@
 	foreach line [split $text \n] {
 	    # Per line, classify the it and extract the main textual information.
 	    foreach {tag depth txt aux} [linetype $line] break ; # lassign
-
+ns_log debug "
+DB --------------------------------------------------------------------------------
+DB DAVE debugging /var/lib/aolserver/openacs-5-2/packages/wiki/tcl/wikit-procs.tcl
+DB --------------------------------------------------------------------------------
+DB tag = '${tag}'
+DB depth = '${depth}'
+DB txt = '${txt}'
+DB aux = '${aux}' 
+DB --------------------------------------------------------------------------------"
 	    # Classification tags
 	    #
 	    # UL, OL, DL = Lists (unordered/bullet, ordered/enum,
 	    #                     definition/itemized)
 	    # PRE        = Verbatim / Quoted lines
 	    # HR         = Horizontal rule
 	    # STD        = Standard text
-
+            # H1,H2,H3,H4 = headers DAVEB
 	    ## Whenever we encounter a special line, not quoted, any
 	    ## preceding empty line has no further effect.
 	    #
 	    switch -exact -- $tag {
-		HR - UL - OL - DL {set empty_std 0}
+		HR - UL - OL - DL - H1 - H2 - H3 - H4 {set empty_std 0}
 		default {}
 	    }
 
@@ -133,7 +141,7 @@
 	    ## there is any.
 	    #
 	    switch -exact -- $tag {
-		HR - UL - OL - DL - PRE {
+		HR - UL - OL - DL - PRE - H1 - H2 - H3 - H4 {
 		    if {$paragraph != {}} {
 			lappend irep T 0 ; render $paragraph
 			set paragraph ""
@@ -152,6 +160,7 @@
 	    # PRE | 1             | text to display |
 	    # HR  | 0             | text of ruler   |
 	    # STD | 0             | text to display |
+            # H1-4| 1  DAVEB I have no clue how this works, I'll wing it!
 	    # ----+---------------+-----------------+---------------+---------------
 
 	    # HR     - Trivial
@@ -174,6 +183,10 @@
 		    lappend irep I 0 ; render $aux
 		    lappend irep D 0 ; render $txt
 		}
+                H1  {lappend irep A 0 ; render $txt} \
+                H2  {lappend irep B 0 ; render $txt} \
+                H3  {lappend irep C 0 ; render $txt} \
+                H4  {lappend irep E 0 ; render $txt} \
 		PRE {
 		    # Transform a preceding 'STD {}' into an empty Q line,
 		    # i.e make it part of the verbatim section, enforce
@@ -232,6 +245,12 @@
 	    UL	{^(   +)(\*) (\S.*)$}
 	    OL	{^(   +)(\d)\. (\S.*)$}
 	    DL	{^(   +)([^:]+):   (\S.*)$}
+            H4  {^()(====)(.*)====$}
+            H3  {^()(===)(.*)===$}
+            H2  {^()(==)(.*)==$}
+            H1  {^()(=)(.*)=$}
+
+                
 	} {
 	    # Compat: Remove restriction to multiples of 3 spaces.
 
@@ -630,6 +649,14 @@
 	set count 0
 	variable html_frag
 	foreach {mode text} $s {
+ns_log debug "
+DB --------------------------------------------------------------------------------
+DB DAVE debugging /var/lib/aolserver/openacs-5-2/packages/wiki/tcl/wikit-procs.tcl
+DB --------------------------------------------------------------------------------
+DB mode = '${mode}'
+DB text = '${text}'
+DB state = '${state}'
+DB --------------------------------------------------------------------------------"
 	    switch -exact -- $mode {
 		{}    {append result [quote $text]}
 		b - i {append result $html_frag($mode$text)}
@@ -683,7 +710,14 @@
 				[incr count] $html_frag(_a) \]
 		    }
 		}
-		T - Q - I - D - U - O - H {
+		T - Q - I - D - U - O - H - A - B - C - E {
+ns_log debug "
+DB --------------------------------------------------------------------------------
+DB DAVE debugging /var/lib/aolserver/openacs-5-2/packages/wiki/tcl/wikit-procs.tcl
+DB --------------------------------------------------------------------------------
+DB state = '${state}'
+DB mode = '${mode}'
+DB --------------------------------------------------------------------------------"
 		    append result $html_frag($state$mode)
 		    set state $mode
 		}
@@ -732,16 +766,72 @@
     vs I T  </dl><p> ;vs I Q </dl><pre> ;vs I U  </dl><ul><li> ;vs I O  </dl><ol><li>
     vs D T  </dl><p> ;vs D Q </dl><pre> ;vs D U  </dl><ul><li> ;vs D O  </dl><ol><li>
     vs H T       <p> ;vs H Q      <pre> ;vs H U       <ul><li> ;vs H O       <ol><li>
+    vs A T </h1><p> ;vs A Q </h1><pre>;vs A U </h1><ul><li> ;vs A O </h1><ol><li> 
+    vs B T </h2><p> ;vs B Q </h2><pre>;vs B U </h2><ul><li> ;vs B O </h2><ol><li> 
+    vs C T </h3><p> ;vs C Q </h3><pre>;vs C U </h3><ul><li> ;vs C O </h3><ol><li>             
+    vs E T </h4><p> ;vs E Q </h4><pre>;vs E U </h4><ul><li> ;vs E O </h4><ol><li> 
+            vs A B </h1><h2>; vs A C </h1><h3>
+            vs A A </h1><h1>; vs A E </h1><h4>
 
+            vs B A </h2><h1>; vs B C </h2><h3>
+            vs B B </h2><h2>; vs B E </h2><h4>
+
+            vs C A </h3><h1>; vs C C </h3><h3>
+            vs C B </h3><h2>; vs C E </h3><h4>
+
+            vs E A </h4><h1>; vs E C </h4><h3>
+            vs E B </h4><h2>; vs E E </h4><h4>                        
+            
     vs T I   </p><dl><dt> ;vs T D   </p><dl><dd>  ;vs T H   "</p><hr size=1>"  ;vs T _   </p>
     vs Q I </pre><dl><dt> ;vs Q D </pre><dl><dd>  ;vs Q H "</pre><hr size=1>"  ;vs Q _ </pre>
     vs U I  </ul><dl><dt> ;vs U D  </ul><dl><dd>  ;vs U H  "</ul><hr size=1>"  ;vs U _  </ul>
     vs O I  </ol><dl><dt> ;vs O D  </ol><dl><dd>  ;vs O H  "</ol><hr size=1>"  ;vs O _  </ol>
     vs I I           <dt> ;vs I D           <dd>  ;vs I H  "</dl><hr size=1>"  ;vs I _  </dl>
     vs D I           <dt> ;vs D D           <dd>  ;vs D H  "</dl><hr size=1>"  ;vs D _  </dl>
     vs H I       <dl><dt> ;vs H D       <dl><dd>  ;vs H H       "<hr size=1>"  ;vs H _     {}
-    #rename vs {}
+    vs A I </h1><dl><dt> ;vs A D </h1><dl><dd>  ;vs A H "/h1><hr size=1>" ;   
+    vs A _ </h1>
 
+    vs B I </h2><dl><dt> ;vs B D </h2><dl><dd>  ;vs B H "/h2><hr size=1>" ;   
+    vs B _ </h2>
+
+    vs C I </h3><dl><dt> ;vs C D </h3><dl><dd>  ;vs C H "/h3><hr size=1>" ;   
+    vs C _ </h3>
+
+    vs D I </h4><dl><dt> ;vs D D </h4><dl><dd>  ;vs D H "/h4><hr size=1>" ;   
+    vs D _ </h4>            
+
+            vs H A <h1>
+            vs H B <h2>
+            vs H C <h3>
+            vs H E <h4>
+            vs T A </p><h1>
+            vs T B </p><h2>
+            vs T C </p><h3>
+            vs T E </p><h4>
+            vs Q A </pre><h1>
+            vs Q B </pre><h2>
+            vs Q C </pre><h3>
+            vs Q E </pre><h4>
+            vs O A </ol><h1>
+            vs O B </ol><h2>
+            vs O C </ol><h3>
+            vs O E </ol><h4>
+            vs I A <h1>
+            vs I B <h2>
+            vs I C <h3>
+            vs I E <h4>
+            vs D A <h1>
+            vs D B <h2>
+            vs D C <h3>
+            vs D E <h4>
+            
+            
+            
+            
+            
+            #rename vs {}
+
     array set html_frag {
 	a_ {<a href="}  b0 </b>
 	_a {</a>}       b1 <b>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wiki/www/admin/index-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wiki/www/admin/index-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wiki/www/admin/index.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wiki/www/admin/index.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wiki/www/admin/index.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wiki/www/admin/update_latest_revision.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wiki/www/admin/update_live_revision.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/wiki/www/doc/wiki-help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/www/doc/wiki-help.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wiki/www/doc/wiki-help.adp	5 Jan 2005 21:18:34 -0000	1.1
+++ openacs-4/packages/wiki/www/doc/wiki-help.adp	27 Sep 2005 12:46:11 -0000	1.2
@@ -10,7 +10,10 @@
 <li><a href="news:comp.lang.tcl">news:comp.lang.tcl</a></ul><p><b>Adding highlights:</b></p><ul><li>Surround text by pairs of single quotes to make it <i>display in italic</i>
 <li>Surround text by triples of single quotes to make it <b>display in bold</b>
 <li>Surround text by quintuples of single quotes to make it <i><b>display in bold italic</b></i></ul><p><b>Adding structure to your text:</b></p><ul><li>Lines of text are normally joined, with empty lines used to delineate paragraphs
-<li>Lines starting with three spaces, a &quot;*&quot;, and another space are shown as bulleted items.  The entire item must be entered as one line (possibly wrapping).
+<li>Lines surrounded by a number of = will be a heading of the number
+        of =. For example =Heading 1= ==Heading2== ===Heading 3===
+        ====Heading 4====. Only 4 levels are supported.</li>
+      <li>Lines starting with three spaces, a &quot;*&quot;, and another space are shown as bulleted items.  The entire item must be entered as one line (possibly wrapping).
 
 <li>Lines starting with three spaces, a &quot;1.&quot;, and another space are shown as a numbered list.  Each numbered item must be entered as one logical line.</ul><ol><li>first numbered bullet
 <li>second numbered bullet</ol><ul><li>Lines starting with three spaces, item tag name, &quot;:&quot;, three spaces, and then the item tag body (entered as 1 logical line) are shown as tagged lists.</ul><dl><dt>tag<dd>text<dt>tag<dd>text2</dl><ul><li>All other lines beginning with white space are shown as is - no highlighting, reference generating, or even text wrapping occur.</ul><pre> However, just to keep you on your toes, even in this literal mode, <a href="http://wiki.tcl.tk/">http://wiki.tcl.tk/</a> style URLs are recognized and turned into active links.</pre><p><b>Other features:</b></p><ul><li>Put four or more dashes on a line to get a horizontal separator, like the &quot;----&quot; below:</ul><hr size=1><p><b><i>Note: there's no way YET to undo once changes are saved</b></i> It is however possible to go back in history on <a href="http://mini.net/tclhist/">http://mini.net/tclhist/</a> and fetch old parts of a page that was accidentally lost. Chances are however that changes less than a day old will not yet have made it into this archive.</p><hr size=1><p><i>To get more than one highlight on a single line,</i> you can use returns to break the line in separate physicial lines.  WiKit will concatenate them all into one.  So if you do this (without indents):</p><pre>   I'm going to ''draw''