Index: openacs-4/packages/survey/tcl/survey-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/tcl/survey-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/survey/tcl/survey-procs.tcl	19 Jun 2015 07:06:31 -0000	1.11
+++ openacs-4/packages/survey/tcl/survey-procs.tcl	7 Aug 2017 23:48:29 -0000	1.12
@@ -18,7 +18,7 @@
     {-survey_id ""} 
     {-section_id ""} 
 } {
-    creates a tcl array variable named "survey_info" in the caller's environment,
+    creates a Tcl array variable named "survey_info" in the caller's environment,
     which contains key/value pairs for all properties of the requested survey.
 
     If survey_id is passed in, and it's a single-section survey, the 
@@ -126,7 +126,7 @@
 		}
 	    }
 
-	    append html [subst {<input type=text name="$element_name" value="[ad_quotehtml $user_value]" 
+	    append html [subst {<input type=text name="$element_name" value="[ns_quotehtml $user_value]" 
 		[ad_decode $presentation_options "large" "size=70" "medium" "size=40" "size=10"]>}]
 	}
 
@@ -274,12 +274,12 @@
 	
 	if {$html_p} {
 	    append return_string "# $sort_order: $question_text <p>"
-	    append return_string "[ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]"
+	    append return_string [ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]
 	} else {
 	    append return_string "$sort_order: "
 	    append return_string [ad_html_to_text -- $question_text]
 	    append return_string "\n\n"
-	    append return_string "[ad_html_to_text -- [ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]]"
+	    append return_string [ad_html_to_text -- [ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]]
 	}
 	
 	if {$attachment_answer ne ""} {