Index: openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl,v
diff -u -N -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl	6 Sep 2019 15:58:06 -0000	1.4.2.1
+++ openacs-4/packages/acs-tcl/tcl/pdf-procs.tcl	6 Sep 2019 16:00:31 -0000	1.4.2.2
@@ -21,11 +21,11 @@
     @creation-date 2005-07-07
 
     @param template_id The template to use for the preview. It is \
-	assumed that the template_id is the same as the revision_id to \
-	be used for the template.
+    assumed that the template_id is the same as the revision_id to \
+    be used for the template.
 
     @param set_var_call procedure-name which sets the variables used
-								    
+
     @return the pdf-file-name
 } {
 
@@ -41,14 +41,14 @@
     set tmp_pdf_filename "${tmp_filename}.pdf"
     set htmldoc_bin [parameter::get -parameter "HtmlDocBin" -default "/usr/bin/htmldoc"]
     if {[catch {exec $htmldoc_bin --webpage --quiet -t pdf -f $tmp_pdf_filename $tmp_html_filename} err]} {
-	ns_log Error "Error during conversion from html to pdf: $err"
+        ns_log Error "Error during conversion from html to pdf: $err"
     }
     file delete -- $tmp_html_filename
 
     if {[file exists $tmp_pdf_filename]} {
-	return $tmp_pdf_filename
+        return $tmp_pdf_filename
     } else {
-	return ""
+        return ""
     }
 }
 
@@ -57,7 +57,7 @@
     {-html_content:required}
 } {
     The HTML Content is transformed into a PDF file
-    
+
     @param html_content HTML Content that is transformed into PDF
     @return filename of the pdf file
 } {
@@ -71,12 +71,12 @@
     set tmp_pdf_filename "${tmp_filename}.pdf"
     set htmldoc_bin [parameter::get -parameter "HtmlDocBin" -default "/usr/bin/htmldoc"]
     if {[catch {exec $htmldoc_bin --webpage --quiet -t pdf -f $tmp_pdf_filename $tmp_html_filename} err]} {
-	ns_log Error "Error during conversion from html to pdf: $err"
+        ns_log Error "Error during conversion from html to pdf: $err"
     }
     if {[file exists $tmp_pdf_filename]} {
-	return $tmp_pdf_filename
+        return $tmp_pdf_filename
     } else {
-	return ""
+        return ""
     }
 }
 
@@ -87,15 +87,15 @@
     {-description:required}
 } {
     The document is stored in the given folder.
-    
+
     @author Christian Langmann (C_Langmann@gmx.de)
     @creation-date 2005-07-07
     @param pdf_file the pdf-file to save
     @param folder_id the folder the document is stored in
     @param title Title or name of the document
     @param description Description of the document
     @return item_id
-    
+
 } {
     set file_size [file size $pdf_file]
     set item_id [cr_import_content -title $title -description $description $folder_id $pdf_file $file_size application/pdf $title]
@@ -118,7 +118,7 @@
 } {
 
     {*}$set_var_call
-    
+
     # retrieve template and write to tmpfile
     # set content [content::get_content_value $template_id]
     set file [open $filename]
Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v
diff -u -N -r1.93.2.7 -r1.93.2.8
--- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	6 Sep 2019 15:58:06 -0000	1.93.2.7
+++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	6 Sep 2019 16:00:31 -0000	1.93.2.8
@@ -447,7 +447,7 @@
       ns_log Error "ns_ictl trace returned: $errorMsg"
     }
   }
-  
+
   #
   # Register::xo::at_delete function only once
   #
@@ -456,7 +456,7 @@
       ns_log Warning "rhe command 'ns_ictl trace delete' returned: $errorMsg"
     }
   }
-  
+
   proc ::xo::freeconn {} {
     catch {::xo::at_cleanup}
   }
@@ -689,7 +689,7 @@
         return [list utime [expr {$utime*10}] stime [expr {$stime*10}]]
       }
     }
- 
+
   } else {
     ::xo::system_stats proc thread_info {pid tid} {
       return ""
Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -N -r1.28.2.3 -r1.28.2.4
--- openacs-4/packages/xowiki/www/admin/import.tcl	6 Sep 2019 15:58:06 -0000	1.28.2.3
+++ openacs-4/packages/xowiki/www/admin/import.tcl	6 Sep 2019 16:00:31 -0000	1.28.2.4
@@ -17,11 +17,11 @@
     -html { enctype multipart/form-data } \
     -form {
       {upload_file:file(file) {html {size 30}} {label "[_ xowiki.import_upload_file]"}}
-      {create_user_ids:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} 
+      {create_user_ids:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0}
         {label "[_ xowiki.import_create_user_ids]"}
         {help_text "[_ xowiki.import_create_user_ids_helptxt]"}
       }
-      {replace:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} 
+      {replace:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0}
         {label "[_ xowiki.import_replace]"}
         {help_text "[_ xowiki.import_replace_helptxt]"}
       }
@@ -37,24 +37,24 @@
       }
 
       set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file]
-      set f [open $upload_tmpfile]; 
+      set f [open $upload_tmpfile];
       # if we do not set translation binary,
       # backslashes at the end of the lines might be lost
       fconfigure $f -translation binary -encoding utf-8
       set content [read $f]; close $f
 
-      foreach o [::xowiki::Page allinstances] { 
+      foreach o [::xowiki::Page allinstances] {
         set preexists($o) 1
       }
       ad_try {
         namespace eval ::xo::import $content
       } on error {errorMsg} {
-	ad_log error $errorMsg
-	# cleanup all objects, that did not exist before
+        ad_log error $errorMsg
+        # cleanup all objects, that did not exist before
         foreach o [::xowiki::Page allinstances] {
-	  if {![info exists preexists($o)]} {
-	    if {[nsf::is object $o]} {$o destroy}
-	  }
+          if {![info exists preexists($o)]} {
+            if {[nsf::is object $o]} {$o destroy}
+          }
         }
       } on ok {r} {
         set objects [list]