Merge revisions 415 to the trunk. For bdc34

This commit is contained in:
jeb228 2010-04-13 12:57:52 +00:00
parent b6cf423af4
commit fd98969be3

View file

@ -9,6 +9,15 @@
#
# -----------------------------------------------------------------------------
#
# This namespace will be used when generating URIs for objects created in the
# editor. Change it to reflect your own domain. For example, Cornell's
# namespace is http://vivo.cornell.edu/individual/
#
# Note: it is essential that this namespace end with a trailing slash.
#
Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
#
# Where is the Vitro core directory?
# In most deployments, this is set to ./vitro-core, but internal developers may
@ -45,15 +54,6 @@ upload.directory = /usr/local/vivo/data/uploads
#
LuceneSetup.indexDir = /usr/local/vivo/data/luceneIndex
#
# This namespace will be used when generating URIs for objects created in the
# editor. Change it to reflect your own domain. For example, Cornell's
# namespace is http://vivo.cornell.edu/individual/
#
# Note: it is essential that this namespace end with a trailing slash.
#
Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
#
# SMTP host which the "Contact Us" form can use to send mail. If this is left
# empty, the "Contact Us" form will be disabled.