Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.2-4.6.3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.2-4.6.3.sql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.2-4.6.3.sql	30 Mar 2013 22:50:45 -0000	1.5
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.2-4.6.3.sql	31 Mar 2013 12:01:24 -0000	1.6
@@ -10,7 +10,7 @@
 -- procedure file_storage__new_file/6
 --
 CREATE OR REPLACE FUNCTION file_storage__new_file(
-   new_file__title --         varchar,
+   new_file__title varchar,
    new_file__folder_id integer,
    new_file__user_id integer,
    new_file__creation_ip varchar,
@@ -81,8 +81,7 @@
 -- procedure file_storage__copy_file/4
 --
 CREATE OR REPLACE FUNCTION file_storage__copy_file(
-   copy_file__file_id --        --
-       integer,
+   copy_file__file_id integer,
    copy_file__target_folder_id integer,
    copy_file__creation_user integer,
    copy_file__creation_ip varchar
@@ -188,7 +187,7 @@
 -- procedure file_storage__move_file/4
 --
 CREATE OR REPLACE FUNCTION file_storage__move_file(
-   move_file__file_id --          integer,
+   move_file__file_id integer,
    move_file__target_folder_id integer,
    move_file__creation_user integer,
    move_file__creation_ip varchar
@@ -218,8 +217,7 @@
 -- procedure file_storage__new_version/6
 --
 CREATE OR REPLACE FUNCTION file_storage__new_version(
-   new_version__filename --         --
-       varchar,
+   new_version__filename varchar,
    new_version__description varchar,
    new_version__mime_type varchar,
    new_version__item_id integer,
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.3-5.0.0.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.3-5.0.0.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.3-5.0.0.sql	30 Mar 2013 22:50:45 -0000	1.3
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.3-5.0.0.sql	31 Mar 2013 12:01:24 -0000	1.4
@@ -4,7 +4,7 @@
 -- @author Ola Hansson <ola@polyxena.net>
 
 create or replace function inline_0 ()
-returns integer as'
+returns integer as $$
 declare
     template_id integer;
 begin
@@ -45,8 +45,7 @@
 -- procedure file_storage__new_version/6
 --
 CREATE OR REPLACE FUNCTION file_storage__new_version(
-   new_version__filename --         --
-       varchar,
+   new_version__filename varchar,
    new_version__description varchar,
    new_version__mime_type varchar,
    new_version__item_id integer,
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0a16-5.1.0a17.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0a16-5.1.0a17.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0a16-5.1.0a17.sql	30 Mar 2013 22:50:45 -0000	1.3
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0a16-5.1.0a17.sql	31 Mar 2013 12:01:24 -0000	1.4
@@ -17,8 +17,7 @@
 -- procedure file_storage__new_root_folder/4
 --
 CREATE OR REPLACE FUNCTION file_storage__new_root_folder(
-   new_root_folder__package_id --        --          --
-       integer,
+   new_root_folder__package_id integer,
    new_root_folder__folder_name varchar,
    new_root_folder__url varchar,
    new_root_folder__description varchar
@@ -86,7 +85,7 @@
 -- procedure file_storage__new_file/7
 --
 CREATE OR REPLACE FUNCTION file_storage__new_file(
-   new_file__name --         varchar,
+   new_file__name varchar,
    new_file__folder_id integer,
    new_file__user_id integer,
    new_file__creation_ip varchar,
@@ -189,8 +188,7 @@
 -- procedure file_storage__copy_file/4
 --
 CREATE OR REPLACE FUNCTION file_storage__copy_file(
-   copy_file__file_id --        --
-       integer,
+   copy_file__file_id integer,
    copy_file__target_folder_id integer,
    copy_file__creation_user integer,
    copy_file__creation_ip varchar
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql	30 Mar 2013 22:50:45 -0000	1.4
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d2-5.1.0d3.sql	31 Mar 2013 12:01:24 -0000	1.5
@@ -13,8 +13,7 @@
 -- procedure file_storage__delete_folder/1
 --
 CREATE OR REPLACE FUNCTION file_storage__delete_folder(
-   delete_folder__folder_id --        --
-       integer
+   delete_folder__folder_id integer
 
 ) RETURNS integer AS $$
 -- 0 for success
@@ -38,8 +37,7 @@
 -- procedure file_storage__delete_folder/2
 --
 CREATE OR REPLACE FUNCTION file_storage__delete_folder(
-   delete_folder__folder_id --        --
-       integer,
+   delete_folder__folder_id integer,
    delete_folder__cascade_p boolean
 
 ) RETURNS integer AS $$
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql	30 Mar 2013 22:50:45 -0000	1.6
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql	31 Mar 2013 12:01:24 -0000	1.7
@@ -61,8 +61,7 @@
 -- procedure file_storage__new_root_folder/4
 --
 CREATE OR REPLACE FUNCTION file_storage__new_root_folder(
-   new_root_folder__package_id --        --          --
-       integer,
+   new_root_folder__package_id integer,
    new_root_folder__folder_name varchar,
    new_root_folder__url varchar,
    new_root_folder__description varchar
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.2.0d6-5.2.0d7.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.2.0d6-5.2.0d7.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.2.0d6-5.2.0d7.sql	30 Mar 2013 22:50:45 -0000	1.3
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.2.0d6-5.2.0d7.sql	31 Mar 2013 12:01:24 -0000	1.4
@@ -17,8 +17,7 @@
 -- procedure file_storage__new_root_folder/4
 --
 CREATE OR REPLACE FUNCTION file_storage__new_root_folder(
-   new_root_folder__package_id --        --          --
-       integer,
+   new_root_folder__package_id integer,
    new_root_folder__folder_name varchar,
    new_root_folder__url varchar,
    new_root_folder__description varchar
@@ -86,7 +85,7 @@
 -- procedure file_storage__new_file/7
 --
 CREATE OR REPLACE FUNCTION file_storage__new_file(
-   new_file__name --         varchar,
+   new_file__name varchar,
    new_file__folder_id integer,
    new_file__user_id integer,
    new_file__creation_ip varchar,