Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	26 Jun 2015 09:32:08 -0000	1.35
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	29 Jun 2015 16:34:41 -0000	1.36
@@ -138,7 +138,7 @@
 }
 
 
-ad_proc -deprecated public content::get_folder_labels { { varname "folders" } } {
+ad_proc -deprecated -public content::get_folder_labels { { varname "folders" } } {
     Set a data source in the calling frame with folder URL and label
     Useful for generating a context bar.
 
Index: openacs-4/packages/acs-content-repository/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/www/index.adp	29 Jun 2015 16:34:41 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+<property name="doc(title)">Content Item Not Found</property>
+
+<h1>Content Item Not Found</h1>
+
+The requested item is not available for viewing. 
+The item is either not available on this server or it is not in a publishable state.<br>
+
Index: openacs-4/packages/acs-content-repository/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index.vuh,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-content-repository/www/index.vuh	27 Oct 2014 16:39:12 -0000	1.10
+++ openacs-4/packages/acs-content-repository/www/index.vuh	29 Jun 2015 16:34:41 -0000	1.11
@@ -1,3 +1,4 @@
+# -*- Tcl -*-
 ################## KLUDGE BY STAS ###############
 # Try and look up the item in the content repository
 #################################################
@@ -15,7 +16,6 @@
 set the_url [ad_conn path_info]
 set content_type ""
 
-
 # Get the IDs
 set content_root [db_string content_root ""]
 set template_root [db_string template_root ""]
@@ -29,14 +29,5 @@
 if { [content::init the_url the_root $content_root $template_root public $revision_id $content_type] } {
   set file "$the_root/$the_url"
   rp_internal_redirect -absolute_path $file
-} else {
-  ns_returnnotfound
-  #set page "[ad_header {Content Item Not Found}]"
-  #append page "<h3>Content Item Not Found</h3>"
-  #append page "The requested item is not available for viewing.  "
-  #append page "The item is either not available on this server or it is not in a publishable state  "
-  #append page "Unpublished items can be viewed via the CMS interface if the CMS package is installed.<br>"
-  #append page "[ad_footer]"
-  #doc_return 200 text/html $page
 }