Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map
In directory ny04.openforce.net:/tmp/cvs-serv11326

Modified Files:
      Tag: oacs-4-6	package-new.tcl 
Log Message:
merge changes for context id and default of instance name to pretty name from package info

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-admin/www/users
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-admin/www/users

Modified Files:
	complex-search.tcl index.adp one-oracle.xql one.adp one.tcl 	one.xql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-bootstrap-installer/tcl

Modified Files:
	40-db-query-dispatcher-procs.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-content-repository/tcl
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-content-repository/tcl

Modified Files:
	acs-content-repository-procs.tcl 	acs-content-repository-procs.xql revision-procs.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-core-docs/www
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-core-docs/www

Modified Files:
	index.adp 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-core-docs/www/xml/developers-guide

Modified Files:
	permissions-tediously-explained.xml 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-core-docs/www/xml/for-everyone

Modified Files:
	release-notes.xml 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-datetime
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-datetime

Modified Files:
	acs-datetime.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-interface
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-interface

Modified Files:
	acs-interface.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-kernel/sql/oracle/upgrade

Added Files:
	upgrade-4.6-4.6.1.sql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2
on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-kernel/sql/postgresql/upgrade

Added Files:
	upgrade-4.6-4.6.1.sql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2
on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-service-contract
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-service-contract

Modified Files:
	acs-service-contract.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-subsite/sql/oracle
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-subsite/sql/oracle

Modified Files:
	host-node-map-create.sql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-subsite/tcl
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-subsite/tcl

Modified Files:
	plpgsql-utility-procs.tcl Added Files:	plpgsql-utility-procs-postgresql.xql Removed Files:	plpgsql-utility-procs-postgres.xql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-subsite/www/admin/host-node-map
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-subsite/www/admin/host-node-map

Modified Files:
	index.tcl index.xql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-subsite/www/permissions
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-subsite/www/permissions

Modified Files:
	index-oracle.xql index-postgresql.xql index.tcl one-oracle.xql 	one-postgresql.xql Added Files:	index.adp one.adp 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-tcl
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-tcl

Modified Files:
	acs-tcl.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-templating/resources/forms
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/acs-templating/resources/forms

Modified Files:
	wizard.adp 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/attachments
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/attachments

Modified Files:
	attachments.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/bboard
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/bboard

Modified Files:
	bboard.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/bulk-mail
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/bulk-mail

Modified Files:
	bulk-mail.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/bulk-mail/tcl
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/bulk-mail/tcl

Modified Files:
	bulk-mail-procs-oracle.xql bulk-mail-procs-postgresql.xql 	bulk-mail-procs.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/chat
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/chat

Modified Files:
	chat.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/download/www/admin
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/download/www/admin

Modified Files:
	report-by-ip-oracle.xql report-by-ip-postgresql.xql 	report-by-ip.adp report-by-ip.tcl report-by-user-oracle.xql 	report-by-user-postgresql.xql report-by-user.adp 	report-by-user.tcl report-one-ip-oracle.xql 	report-one-ip-postgresql.xql report-one-ip.adp 	report-one-ip.tcl report-one-user-oracle.xql 	report-one-user-postgresql.xql report-one-user.tcl 	report-one-user.xql report-version-downloads-oracle.xql 	report-version-downloads-postgresql.xql 	report-version-downloads.adp report-version-downloads.tcl 	report-version-downloads.xql spam-users-2.tcl spam-users.adp 	spam-users.tcl spam-users.xql Added Files:	report-by-ip.xql report-by-user.xql report-one-ip.xql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/email-handler
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/email-handler

Modified Files:
	email-handler.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/file-storage
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/file-storage

Modified Files:
	file-storage.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/forums
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/forums

Modified Files:
	forums.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/forums/sql/postgresql
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/forums/sql/postgresql

Modified Files:
	forums-messages-create.sql forums-messages-package-create.sql Added Files:	upgrade-0.2d-0.3d.sql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/general-comments
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/general-comments

Modified Files:
	general-comments.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/mp3-jukebox
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/mp3-jukebox

Modified Files:
	mp3-jukebox.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/notes/www
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/notes/www

Modified Files:
	add-edit.tcl index.adp index.tcl view-one.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/notifications/sql/oracle
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/notifications/sql/oracle

Modified Files:
	notifications-core-create.sql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/notifications/tcl
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/notifications/tcl

Modified Files:
	notification-display-procs.tcl notification-procs.tcl 	notification-request-procs.tcl notification-request-procs.xql 	reply-sweep-init.tcl sweep-init.tcl sweep-procs-oracle.xql 	sweep-procs-postgresql.xql sweep-procs.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/openfts-driver
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/openfts-driver

Modified Files:
	openfts-driver.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/photo-album-lite
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/photo-album-lite

Modified Files:
	photo-album-lite.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/ref-timezones
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/ref-timezones

Modified Files:
	ref-timezones.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/schema-browser
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/schema-browser

Modified Files:
	schema-browser.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/site-wide-search
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/site-wide-search

Modified Files:
	site-wide-search.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/static-pages
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/static-pages

Modified Files:
	static-pages.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/static-pages/sql/oracle/upgrade
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/static-pages/sql/oracle/upgrade

Added Files:
	upgrade-4.2a-4.3.sql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2
on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/static-pages/sql/postgresql/upgrade
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/static-pages/sql/postgresql/upgrade

Added Files:
	upgrade-4.2a-4.3.sql 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2
on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/static-pages/www
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/static-pages/www

Modified Files:
	page-visit.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/survey
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/survey

Modified Files:
	survey.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/survey/www/admin
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/survey/www/admin

Modified Files:
	responses-export-oracle.xql responses-export-postgresql.xql 	responses-export.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/ticket-tracker-lite/www
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/ticket-tracker-lite/www

Modified Files:
	ticket-add.tcl 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/wp-slim
In directory ny04.openforce.net:/tmp/cvs-serv16696/packages/wp-slim

Modified Files:
	wp-slim.info 
Log Message:
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2on oacs-4-6 are included.  

Author:	jeffd
Update of /cvsroot/openacs-4/packages/acs-bootstrap-installer
In directory ny04.openforce.net:/tmp/cvs-serv8647

Modified Files:
	db-init-checks-postgresql.tcl 
Log Message:
remove the 7.3 check since HEAD works with 7.3