Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bookmarks/www/bookmarks-check.tcl	7 Aug 2014 07:36:54 -0000	1.9
+++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl	24 Sep 2015 07:32:15 -0000	1.10
@@ -105,7 +105,7 @@
 	ns_write "<p> <table border=0 cellpadding=0 cellspacing=0>
 	<tr>
 	<td colspan=2>
-	Skipping <a href=\"[ad_quotehtml $complete_url]\"> [ad_quotehtml $url_title] </a>....</td>
+	Skipping <a href=\"[ns_quotehtml $complete_url]\"> [ns_quotehtml $url_title] </a>....</td>
 	</tr>
 	</table>"
 
@@ -144,7 +144,7 @@
 	ns_write "<p> <table border=0 cellpadding=0 cellspacing=0>
 	<tr>
 	$delete_html
-	<a href=\"[ad_quotehtml $complete_url]\">[ad_quotehtml $url_title]</a>.... <font color=red>NOT FOUND</font> [ad_quotehtml $response] </td></tr></table>"
+	<a href=\"[ns_quotehtml $complete_url]\">[ns_quotehtml $url_title]</a>.... <font color=red>NOT FOUND</font> [ns_quotehtml $response] </td></tr></table>"
 
 	incr dead_count
 
@@ -171,7 +171,7 @@
 
 		ns_write "<p> <table border=0 cellpadding=0 cellspacing=0>
 	<tr>
-	<td><a href=\"[ad_quotehtml $complete_url]\">[ad_quotehtml $url_title]</a>.... FOUND &nbsp; [ad_decode $title "" "" "title: $title"]</td>
+	<td><a href=\"[ns_quotehtml $complete_url]\">[ns_quotehtml $url_title]</a>.... FOUND &nbsp; [ad_decode $title "" "" "title: $title"]</td>
 	</tr>
 	</table>"
 	  }
Index: openacs-4/packages/bookmarks/www/one-host.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/one-host.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/one-host.tcl	10 Sep 2002 22:22:26 -0000	1.3
+++ openacs-4/packages/bookmarks/www/one-host.tcl	24 Sep 2015 07:32:15 -0000	1.4
@@ -25,7 +25,7 @@
 
 set page_title "Bookmarks for $host_url"
 
-set context [list [list "most-popular" "Most Popular"] [ad_quotehtml $page_title]]
+set context [list [list "most-popular" "Most Popular"] [ns_quotehtml $page_title]]
 
 
 set old_name ""
Index: openacs-4/packages/bookmarks/www/tree-dynamic.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree-dynamic.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/www/tree-dynamic.tcl	7 Aug 2014 07:36:55 -0000	1.8
+++ openacs-4/packages/bookmarks/www/tree-dynamic.tcl	24 Sep 2015 07:32:15 -0000	1.9
@@ -74,9 +74,9 @@
 
 
     if {$folder_p == "t"} {
-	append js "$i_str\['[ad_quotehtml [string trim $local_title]]', null,\n"
+	append js "$i_str\['[ns_quotehtml [string trim $local_title]]', null,\n"
     } else {
-	append js "$i_str\['[ad_quotehtml [string trim $local_title]]', '[string trim [ad_quotehtml $complete_url]]'],\n"
+	append js "$i_str\['[ns_quotehtml [string trim $local_title]]', '[string trim [ns_quotehtml $complete_url]]'],\n"
     }
     set prev_lev $lev
     set prev_folder_p $folder_p
Index: openacs-4/packages/edit-this-page/www/etp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/edit-this-page/www/etp.tcl	8 Sep 2013 09:22:12 -0000	1.10
+++ openacs-4/packages/edit-this-page/www/etp.tcl	24 Sep 2015 07:32:15 -0000	1.11
@@ -44,7 +44,7 @@
 template::multirow create page_attributes name pretty_name value
 
 proc truncate {str} {
-    set str [ad_quotehtml $str]
+    set str [ns_quotehtml $str]
     if {[string length $str] > 100} {
 	set str "[string range $str 0 100]..."
     }
Index: openacs-4/packages/oct-election/www/user-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/user-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/oct-election/www/user-list.tcl	12 Sep 2013 10:59:04 -0000	1.2
+++ openacs-4/packages/oct-election/www/user-list.tcl	24 Sep 2015 07:32:15 -0000	1.3
@@ -74,7 +74,7 @@
     " {
 
 	# don't repeat users
-	if {[lsearch -exact $usernames $cvs_user] != -1} {
+	if {$cvs_user in $usernames} {
 	    continue
 	}
 	lappend usernames $cvs_user
Index: openacs-4/packages/wp-slim/www/add-edit-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/add-edit-presentation.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/add-edit-presentation.tcl	27 Jun 2015 20:34:41 -0000	1.5
+++ openacs-4/packages/wp-slim/www/add-edit-presentation.tcl	24 Sep 2015 07:32:15 -0000	1.6
@@ -106,10 +106,10 @@
     db_1row get_presentation_data { *SQL* }
     db_1row get_aud_data { *SQL* } 
     db_1row get_back_data { *SQL* }
-    set page_signature [ad_quotehtml $page_signature]
-    set copyright_notice [ad_quotehtml $copyright_notice]
-    set audience [ad_quotehtml $audience] 
-    set background [ad_quotehtml $background]
+    set page_signature [ns_quotehtml $page_signature]
+    set copyright_notice [ns_quotehtml $copyright_notice]
+    set audience [ns_quotehtml $audience] 
+    set background [ns_quotehtml $background]
     set title "[_ wp-slim.Edit_Presentation]"
     set context [list [list [export_vars -base presentation-top {pres_item_id}]  "$pres_title"] "[_ wp-slim.Edit_Presentation]"]
 } -after_submit {