Index: openacs-4/packages/ams/sql/postgresql/ams-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/sql/postgresql/ams-package-create.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/ams/sql/postgresql/ams-package-create.sql	5 Apr 2018 14:44:08 -0000	1.12
+++ openacs-4/packages/ams/sql/postgresql/ams-package-create.sql	17 May 2018 14:13:48 -0000	1.13
@@ -217,7 +217,7 @@
 ------ Options                                        
 --------------------------------------------------------------------
 
-select define_function_args('ams_option__new','option_id,attribute_id,option,sort_order,depreacted_p;f,creation_date,creation_user,creation_ip,context_id,pretty_name');
+select define_function_args('ams_option__new','option_id,attribute_id,option,sort_order,deprecated_p;f,creation_date,creation_user,creation_ip,context_id,pretty_name');
 
 create or replace function ams_option__new (integer,integer,varchar,integer,boolean,timestamptz,integer,varchar,integer,varchar)
 returns integer as '
Index: openacs-4/packages/ams/sql/postgresql/upgrade/upgrade-1.1d2-1.1d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/sql/postgresql/upgrade/upgrade-1.1d2-1.1d3.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ams/sql/postgresql/upgrade/upgrade-1.1d2-1.1d3.sql	9 Sep 2005 17:43:09 -0000	1.1
+++ openacs-4/packages/ams/sql/postgresql/upgrade/upgrade-1.1d2-1.1d3.sql	17 May 2018 14:13:48 -0000	1.2
@@ -7,7 +7,7 @@
 -- @cvs-id $Id$
 --
 
-select define_function_args('ams_option__new','option_id,attribute_id,option,sort_order,depreacted_p;f,creation_date,creation_user,creation_ip,context_id,pretty_name');
+select define_function_args('ams_option__new','option_id,attribute_id,option,sort_order,deprecated_p;f,creation_date,creation_user,creation_ip,context_id,pretty_name');
 
 create or replace function ams_option__new (integer,integer,varchar,integer,boolean,timestamptz,integer,varchar,integer,varchar)
 returns integer as '
Index: openacs-4/packages/ams/www/attribute.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/attribute.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/ams/www/attribute.adp	5 Dec 2006 03:40:18 -0000	1.11
+++ openacs-4/packages/ams/www/attribute.adp	17 May 2018 14:13:48 -0000	1.12
@@ -12,4 +12,4 @@
 <if @options:rowcount@ gt 0>
 <listtemplate name="options"></listtemplate>
 </if>
-<if @alpha_sort_p@ eq 1>You have to press "update" to save your changes</a></if>
+<if @alpha_sort_p;literal@ true>You have to press "update" to save your changes</a></if>
Index: openacs-4/packages/ams/www/attribute.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/attribute.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/ams/www/attribute.tcl	25 Sep 2006 15:21:57 -0000	1.15
+++ openacs-4/packages/ams/www/attribute.tcl	17 May 2018 14:13:48 -0000	1.16
@@ -78,16 +78,16 @@
 	    label "[_ ams.Default]"
 	    display_template {
                 <if @options.option@ not nil>
-		<a href="@options.default_url@"><img src="/resources/acs-subsite/checkbox<if @options.default_p@>checked</if>.gif" border="0" width="13" height="13" /></a>
+		<a href="@options.default_url@"><img src="/resources/acs-subsite/checkbox<if @options.default_p;literal@ true>checked</if>.gif" border="0" width="13" height="13" /></a>
 		</if>
 	    }
 	}
         actions {
             label ""
             display_template {
                 <if @options.edit_url@ not nil><a href="@options.edit_url@"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a></if>
-                <if @options.in_use_p@></if><else><a href="@options.delete_url@"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a></else>
-                <if @options.swa_p@> | <a href="@options.purge_url@" title="Delete option and purge the record from all users" class="button">Purge</a></if>
+                <if @options.in_use_p;literal@ true></if><else><a href="@options.delete_url@"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a></else>
+                <if @options.swa_p;literal@ true> | <a href="@options.purge_url@" title="Delete option and purge the record from all users" class="button">Purge</a></if>
             }
         }
     } -filters {
Index: openacs-4/packages/ams/www/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/list.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/ams/www/list.tcl	12 Jul 2007 08:24:08 -0000	1.11
+++ openacs-4/packages/ams/www/list.tcl	17 May 2018 14:13:48 -0000	1.12
@@ -99,7 +99,7 @@
         answer {
             label "[_ ams.Required]"
             display_template {
-                <if @mapped_attributes.required_p@>
+                <if @mapped_attributes.required_p;literal@ true>
                 <a href="@mapped_attributes.optional_url@"><img src="/resources/acs-subsite/checkboxchecked.gif" title="[_ ams.Required]" border="0"></a>
                 </if>
                 <else>