Index: src/scripts/debian/knb
===================================================================
--- src/scripts/debian/knb	(revision 8264)
+++ src/scripts/debian/knb	(nonexistent)
@@ -1,22 +0,0 @@
-NameVirtualHost *:80
-<VirtualHost *:80>
-        DocumentRoot /var/lib/tomcat6/webapps/knb
-        ServerName <your_hostname_here>
-
-        ScriptAlias /knb/cgi-bin/ /var/lib/tomcat6/webapps/knb/cgi-bin/
-        <Directory "/var/lib/tomcat6/webapps/knb/cgi-bin/">
-                AllowOverride All
-                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-                Order allow,deny
-                Allow from all
-        </Directory>
-
-        <IfModule mod_jk.c>
-                JkMount /knb ajp13
-                JkMount /knb/* ajp13
-                JkMount /knb/metacat ajp13
-                JkMount /*.jsp ajp13
-                JkUnMount /knb/cgi-bin/* ajp13
-        </IfModule>
-</VirtualHost>
-
Index: src/scripts/debian/knb-ssl
===================================================================
--- src/scripts/debian/knb-ssl	(revision 8264)
+++ src/scripts/debian/knb-ssl	(nonexistent)
@@ -1,62 +0,0 @@
-<IfModule mod_ssl.c>
-NameVirtualHost *:443
-<VirtualHost *:443>
-        DocumentRoot /var/lib/tomcat6/webapps/knb
-
-        ScriptAlias /knb/cgi-bin/ /var/lib/tomcat6/webapps/knb/cgi-bin/
-        <Directory "/var/lib/tomcat6/webapps/knb/cgi-bin/">
-                AllowOverride All
-                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-                Order allow,deny
-                Allow from all
-        </Directory>
-
-        <IfModule mod_jk.c>
-                JkMount /knb ajp13
-                JkMount /knb/* ajp13
-                JkMount /knb/metacat ajp13
-                JkMount /*.jsp ajp13
-                JkUnMount /knb/cgi-bin/* ajp13
-
-                JkOptions +ForwardURICompatUnparsed
-        </IfModule>
-
-        AllowEncodedSlashes On
-        AcceptPathInfo      On
-        
-        #   SSL Engine Switch:
-        #   Enable/Disable SSL for this virtual host.
-        SSLEngine on
-        SSLOptions +StrictRequire +StdEnvVars +ExportCertData
-        
-        #   A self-signed (snakeoil) certificate can be created by installing
-        #   the ssl-cert package. See
-        #   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
-        #   If both key and certificate are stored in the same file, only the
-        #   SSLCertificateFile directive is needed.
-        SSLCertificateFile /etc/ssl/certs/<your_cert_name>.crt
-        SSLCertificateKeyFile /etc/ssl/private/<your_cert_name>.key
-        
-        #   Certificate Authority (CA):
-        #   Set the CA certificate verification path where to find CA
-        #   certificates for client authentication or alternatively one
-        #   huge file containing all of them (file must be PEM encoded)
-        #   Note: Inside SSLCACertificatePath you need hash symlinks
-        #         to point to the certificate files. Use the provided
-        #         Makefile to update the hash symlinks after changes.
-        SSLCACertificatePath /etc/ssl/certs/
-        #SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
-        
-        #   Client Authentication (Type):
-        #   Client certificate verification type and depth.  Types are
-        #   none, optional, require and optional_no_ca.  Depth is a
-        #   number which specifies how deeply to verify the certificate
-        #   issuer chain before deciding the certificate is not valid.
-        <Location /knb/servlet/replication>
-                SSLVerifyClient require
-                SSLVerifyDepth  10
-        </Location>
-
-</VirtualHost>
-</IfModule>
-        
Index: test/clienttestfiles/bad-schema-location.xml
===================================================================
--- test/clienttestfiles/bad-schema-location.xml	(revision 8264)
+++ test/clienttestfiles/bad-schema-location.xml	(revision 8265)
@@ -2,8 +2,8 @@
    xmlns:prod="http://example.org/prod"
    xmlns:xs="http://www.w3.org/2001/XMLSchema"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://example.org/prod http://gorfdsdas/knb/test/chapter05prod.xsd
-                       http://example.org/ord http://gorfdsdas/knb/test/chapter05ord.xsd">
+   xsi:schemaLocation="http://example.org/prod http://gorfdsdas/metacat/test/chapter05prod.xsd
+                       http://example.org/ord http://gorfdsdas/metacat/test/chapter05ord.xsd">
   <items>
     <prod:product>
       <number xsi:type="xs:short">557</number>
Index: test/eml-sample.xml
===================================================================
--- test/eml-sample.xml	(revision 8264)
+++ test/eml-sample.xml	(revision 8265)
@@ -79,7 +79,7 @@
       </dataFormat>
       <distribution>
         <online>
-          <url>http://metacat.nceas.ucsb.edu/knb/servlet/metacat?action=read&amp;docid=knb.46.1</url>
+          <url>http://metacat.nceas.ucsb.edu/metacat/metacat?action=read&amp;docid=knb.46.1</url>
         </online>
       </distribution>
     </physical>
Index: test/stress-test/insert-load-test.py
===================================================================
--- test/stress-test/insert-load-test.py	(revision 8264)
+++ test/stress-test/insert-load-test.py	(revision 8265)
@@ -58,7 +58,7 @@
 
 # Initialize a metacat client connection and log in as test user
 t1 = time()
-mc = metacat.MetacatClient(host,'/knb/metacat')
+mc = metacat.MetacatClient(host,'/metacat/metacat')
 debug("[test] -- Processing Login")
 response = mc.login('test', 'test', 'NCEAS')
 t2 = time()
Index: test/stress-test/metacat.py
===================================================================
--- test/stress-test/metacat.py	(revision 8264)
+++ test/stress-test/metacat.py	(revision 8265)
@@ -33,7 +33,7 @@
 
 class MetacatClient:
 
-    def __init__(self, server="knb.ecoinformatics.org", urlPath="/knb/metacat"):
+    def __init__(self, server="knb.ecoinformatics.org", urlPath="/metacat/metacat"):
         self.metacatUrlPath = urlPath
         self.metacatServer = server
         self.sessionid = None
Index: test/stress-test/squery-load-test.py
===================================================================
--- test/stress-test/squery-load-test.py	(revision 8264)
+++ test/stress-test/squery-load-test.py	(revision 8265)
@@ -54,7 +54,7 @@
 debug("       host: $host ")
 debug("************************************************** ")
 
-mc = metacat.MetacatClient(host,'/knb/metacat')
+mc = metacat.MetacatClient(host,'/metacat/metacat')
 
 query_template_file = open('squery.xml.tmpl', 'r')
 query_template = query_template_file.read()
Index: test/stress-test/read-load-test.py
===================================================================
--- test/stress-test/read-load-test.py	(revision 8264)
+++ test/stress-test/read-load-test.py	(revision 8265)
@@ -55,7 +55,7 @@
 
 # Initialize a metacat client connection and log in as test user
 t1 = time()
-mc = metacat.MetacatClient(host,'/knb/metacat')
+mc = metacat.MetacatClient(host,'/metacat/metacat')
 debug("[test] -- Processing Login")
 response = mc.login('test', 'test', 'NCEAS')
 t2 = time()
Index: src/edu/ucsb/nceas/metacat/lsid/LSIDDataLookup.java
===================================================================
--- src/edu/ucsb/nceas/metacat/lsid/LSIDDataLookup.java	(revision 8264)
+++ src/edu/ucsb/nceas/metacat/lsid/LSIDDataLookup.java	(revision 8265)
@@ -53,7 +53,7 @@
 
     public String getDocType(LSID lsid) {
       // example
-      //http://metacat.nceas.ucsb.edu/knb/metacat?action=getrevisionanddoctype&docid=knb-lter-gce.109.6
+      //http://metacat.nceas.ucsb.edu/metacat/metacat?action=getrevisionanddoctype&docid=knb-lter-gce.109.6
       // returns rev;doctype
 
       String _docType = null;
@@ -105,7 +105,7 @@
         InputStream docStream = null;
 
         // example metacat query
-        // http://metacat.nceas.ucsb.edu/knb/metacat?action=read&qformat=xml&docid=knb-lter-gce.109.6
+        // http://metacat.nceas.ucsb.edu/metacat/metacat?action=read&qformat=xml&docid=knb-lter-gce.109.6
         //
 
         ResourceBundle rb = ResourceBundle.getBundle("metacat-lsid");
Index: src/edu/ucsb/nceas/metacat/DBQuery.java
===================================================================
--- src/edu/ucsb/nceas/metacat/DBQuery.java	(revision 8264)
+++ src/edu/ucsb/nceas/metacat/DBQuery.java	(revision 8265)
@@ -414,7 +414,7 @@
       }//if
       else
       {
-        //knb format, in this case we will get whole result and sent it out
+        //skin format, in this case we will get whole result and sent it out
         response.setContentType("text/html");
         Writer nonout = null;
         StringBuffer xml = createResultDocument(xmlquery, qspec, nonout, user,
Index: docs/user/metacat/source/replication.rst
===================================================================
--- docs/user/metacat/source/replication.rst	(revision 8264)
+++ docs/user/metacat/source/replication.rst	(revision 8265)
@@ -167,17 +167,17 @@
      sudo cp <hostname>-apache.key /etc/ssl/private 
 
 4. Apache needs to be configured to request a client certificate when the 
-   replication API is utilized. The helper file named "knb-ssl" has default 
+   replication API is utilized. The helper file named "metacat-site-ssl" has default 
    rules that configure Apache for SSL and client certificate authentication. 
-   Set up these SSL settings by copying the knb-ssl file into the ``sites-available`` 
+   Set up these SSL settings by copying the metacat-site-ssl file into the ``sites-available`` 
    directory, editing pertinent values to match your system and running 
-   ``a2ensite`` to enable the site. (Note: some settings in knb-ssl need to be 
+   ``a2ensite`` to enable the site. (Note: some settings in metacat-site-ssl need to be 
    changed to match the specifics of your system and Metacat deployment.) 
 
    ::
    
-     sudo cp <metacat_helper_dir>/knb-ssl <apache_install_dir>/sites-available
-     sudo a2ensite knb-ssl
+     sudo cp <metacat_helper_dir>/metacat-site-ssl <apache_install_dir>/sites-available
+     sudo a2ensite metacat-site-ssl
 
 5. Enable the ssl module: 
 
Index: test/jones.204.22.xml
===================================================================
--- test/jones.204.22.xml	(revision 8264)
+++ test/jones.204.22.xml	(revision 8265)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE dataset PUBLIC "-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN" "http://metacat.nceas.ucsb.edu/knb/dtd/eml-dataset-2.0.0beta6.dtd"><dataset>
+<?xml version="1.0"?><!DOCTYPE dataset PUBLIC "-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN" "http://metacat.nceas.ucsb.edu/metacat/dtd/eml-dataset-2.0.0beta6.dtd"><dataset>
   <identifier>jones.204.22</identifier>
   <title>This is a test data set with taxonomic coverage</title>
   <originator>
Index: test/test.properties
===================================================================
--- test/test.properties	(revision 8264)
+++ test/test.properties	(revision 8265)
@@ -1,4 +1,4 @@
 # Set this to the location of the metacat application context
 # directory.  The tests will use this to find metacat.properties
-metacat.contextDir=/var/lib/tomcat6/webapps/knb
-#metacat.contextDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/knb
+metacat.contextDir=/var/lib/tomcat6/webapps/metacat
+#metacat.contextDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/metacat
Index: test/edu/ucsb/nceas/metacat/util/MetacatPopulatorTest.java
===================================================================
--- test/edu/ucsb/nceas/metacat/util/MetacatPopulatorTest.java	(revision 8264)
+++ test/edu/ucsb/nceas/metacat/util/MetacatPopulatorTest.java	(revision 8265)
@@ -77,8 +77,8 @@
             MetacatPopulator mp = new MetacatPopulator(
                     "http://knb.ecoinformatics.org/knb",  
                     /*"http://localhost:8080/knb"*/
-                    "https://demo1.test.dataone.org/knb/d1/mn", 
-                    //"https://knb-test-1.test.dataone.org/knb/d1/mn", 
+                    "https://demo1.test.dataone.org/metacat/d1/mn", 
+                    //"https://knb-test-1.test.dataone.org/metacat/d1/mn", 
                     /*"msucci"*//*"connolly.301"*/ 
                     "tao.1.1", //"frog", 
                     "uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org", 
Index: test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java
===================================================================
--- test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java	(revision 8264)
+++ test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java	(revision 8265)
@@ -93,7 +93,7 @@
 	  /**Constants*/
 	  private static String SRBDATAFILEDIR = "/home/tao/data-file/IPCC"; // Dir for storing srb data file
 	  private static String DOCLISTFILE       = "docidList"; // File name which stores IPCC document id
-	  private static String METACATURL      = "http://chico.dyndns.org/knb/metacat";
+	  private static String METACATURL      = "http://chico.dyndns.org/metacat/metacat";
 	  private static String USERNAME          = "uid=dpennington,o=LTER,dc=ecoinformatics,dc=org";
 	  private static String PASSWORD           = "password";
 	  private static String TABLEONLINEURL= "/eml:eml/dataset/dataTable/physical/distribution/online/url";
Index: test/edu/ucsb/nceas/metacattest/service/XMLSchemaServiceTest.java
===================================================================
--- test/edu/ucsb/nceas/metacattest/service/XMLSchemaServiceTest.java	(revision 8264)
+++ test/edu/ucsb/nceas/metacattest/service/XMLSchemaServiceTest.java	(revision 8265)
@@ -63,14 +63,14 @@
   
   public void testGetBaseUrlFromSchemaURL()
   {
-      String url="http://www.example.com/knb/example.xsd";
-      String base = "http://www.example.com/knb/";
+      String url="http://www.example.com/metacat/example.xsd";
+      String base = "http://www.example.com/metacat/";
       String baseURL = XMLSchemaService.getBaseUrlFromSchemaURL(url);
       assertTrue("The base url should be "+base, baseURL.equals(base));
       url = "www.example.com/example.xsd";
       baseURL = XMLSchemaService.getBaseUrlFromSchemaURL(url);
       assertTrue("The base url should be "+null, baseURL==null);
-      url="http://www.example.com/knb/";
+      url="http://www.example.com/metacat/";
       baseURL = XMLSchemaService.getBaseUrlFromSchemaURL(url);
       assertTrue("The base url should be "+url, baseURL.equals(url));
   }
Index: metacat-index/src/main/webapp/WEB-INF/web.xml
===================================================================
--- metacat-index/src/main/webapp/WEB-INF/web.xml	(revision 8264)
+++ metacat-index/src/main/webapp/WEB-INF/web.xml	(revision 8265)
@@ -15,7 +15,7 @@
     
     <context-param>
       <param-name>metacat.properties.path</param-name>
-      <param-value>/knb/WEB-INF/metacat.properties</param-value>
+      <param-value>/metacat/WEB-INF/metacat.properties</param-value>
       <description>The metacat.properties file for sibling metacat deployment. Note that the context can change</description>
     </context-param>
 
Index: lib/certificateAuthenCode/bbaker_diff_metacat.txt
===================================================================
--- lib/certificateAuthenCode/bbaker_diff_metacat.txt	(revision 8264)
+++ lib/certificateAuthenCode/bbaker_diff_metacat.txt	(revision 8265)
@@ -226,7 +226,7 @@
 > org.ietf.jgss.<span class="tooltip" title="included in standard JRE/JDK libraries">GSSCredential</span> credential = server.get(<span class="tooltip" title="MyProxy username">username</span>, <span class="tooltip" title="MyProxy passphrase">passphrase</span>, <span class="tooltip" title="Credential lifetime in seconds">lifetime</span>);
 > 
 > // 2. Connect to Metacat via GSI+HTTPS
-> String metacatUrl = "https://&lt;metacat server&gt;:8443/knb/metacat/";
+> String metacatUrl = "https://&lt;metacat server&gt;:8443/metacat/metacat/";
 > edu.ucsb.nceas.metacat.client.Metacat client 
 >     = edu.ucsb.nceas.metacat.client.MetacatFactory.createMetacatConnection(metacatUrl);
 > String loginResult = client.login(credential);
@@ -243,7 +243,7 @@
 >       IDs, which will generally be LDAP DNs.  You can do this in a map
 >       file that starts out in
 >       <code>metacat/src/gsimap.properties</code> and gets deployed to
->       Tomcat's <code>webapps/knb/WEB-INF/</code> directory.  You can
+>       Tomcat's <code>webapps/metacat/WEB-INF/</code> directory.  You can
 >       modify it in either place, but it will be overwritten each time
 >       you redeploy Metacat if you change it in Tomcat's installation
 >       directory.</p>
@@ -275,12 +275,12 @@
 > 
 >       <p>Short answer: replace "<code>https</code>" with
 >       "<code>httpg</code>".</p>
->       <blockquote><pre><code><i>https</i>://&lt;metacat server&gt;:8443/knb/metacat/</code></pre></blockquote>
+>       <blockquote><pre><code><i>https</i>://&lt;metacat server&gt;:8443/metacat/metacat/</code></pre></blockquote>
 >       <p>becomes</p>
->       <blockquote><pre><i>httpg</i>://&lt;metacat server&gt;:8443/knb/metacat/</pre></blockquote>
+>       <blockquote><pre><i>httpg</i>://&lt;metacat server&gt;:8443/metacat/metacat/</pre></blockquote>
 > 
 >       <p>Long answer: The URL in the example above,
->       <code>https://&lt;metacat server&gt;:8443/knb/metacat/</code>,
+>       <code>https://&lt;metacat server&gt;:8443/metacat/metacat/</code>,
 >       uses the <code>HTTPS</code> protocol.  However, actually
 >       handling that connection requires a protocol handler that
 >       understands GSI+HTTPS instead of plain HTTPS.  Fortunately,
Index: lib/workflowscheduler/workflowscheduler.properties
===================================================================
--- lib/workflowscheduler/workflowscheduler.properties	(revision 8264)
+++ lib/workflowscheduler/workflowscheduler.properties	(revision 8265)
@@ -156,15 +156,15 @@
 ######## Workflow engine section              #########################################
 executionEngine.endPointAddress=http://localhost:8080/axis2/services/KeplerWebService
 
-workflowScheduler.authServiceUrl=http://localhost:8080/knb/services/AuthenticationService
-workflowScheduler.authorizationServiceUrl=http://localhost:8080/knb/services/AuthorizationService
+workflowScheduler.authServiceUrl=http://localhost:8080/metacat/services/AuthenticationService
+workflowScheduler.authorizationServiceUrl=http://localhost:8080/metacat/services/AuthorizationService
 
 ######## junit test section  ################
 
 test.printdebug=true
-test.metacatUrl=http://indus.msi.ucsb.edu/knb/metacat
-test.contextUrl=http://indus.msi.ucsb.edu/knb
-test.metacatDeployDir=/usr/local/tomcat/webapps/knb
+test.metacatUrl=http://indus.msi.ucsb.edu/metacat/metacat
+test.contextUrl=http://indus.msi.ucsb.edu/metacat
+test.metacatDeployDir=/usr/local/tomcat/webapps/metacat
 test.mcUser=uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org
 test.mcPassword=kepler
 test.mcAnotherUser=uid=test,o=NCEAS,dc=ecoinformatics,dc=org
Index: lib/oaipmh/eml201toDublinCore.xsl
===================================================================
--- lib/oaipmh/eml201toDublinCore.xsl	(revision 8264)
+++ lib/oaipmh/eml201toDublinCore.xsl	(revision 8265)
@@ -20,7 +20,7 @@
        to be carried out once.
     -->     
   <xsl:variable name="ids" select="//*[@id!='']"/>
-  <xsl:variable name="metacat-server">http://metacat.lternet.edu/knb/metacat</xsl:variable>
+  <xsl:variable name="metacat-server">http://metacat.lternet.edu/metacat/metacat</xsl:variable>
 
   <xsl:template match="/">
     <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" 
Index: lib/oaipmh/eml210toDublinCore.xsl
===================================================================
--- lib/oaipmh/eml210toDublinCore.xsl	(revision 8264)
+++ lib/oaipmh/eml210toDublinCore.xsl	(revision 8265)
@@ -20,7 +20,7 @@
        to be carried out once.
     -->     
   <xsl:variable name="ids" select="//*[@id!='']"/>
-  <xsl:variable name="metacat-server">http://metacat.lternet.edu/knb/metacat</xsl:variable>
+  <xsl:variable name="metacat-server">http://metacat.lternet.edu/metacat/metacat</xsl:variable>
 
   <xsl:template match="/">
     <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" 
Index: lib/oaipmh/eml200toDublinCore.xsl
===================================================================
--- lib/oaipmh/eml200toDublinCore.xsl	(revision 8264)
+++ lib/oaipmh/eml200toDublinCore.xsl	(revision 8265)
@@ -20,7 +20,7 @@
        to be carried out once.
     -->     
   <xsl:variable name="ids" select="//*[@id!='']"/>
-  <xsl:variable name="metacat-server">http://metacat.lternet.edu/knb/metacat</xsl:variable>
+  <xsl:variable name="metacat-server">http://metacat.lternet.edu/metacat/metacat</xsl:variable>
 
   <xsl:template match="/">
     <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" 
Index: lib/style/skins/first/first-resultset.xsl
===================================================================
--- lib/style/skins/first/first-resultset.xsl	(revision 8264)
+++ lib/style/skins/first/first-resultset.xsl	(revision 8265)
@@ -41,11 +41,11 @@
 			<head>
 				<title>Search Results</title>
 				<link rel="stylesheet" type="text/css"
-					href="/knb/style/skins/{$qformat}/{$qformat}.css" />
+					href="/metacat/style/skins/{$qformat}/{$qformat}.css" />
 				<script language="Javascript" type="text/JavaScript"
-					src="/knb/style/skins/{$qformat}/{$qformat}.js" />
+					src="/metacat/style/skins/{$qformat}/{$qformat}.js" />
 				<script language="Javascript" type="text/JavaScript"
-					src="/knb/style/common/branding.js" />
+					src="/metacat/style/common/branding.js" />
 				<script language="JavaScript">
 					<![CDATA[
 					function submitform(action,form_ref) {
@@ -143,7 +143,7 @@
 					</xsl:attribute>
 	
 					<td class="text_plain">
-						<form action="/knb/metacat"
+						<form action="/metacat/metacat"
 							method="POST">
 							<xsl:attribute name="name">
 								<xsl:value-of select="translate(./docid, '()-.', '____')" />
@@ -224,7 +224,7 @@
 				<tr class="searchresultsdivider">
 					<td colspan="5">
 						<img
-							src="/knb/style/skins/default/images/transparent1x1.gif"
+							src="/metacat/style/skins/default/images/transparent1x1.gif"
 							width="1" height="1" />
 					</td>
 				</tr>
Index: lib/style/skins/mets/dryad.xsl
===================================================================
--- lib/style/skins/mets/dryad.xsl	(revision 8264)
+++ lib/style/skins/mets/dryad.xsl	(revision 8265)
@@ -147,7 +147,7 @@
 		
 		<!-- General, non-citation, metadata display-->
 		<html xmlns="http://www.w3.org/1999/xhtml" xmlns:dri="http://di.tamu.edu/DRI/1.0/" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
-		<!--<link type="text/css" rel="stylesheet" media="screen" href="/knb/style/skins/default/default.css" />-->
+		<!--<link type="text/css" rel="stylesheet" media="screen" href="/metacat/style/skins/default/default.css" />-->
 		<xsl:call-template name="documenthead"/>
 		<body id="Overview">
 		<div id="main_wrapper">
@@ -479,7 +479,7 @@
 								<img src="knb/style/skins/mets/cc-zero.png"/>
 							</a>
 							<a href="http://opendefinition.org/">
-								<img src="/knb/style/skins/mets/opendata.png"/>
+								<img src="/metacat/style/skins/mets/opendata.png"/>
 							</a>
 						</div>
 					</xsl:if>
@@ -489,10 +489,10 @@
 						<i18n:text>xmlui.dri2xhtml.METS-1.0.license-cc0</i18n:text>
 						<xsl:text> &#160; </xsl:text>
 						<a href="http://creativecommons.org/publicdomain/zero/1.0/" target="_blank">
-							<img src="/knb/style/skins/mets/cc-zero.png"/>
+							<img src="/metacat/style/skins/mets/cc-zero.png"/>
 						</a>
 						<a href="http://opendefinition.org/">
-							<img src="/knb/style/skins/mets/opendata.png"/>
+							<img src="/metacat/style/skins/mets/opendata.png"/>
 						</a>
 					</div>
 				</xsl:otherwise>
Index: lib/style/skins/dev/harvesterUpload.html
===================================================================
--- lib/style/skins/dev/harvesterUpload.html	(revision 8264)
+++ lib/style/skins/dev/harvesterUpload.html	(revision 8265)
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Metacat Upload/Delete Interface</title>
-<link rel="stylesheet" type="text/css" href="/knb/style/rowcol.css">
+<link rel="stylesheet" type="text/css" href="/metacat/style/rowcol.css">
 </head>
 
 <body class="emlbody">
Index: lib/metacat.properties
===================================================================
--- lib/metacat.properties	(revision 8264)
+++ lib/metacat.properties	(revision 8265)
@@ -148,11 +148,11 @@
 datamanager.password=datamanager
 datamanager.maxconnections=10
 
-#datamanager.endpoint.query=http://ecogrid.ecoinformatics.org/knb/services/QueryService
-#datamanager.endpoint.authenticatedquery=http://ecogrid.ecoinformatics.org/knb/services/AuthenticatedQueryService
-#datamanager.endpoint.authentication=http://ecogrid.ecoinformatics.org/knb/services/AuthenticationService
-#datamanager.endpoint.put=http://ecogrid.ecoinformatics.org/knb/services/PutService
-#datamanager.endpoint.identifier=http://ecogrid.ecoinformatics.org/knb/services/IdentificationService
+#datamanager.endpoint.query=http://ecogrid.ecoinformatics.org/metacat/services/QueryService
+#datamanager.endpoint.authenticatedquery=http://ecogrid.ecoinformatics.org/metacat/services/AuthenticatedQueryService
+#datamanager.endpoint.authentication=http://ecogrid.ecoinformatics.org/metacat/services/AuthenticationService
+#datamanager.endpoint.put=http://ecogrid.ecoinformatics.org/metacat/services/PutService
+#datamanager.endpoint.identifier=http://ecogrid.ecoinformatics.org/metacat/services/IdentificationService
 #datamanager.srb.endpoint=
 #datamanager.srb.machinename=
 
@@ -441,7 +441,7 @@
 Identify.earliestDatestamp=2000-01-01T00:00:00Z
 Identify.deletedRecord=no
 # Append something unique like .1, .2, etc to 'Identify.description' for each occurrence
-#Identify.description.1=<description><oai-identifier xmlns\="http\://www.openarchives.org/OAI/2.0/oai-identifier" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.openarchives.org/OAI/2.0/oai-identifier http\://www.openarchives.org/OAI/2.0/oai-identifier.xsd"><scheme>oai</scheme><repositoryIdentifier>metacat.lternet.edu</repositoryIdentifier><delimiter>\:</delimiter><sampleIdentifier>http\://metacat.lternet.edu/knb/metacat/knb-lter-lno.1</sampleIdentifier></oai-identifier></description>
+#Identify.description.1=<description><oai-identifier xmlns\="http\://www.openarchives.org/OAI/2.0/oai-identifier" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.openarchives.org/OAI/2.0/oai-identifier http\://www.openarchives.org/OAI/2.0/oai-identifier.xsd"><scheme>oai</scheme><repositoryIdentifier>metacat.lternet.edu</repositoryIdentifier><delimiter>\:</delimiter><sampleIdentifier>http\://metacat.lternet.edu/metacat/metacat/knb-lter-lno.1</sampleIdentifier></oai-identifier></description>
 # List the supported metadataPrefixes along with the class that performs the associated crosswalk
 Crosswalks.oai_dc=edu.ucsb.nceas.metacat.oaipmh.provider.server.crosswalk.Eml2oai_dc
 Crosswalks.eml-2.0.0=edu.ucsb.nceas.metacat.oaipmh.provider.server.crosswalk.Eml200
@@ -504,10 +504,10 @@
 ######## junit test section  ################
 
 test.printdebug=true
-test.metacatUrl=http://localhost:8080/knb/metacat
-test.contextUrl=http://localhost:8080/knb
+test.metacatUrl=http://localhost:8080/metacat/metacat
+test.contextUrl=http://localhost:8080/metacat
 test.workflowSchedulerUrl=http://localhost:8080/workflowscheduler/scheduler
-test.metacatDeployDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/knb
+test.metacatDeployDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/metacat
 test.mcUser=uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org
 test.mcPassword=kepler
 test.mcAnotherUser=uid=test,o=NCEAS,dc=ecoinformatics,dc=org
@@ -517,7 +517,7 @@
 test.lterUser=uid=knbuser,o=LTER,dc=ecoinformatics,dc=org
 test.lterPassword=b1gf1$h
 test.testProperty=testing
-test.replication.targetServer=fred.msi.ucsb.edu/knb
+test.replication.targetServer=fred.msi.ucsb.edu/metacat
 
 ######## Developers Section #########################################
 
Index: lib/oa4mp_client.xml
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/xml
Index: src/python/insertDocs.py
===================================================================
--- src/python/insertDocs.py	(revision 8264)
+++ src/python/insertDocs.py	(revision 8265)
@@ -40,7 +40,7 @@
     sys.exit(1)
 
 print "Logging into destination server"
-dest = metacat.MetacatClient('localhost:8080','/knb/metacat')
+dest = metacat.MetacatClient('localhost:8080','/metacat/metacat')
 dest.login('username','password','NCEAS')
 
 print "Open docid list and loop"
Index: src/python/metacat.py
===================================================================
--- src/python/metacat.py	(revision 8264)
+++ src/python/metacat.py	(revision 8265)
@@ -33,7 +33,7 @@
 
 class MetacatClient:
 
-    def __init__(self, server="knb.ecoinformatics.org", urlPath="/knb/metacat"):
+    def __init__(self, server="localhost:8080", urlPath="/metacat/metacat"):
         self.metacatUrlPath = urlPath
         self.metacatServer = server
         self.sessionid = None
Index: src/python/transferEml.py
===================================================================
--- src/python/transferEml.py	(revision 8264)
+++ src/python/transferEml.py	(revision 8265)
@@ -38,7 +38,7 @@
     sys.exit(1)
 
 print "Logging into destination server"
-dest = metacat.MetacatClient('yourserver:8180','/knb/metacat')
+dest = metacat.MetacatClient('yourserver:8180','/metacat/metacat')
 dest.login('user','password','NCEAS')
 
 print "Logging into source server"
Index: src/scripts/debian/metacat-site
===================================================================
--- src/scripts/debian/metacat-site	(nonexistent)
+++ src/scripts/debian/metacat-site	(revision 8265)
@@ -0,0 +1,22 @@
+NameVirtualHost *:80
+<VirtualHost *:80>
+        DocumentRoot /var/lib/tomcat6/webapps/metacat
+        ServerName <your_hostname_here>
+
+        ScriptAlias /metacat/cgi-bin/ /var/lib/tomcat6/webapps/metacat/cgi-bin/
+        <Directory "/var/lib/tomcat6/webapps/metacat/cgi-bin/">
+                AllowOverride All
+                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+                Order allow,deny
+                Allow from all
+        </Directory>
+
+        <IfModule mod_jk.c>
+                JkMount /metacat ajp13
+                JkMount /metacat/* ajp13
+                JkMount /metacat/metacat ajp13
+                JkMount /*.jsp ajp13
+                JkUnMount /metacat/cgi-bin/* ajp13
+        </IfModule>
+</VirtualHost>
+
Index: src/scripts/bash/buildIndex.sh
===================================================================
--- src/scripts/bash/buildIndex.sh	(revision 8264)
+++ src/scripts/bash/buildIndex.sh	(revision 8265)
@@ -12,7 +12,7 @@
     echo "USAGE: $0 docidfile"
     exit 1
 fi 
-echo 'Please type metacat url (It should look like "http://pacific.msi.ucsb.edu:8080/knb/metacat")'
+echo 'Please type metacat url (It should look like "http://pacific.msi.ucsb.edu:8080/metacat/metacat")'
 read metacatBaseURL
 echo 'Please type KNB user name (It should look like "uid=tao,o=NCEAS,dc=ecoinformatics,dc=org")'
 read username
Index: src/scripts/bash/measure-metacat-query-performance2.sh
===================================================================
--- src/scripts/bash/measure-metacat-query-performance2.sh	(revision 8264)
+++ src/scripts/bash/measure-metacat-query-performance2.sh	(revision 8265)
@@ -9,7 +9,7 @@
 #variables
 JUNIT=/usr/local/devtools/apache-ant/lib/junit-4.3.1.jar
 PROJECT=/home/tao/project/metacat
-METACATURL=http://chico.dyndns.org:8081/knb/metacat
+METACATURL=http://chico.dyndns.org:8081/metacat/metacat
 TOMCATUSER=tao
 
 
Index: src/perl/update_emldoc_data.pl
===================================================================
--- src/perl/update_emldoc_data.pl	(revision 8264)
+++ src/perl/update_emldoc_data.pl	(revision 8265)
@@ -43,7 +43,7 @@
 my $metacat1_url = "http://dataknp.sanparks.org/sanparks/metacat";
 my $username = "uid=judithk,o=SANParks,dc=ecoinformatics,dc=org";
 my $password = "xxxxxx";
-#my $metacat1_url = "http://fred.msi.ucsb.edu/knb/metacat";
+#my $metacat1_url = "http://fred.msi.ucsb.edu/metacat/metacat";
 #my $username = "uid=leinfelder,o=NCEAS,dc=ecoinformatics,dc=org";
 #my $password = "xxxxxx";
 
Index: src/edu/ucsb/nceas/metacat/spatial/WmsFilter.java
===================================================================
--- src/edu/ucsb/nceas/metacat/spatial/WmsFilter.java	(revision 8264)
+++ src/edu/ucsb/nceas/metacat/spatial/WmsFilter.java	(revision 8265)
@@ -35,7 +35,7 @@
       long before = System.currentTimeMillis();
       
       // Attributes != Paramters but there is no setParameter
-      //request.setAttribute("SLD", "http://pmark.msi.ucsb.edu:8180/knb/style/skins/ebm/spatial/data_bounds_style.sld");
+      //request.setAttribute("SLD", "http://pmark.msi.ucsb.edu:8180/metacat/style/skins/ebm/spatial/data_bounds_style.sld");
 
       Enumeration e = request.getParameterNames();
       while( e.hasMoreElements() ) {
Index: src/edu/ucsb/nceas/metacat/admin/PropertiesAdmin.java
===================================================================
--- src/edu/ucsb/nceas/metacat/admin/PropertiesAdmin.java	(revision 8264)
+++ src/edu/ucsb/nceas/metacat/admin/PropertiesAdmin.java	(revision 8265)
@@ -354,7 +354,7 @@
 	 * In the web.xml of the Metacat-index context, there is a parameter:
 	 * <context-param>
      * <param-name>metacat.properties.path</param-name>
-     * <param-value>/knb/WEB-INF/metacat.properties</param-value>
+     * <param-value>/metacat/WEB-INF/metacat.properties</param-value>
      * <description>The metacat.properties file for sibling metacat deployment. Note that the context can change</description>
      *  </context-param>
      *  It points to the default metacat context - knb. If we rename the context, we need to change the value of there.
Index: docs/user/metacat/source/submitting.rst
===================================================================
--- docs/user/metacat/source/submitting.rst	(revision 8264)
+++ docs/user/metacat/source/submitting.rst	(revision 8265)
@@ -139,12 +139,12 @@
 3. Double-check that Metacat's temporary folder, application.tempDir, is 
    writable by the apache user, usually www-data or apache. 
 
-4. Make sure that the following scripts (found in ``<tomcat-home>/webapps/knb/cgi-bin``) 
+4. Make sure that the following scripts (found in ``<tomcat-home>/webapps/metacat/cgi-bin``) 
    are executable: register-dataset.cgi and ldapweb.cgi.
 
   ::
   
-    sudo chmod +x <tomcat-home>/webapps/knb/cgi-bin/*.cgi
+    sudo chmod +x <tomcat-home>/webapps/metacat/cgi-bin/*.cgi
 
 5. Restart Apache.
 
@@ -173,7 +173,7 @@
 disable the 'show site list' setting before you can submit the form without 
 errors. You may also wish to remove (or modify) the list of NCEAS-specific 
 projects that appear in the default registry. To remove these form fields, 
-open Metacat's administrative interface (http://<your.context.url>/knb/admin) 
+open Metacat's administrative interface (http://<your.context.url>/metacat/admin) 
 and select the Skins Specific Properties Configuration option. On the skins 
 configuration page, uncheck the boxes beside any form elements that you do not 
 wish to appear in the registry.
@@ -576,7 +576,7 @@
   <title>Search</title>
   </head>
   <body>
-  <form method="POST" action="http://panucci.nceas.ucsb.edu/knb/servlet/metacat">
+  <form method="POST" action="http://panucci.nceas.ucsb.edu/metacat/metacat">
 
   Search for:
 
@@ -831,7 +831,7 @@
 
 For more information about each EarthGrid service and its WSDL file, navigate 
 to the "services" page on your Metacat server 
-(e.g., http://knb.ecoinformatics.org/knb/services). 
+(e.g., http://knb.ecoinformatics.org/metacat/services). 
 Note that the AdminService and Version service that appear on this page are 
 not part of EarthGrid.
 
@@ -884,7 +884,7 @@
    
    Set the Metacat URL in the Morpho preferences to point to your Metacat.
 
-For more information about Morpho, please see: http://knb.ecoinformatics.org/morphoportal.jsp
+For more information about Morpho, please see: http://knb.ecoinformatics.org/
 
 Creating Your Own Client
 ------------------------
Index: docs/user/metacat/source/query-index.rst
===================================================================
--- docs/user/metacat/source/query-index.rst	(revision 8264)
+++ docs/user/metacat/source/query-index.rst	(revision 8265)
@@ -42,7 +42,7 @@
 Index configuration
 ----------------------------
 Metacat-index is deployed as a separate web application (metacat-index.war) and should be deployed 
-as a sibling of the Metacat webapp (knb.war). Deploying metacat-index.war is only required when SOLR support
+as a sibling of the Metacat webapp (metacat.war). Deploying metacat-index.war is only required when SOLR support
 is desired and can safely be omitted if it will not be utilized for any given Metacat deployment.
 
 During the initial installation/upgrade, an empty index will be initialized in the configured "solr-home" location.
Index: docs/user/metacat/source/geoserver.rst
===================================================================
--- docs/user/metacat/source/geoserver.rst	(revision 8264)
+++ docs/user/metacat/source/geoserver.rst	(revision 8265)
@@ -48,7 +48,7 @@
 is used to configure GeoServer to use this shared data directory. To further 
 configure GeoServer, use the Web-based configuration utility, 
 which is available at: http://your.server.com/context/geoserver.jsp 
-(e.g., http://knb.ecoinformatics.org/knb/geoserver.jsp). 
+(e.g., http://knb.ecoinformatics.org/metacat/geoserver.jsp). 
 
 Common configuration tasks include:
 
@@ -106,10 +106,10 @@
 To add a map to a Web page, simply include the map interface using an iframe:: 
 
   <iframe scrolling="no" frameborder="0" width="780" height="420" 
-          src="/knb/style/common/spatial/map.jsp">
+          src="/metacat/style/common/spatial/map.jsp">
   </iframe>
 
-The map URL, ``/knb/style/common/spatial/map.jsp``, is 
+The map URL, ``/metacat/style/common/spatial/map.jsp``, is 
 the default map interface. If you plan to customize the map interface, copy
 the map.jsp file into your skin's directory (either the default or 
 customized skin directory). 
@@ -118,7 +118,7 @@
 
   cp -r style/common/spatial/map.jsp /style/skins/<myskin>/spatial
 
-You can access the customized map with the URL: ``/knb/style/skins/<myskin>/spatial/map.jsp`` 
+You can access the customized map with the URL: ``/metacat/style/skins/<myskin>/spatial/map.jsp`` 
 
 Configuring the Size and Initial Extent of the Map
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -127,7 +127,7 @@
 :doc:`configuration` for directions). Once the file has been copied, you can 
 modify the map's initial extent in: ``${skin.dir}/spatial/map.jsp``.
 
-To change the map’s initial extent, edit the bounding box. The default is to 
+To change the map's initial extent, edit the bounding box. The default is to 
 show the entire globe. The ``initMap()`` function should also be given the skin 
 name so that spatial search results can be correctly styled.
 
@@ -160,7 +160,7 @@
 
 ::
 
-  <option value=“-149.725,68.475 -149.3254,68.725”> Arctic LTER (ARC)</option>
+  <option value="-149.725,68.475 -149.3254,68.725"> Arctic LTER (ARC)</option>
 
 Configuring the Visual Portrayal of Geospatial Data (e.g., symbology and color)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -188,7 +188,7 @@
 
 1. Point your browser to ``http://your.server/geoserver``, log in to GeoServer, 
    and navigate to the "Data Stores" configuration page under ``Data > Stores``. 
-2. Create a new vector data source from a Shapefile in the “metacat” workspace.
+2. Create a new vector data source from a Shapefile in the "metacat" workspace.
 
 .. figure:: images/screenshots/image055.png
    :align: center
@@ -219,8 +219,8 @@
    GeoServer's Layer Preview allows you to see an OpenLayer rendering of the new layer.
 
 8. Copy the default ``map.js`` file that assembles the map in OpenLayers 
-   (``style/common/spatial/map.js``) to your skin’s spatial directory.
-9. Edit the init() method to include your new layer in the map – either as an 
+   (``style/common/spatial/map.js``) to your skin's spatial directory.
+9. Edit the init() method to include your new layer in the map - either as an 
    overlay or as a base layer.
 10. Point your browser to the map interface. Your new layer should appear with 
     the existing ones.
@@ -229,7 +229,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 There are hundreds of sources of spatial data made publically available 
 through WMS (check out http://wms-sites.com for a good catalog). To add these 
-data sources to your map, add the layers in your skin’s ``spatial/map.js`` file.
+data sources to your map, add the layers in your skin's ``spatial/map.js`` file.
 
 Spatial Queries
 ---------------
@@ -239,7 +239,7 @@
 
 An example of a spatial query string is::
 
-  http://localhost/knb/metacat?action=spatial_query&xmin=-117.5&xmax=-64&ymin=3&ymax=46&skin=default
+  http://localhost/metacat/metacat?action=spatial_query&xmin=-117.5&xmax=-64&ymin=3&ymax=46&skin=default
 
 Where ``xmin``, ``xmax``, ``ymin`` and ``ymax`` represent the western, eastern, 
 southern and northern bounding coordinates (the "bounding box"), respectively. 
Index: docs/user/metacat/source/sitemaps.rst
===================================================================
--- docs/user/metacat/source/sitemaps.rst	(revision 8264)
+++ docs/user/metacat/source/sitemaps.rst	(revision 8265)
@@ -1,8 +1,8 @@
 Enabling Web Searches: Sitemaps
 ===============================
 
-Sitemaps are XML files that tell search engines—such as Google, which is 
-discussed in this section--which URLs on your websites are available for 
+Sitemaps are XML files that tell search engines - such as Google, which is 
+discussed in this section - which URLs on your websites are available for 
 crawling. Currently, the only way for a search engine to crawl and index 
 Metacat so that individual metadata entries are available via Web searches 
 is with a sitemap. Metacat automatically creates sitemaps for all public 
@@ -33,7 +33,7 @@
 Verify that your sitemap files are available to the Web by browsing to::
 
   <your_web_context>/sitemaps/metacat<X>.xml 
-  (e.g., your.server.org/knb/sitemaps/metacat1.xml)
+  (e.g., your.server.org/metacat/sitemaps/metacat1.xml)
 
 Registering a Sitemap
 ---------------------
Index: docs/user/metacat/source/install.rst
===================================================================
--- docs/user/metacat/source/install.rst	(revision 8264)
+++ docs/user/metacat/source/install.rst	(revision 8265)
@@ -58,7 +58,7 @@
 3. Log in to PostgreSQL and create the 'metacat' user
 4. Download Metacat from the `Metacat Download Page`_ and extract the archive
 5. ``sudo mkdir /var/metacat; sudo chown -R <tomcat_user> /var/metacat``
-6. ``sudo cp <metacat_package_dir>/knb.war <tomcat_app_dir>``
+6. ``sudo cp <metacat_package_dir>/metacat.war <tomcat_app_dir>``
 7. ``sudo /etc/init.d/tomcat6 restart``
 8. Configure Metacat through the Web interface
 
@@ -98,10 +98,10 @@
 ================== ===========================================================
 File               Description
 ================== ===========================================================
-knb.war            The Metacat Web archive file (WAR) 
-knb                Sample Web definition file used by Apache on Ubuntu/Debian 
+metacat.war        The Metacat Web archive file (WAR) 
+metacat-site       Sample Web definition file used by Apache on Ubuntu/Debian 
                    Linux systems. 
-knb.ssl            Sample SSL definition file used by Apache on Ubuntu/Debian 
+metacat-site-ssl   Sample SSL definition file used by Apache on Ubuntu/Debian 
                    Linux systems.
 jk.conf            Sample JkMount configuration file used by Apache on 
                    Ubuntu/Debian Linux systems. 
@@ -278,27 +278,25 @@
         ServerName dev.nceas.ucsb.edu 
         ErrorLog /var/log/httpd/error_log 
         CustomLog /var/log/httpd/access_log common 
-        ScriptAlias /cgi-bin/ "/var/www/cgi-knb/" 
-        <Directory /var/www/cgi-knb/> 
+        ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" 
+        <Directory /var/www/cgi-bin/> 
           AllowOverride None 
           Options ExecCGI 
           Order allow,deny 
           Allow from all 
         </Directory> 
-        ScriptAlias /knb/cgi-bin/ "/var/www/webapps/knb/cgi-bin/" 
-        <Directory "/var/www/webapps/knb/cgi-bin/"> 
+        ScriptAlias /metacat/cgi-bin/ "/var/www/webapps/metacat/cgi-bin/" 
+        <Directory "/var/www/webapps/metacat/cgi-bin/"> 
           AllowOverride None 
           Options ExecCGI 
           Order allow,deny 
           Allow from all 
         </Directory> 
-        JkMount /knb ajp13 
-        JkMount /knb/* ajp13 
-        JkMount /knb/metacat ajp13 
-        JkUnMount /knb/cgi-bin/* ajp13 
-        JkMount /*.jsp ajp13 
         JkMount /metacat ajp13 
         JkMount /metacat/* ajp13 
+        JkMount /metacat/metacat ajp13 
+        JkUnMount /metacat/cgi-bin/* ajp13 
+        JkMount /*.jsp ajp13 
       </VirtualHost> 
 
   3. Copy the "workers.properties" file provided by Metacat into your Apache configuration directory (<apache_install_dir>/conf/).  Depending on whether you are installing from binary distribution or source, the workers.properties file will be in one of two locations:
@@ -352,12 +350,12 @@
   sudo a2dismod jk
   sudo a2enmod jk
 
-4. Apache needs to know about the Metacat site. The helper file named "knb" has rules that tell Apache which traffic to route to Metacat. Set up the knb (Metacat) site by dropping the knb file into the sites-available directory and running a2ensite to enable the site:
+4. Apache needs to know about the Metacat site. The helper file named "metacat-site" has rules that tell Apache which traffic to route to Metacat. Set up Metacat site by dropping the metacat-site file into the sites-available directory and running a2ensite to enable the site:
 
 ::
 
-  sudo cp <metacat_helper_dir>/knb <apache_install_dir>/sites-available
-  sudo a2ensite knb
+  sudo cp <metacat_helper_dir>/metacat-site <apache_install_dir>/sites-available
+  sudo a2ensite metacat-site
   
 5. Disable the default Apache site configuration:
 
@@ -535,11 +533,11 @@
     sudo chown -R <tomcat_user> /var/metacat
 
 
-3.  Install the Metacat WAR in the Tomcat web-application directory. For instructions on downloading the Metacat WAR, please see Downloading Metacat.  Typically, Tomcat will look for its application files (WAR files) in the <tomcat_home>/webapps directory (e.g., /usr/share/tomcat6/webapps). Your instance of Tomcat may be configured to look in a different directory. We will refer to the Tomcat application directory as <tomcat_app_dir>.  NOTE: The name of the WAR file (e.g., knb.war) provides the application context, which appears in the URL of the Metacat (e.g., http://yourserver.com/knb/). To change the context, simply change the name of the WAR file to the desired name before copying it.  To install the Metacat WAR:
+3.  Install the Metacat WAR in the Tomcat web-application directory. For instructions on downloading the Metacat WAR, please see Downloading Metacat.  Typically, Tomcat will look for its application files (WAR files) in the <tomcat_home>/webapps directory (e.g., /usr/share/tomcat6/webapps). Your instance of Tomcat may be configured to look in a different directory. We will refer to the Tomcat application directory as <tomcat_app_dir>.  NOTE: The name of the WAR file (e.g., metacat.war) provides the application context, which appears in the URL of the Metacat (e.g., http://yourserver.com/metacat/). To change the context, simply change the name of the WAR file to the desired name before copying it.  To install the Metacat WAR:
 
   ::
 
-    sudo cp <metacat_package_dir>/knb.war <tomcat_app_dir>
+    sudo cp <metacat_package_dir>/metacat.war <tomcat_app_dir>
 
 
 4. Restart Tomcat. Log in as the user that runs your Tomcat server (often "tomcat") and type:  
@@ -578,8 +576,8 @@
 
   ::
 
-    cp <web_app_dir>/knb <backup_dir>/knb.<yyyymmdd>
-    cp <web_app_dir>/knb.war <backup_dir>/knb.war.<yyyymmdd>
+    cp <web_app_dir>/metacat <backup_dir>/metacat.<yyyymmdd>
+    cp <web_app_dir>/metacat.war <backup_dir>/metacat.war.<yyyymmdd>
 
   Warning: Do not backup the files to the ``<web_app_dir>`` directory.  Tomcat will
   try to run the backup copy as a service.
@@ -588,7 +586,7 @@
 
   ::
 
-    sudo cp <metacat_package_dir>/knb.war <tomcat_app_dir>
+    sudo cp <metacat_package_dir>/metacat.war <tomcat_app_dir>
 
   Note: Typically, Tomcat will look for its application files (WAR files) in the
   ``<tomcat_home>/webapps`` directory. Your instance of Tomcat may be configured to
@@ -615,7 +613,7 @@
     http://yourserver.yourdomain.com/yourcontext/
 
 You should substitute your context name for "yourcontext" in the URL above
-(your context will be "knb" unless you change the name of the knb.war file to
+(your context will be "metacat" unless you change the name of the metacat.war file to
 something else). If everything is working correctly, you should be presented
 with Metacat's Authorization Configuration screen. Note that if you do not have
 Tomcat integrated with Apache you will probably have to type
@@ -648,15 +646,15 @@
   You will see the individual modules get built. You should see a "BUILD
   SUCCESSFUL" message at the end.
 
-  You should see a new file named knb.war in your application deployment
+  You should see a new file named metacat.war in your application deployment
   directory.
 
 To run your new Metacat servlet, open a Web browser and type::
 
   http://yourserver.yourdomain.com/yourcontext/ 
-  (e.g.  http://knb.ecoinformatics.org/knb/)
+  (e.g.  http://knb.ecoinformatics.org/metacat/)
 
-Your context will be "knb" unless you changed the name of the knb.war file to
+Your context will be "metacat" unless you changed the name of the metacat.war file to
 something else. The servlet may require a few seconds to start up, but once it
 is running, you will be presented with the Authorization Configuration screen.
 
@@ -952,7 +950,7 @@
 
   ::
   
-    Psql ���������U metacat ���������W ���������h localhost metacat
+    psql -U metacat -W -h localhost metacat
 
 10. Exit PostgreSQL:
 
@@ -986,7 +984,7 @@
   
   ::
 
-    copy <metacat_package_dir>\knb.war C:\Program Files\tomcat\webapps
+    copy <metacat_package_dir>\metacat.war C:\Program Files\tomcat\webapps
 
 3.  Restart Tomcat: 
 
@@ -1012,10 +1010,10 @@
 
   ::
 
-    <web_app_dir>/knb to <backup_dir>/knb.<yyyymmdd>
-    <web_app_dir>/knb.war to <backup_dir>/knb.war.<yyyymmdd>
+    <web_app_dir>/metacat to <backup_dir>/metacat.<yyyymmdd>
+    <web_app_dir>/metacat.war to <backup_dir>/metacat.war.<yyyymmdd>
 
-  Warning: Do not backup the knb directory in the <web_app_dir> directory.
+  Warning: Do not backup the metacat directory in the <web_app_dir> directory.
   Tomcat will try to run the backup copy as a service.
 
 3.  Copy the new Metacat WAR file in to Tomcat applications directory: 
@@ -1022,7 +1020,7 @@
 
   ::
 
-    copy knb.war C:\Program Files\tomcat\webapps
+    copy metacat.war C:\Program Files\tomcat\webapps
 
 4.  Restart Tomcat: 
   
Index: docs/user/metacat/source/configuration.rst
===================================================================
--- docs/user/metacat/source/configuration.rst	(revision 8264)
+++ docs/user/metacat/source/configuration.rst	(revision 8265)
@@ -95,7 +95,7 @@
 
 1. Stop Tomcat and edit the Metacat properties (``metacat.properties``) file in the
    Metacat context directory inside the Tomcat application directory. The 
-   Metacat context directory is the name of the application (usually knb):
+   Metacat context directory is the name of the application (usually metacat):
 
   ::
   
@@ -205,7 +205,7 @@
 Property          Description
 ================  ============================================================
 Metacat Context   The name of the deployed Metacat WAR file (minus the .war 
-                  extension). E.g., "knb"
+                  extension). E.g., "metacat"
 Server Name       The DNS name of the server hosting Metacat, not including 
                   port numbers or the protocol ("http://"). 
 HTTP Port         The non-secure port where Metacat will be available.
@@ -413,9 +413,9 @@
   <CONTEXT_DIR>/WEB_INF/metacat.properties
 
 Where ``<CONTEXT_DIR>`` is the directory in which the Metacat application code 
-lives (e.g., ``/var/lib/tomcat6/webapps/knb``). The path is a combination 
+lives (e.g., ``/var/lib/tomcat6/webapps/metacat``). The path is a combination 
 of the Web application directory (e.g., ``/var/lib/tomcat6/webapps/``) and 
-the Metacat context directory (e.g., ``knb``). Both values depend upon how your 
+the Metacat context directory (e.g., ``metacat``). Both values depend upon how your 
 system was set up during installation.
 
 For information about each property and default or example settings, please 
Index: docs/user/metacat/source/event-logging.rst
===================================================================
--- docs/user/metacat/source/event-logging.rst	(revision 8264)
+++ docs/user/metacat/source/event-logging.rst	(revision 8265)
@@ -7,7 +7,7 @@
 include only certain events: events from a particular IP address, user, event 
 type, or that occurred after a specified start date or before an end date. 
 
-The following URL is used to return the basic log—an XML-formatted log of all 
+The following URL is used to return the basic log- an XML-formatted log of all 
 events since the log was initiated::
 
   http://some.metacat.host/context/metacat?action=getlog 
Index: build.xml
===================================================================
--- build.xml	(revision 8264)
+++ build.xml	(revision 8265)
@@ -828,17 +828,19 @@
 	</target>
 
 	<target name="install" depends="build-metacat"
-		description="* Full Install For Development *">
+		description="* Install Metacat For Development *">
 		<copy file="${dist.dir}/${metacat.context}.war"
 			todir="${app.deploy.dir}" />
-               <!-- <copy file="${dist.dir}/${metacat.context}.war"
-                        todir="${app.deploy.dir2}" />-->
 		<delete dir="${app.deploy.dir}/${metacat.context}" />
-		<!--<delete dir="${app.deploy.dir2}/${metacat.context}" />-->
 		<copy file="${dist.dir}/geoserver.war"
 					todir="${app.deploy.dir}" />
+		<delete dir="${app.deploy.dir}/geoserver" />
 		<copy file="${dist.dir}/metacat-index.war"
 					todir="${app.deploy.dir}" />
+		<delete dir="${app.deploy.dir}/metacat-index" />
+		<copy file="${dist.dir}/metacatui.war"
+					todir="${app.deploy.dir}" />
+		<delete dir="${app.deploy.dir}/metacatui" />
 		<tstamp>
 			<format property="NOW" pattern="MM/dd/yyyy hh:mm:ss aa" />
 		</tstamp>
@@ -1533,7 +1535,7 @@
 		</copy>
 		<chmod file="${deb.pkg.dir}/DEBIAN/postinst" perm="755" />
 
-		<copy file="${dist.dir}/knb.war"
+		<copy file="${dist.dir}/${metacat.context}.war"
 			todir="${deb.pkg.dir}/usr/share/metacat-${metacat.version}" />
 		<copy file="./metacat-bin-${metacat.version}.tar.gz"
 			tofile="${deb.pkg.dir}/metacat_${metacat.version}.orig.tar.gz" />
Index: src/scripts/debian/metacat-site-ssl
===================================================================
--- src/scripts/debian/metacat-site-ssl	(nonexistent)
+++ src/scripts/debian/metacat-site-ssl	(revision 8265)
@@ -0,0 +1,62 @@
+<IfModule mod_ssl.c>
+NameVirtualHost *:443
+<VirtualHost *:443>
+        DocumentRoot /var/lib/tomcat6/webapps/metacat
+
+        ScriptAlias /metacat/cgi-bin/ /var/lib/tomcat6/webapps/metacat/cgi-bin/
+        <Directory "/var/lib/tomcat6/webapps/metacat/cgi-bin/">
+                AllowOverride All
+                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+                Order allow,deny
+                Allow from all
+        </Directory>
+
+        <IfModule mod_jk.c>
+                JkMount /metacat ajp13
+                JkMount /metacat/* ajp13
+                JkMount /metacat/metacat ajp13
+                JkMount /*.jsp ajp13
+                JkUnMount /metacat/cgi-bin/* ajp13
+
+                JkOptions +ForwardURICompatUnparsed
+        </IfModule>
+
+        AllowEncodedSlashes On
+        AcceptPathInfo      On
+        
+        #   SSL Engine Switch:
+        #   Enable/Disable SSL for this virtual host.
+        SSLEngine on
+        SSLOptions +StrictRequire +StdEnvVars +ExportCertData
+        
+        #   A self-signed (snakeoil) certificate can be created by installing
+        #   the ssl-cert package. See
+        #   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
+        #   If both key and certificate are stored in the same file, only the
+        #   SSLCertificateFile directive is needed.
+        SSLCertificateFile /etc/ssl/certs/<your_cert_name>.crt
+        SSLCertificateKeyFile /etc/ssl/private/<your_cert_name>.key
+        
+        #   Certificate Authority (CA):
+        #   Set the CA certificate verification path where to find CA
+        #   certificates for client authentication or alternatively one
+        #   huge file containing all of them (file must be PEM encoded)
+        #   Note: Inside SSLCACertificatePath you need hash symlinks
+        #         to point to the certificate files. Use the provided
+        #         Makefile to update the hash symlinks after changes.
+        SSLCACertificatePath /etc/ssl/certs/
+        #SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
+        
+        #   Client Authentication (Type):
+        #   Client certificate verification type and depth.  Types are
+        #   none, optional, require and optional_no_ca.  Depth is a
+        #   number which specifies how deeply to verify the certificate
+        #   issuer chain before deciding the certificate is not valid.
+        <Location /metacat/servlet/replication>
+                SSLVerifyClient require
+                SSLVerifyDepth  10
+        </Location>
+
+</VirtualHost>
+</IfModule>
+        
Index: src/scripts/debian/postinst
===================================================================
--- src/scripts/debian/postinst	(revision 8264)
+++ src/scripts/debian/postinst	(revision 8265)
@@ -15,38 +15,38 @@
 /etc/init.d/tomcat6 stop
 
 ## backup the old war file
-if [ -e ${TOMCAT_HOME}/webapps/knb.war ]
+if [ -e ${TOMCAT_HOME}/webapps/metacat.war ]
 then
-  echo "Backing up ${TOMCAT_HOME}/webapps/knb.war to ${TOMCAT_HOME}/webapps/knb.war.${LONG_DATE}"
-  mv ${TOMCAT_HOME}/webapps/knb.war ${TOMCAT_HOME}/webapps/knb.war.${LONG_DATE}
+  echo "Backing up ${TOMCAT_HOME}/webapps/metacat.war to ${TOMCAT_HOME}/webapps/metacat.war.${LONG_DATE}"
+  mv ${TOMCAT_HOME}/webapps/metacat.war ${TOMCAT_HOME}/webapps/metacat.war.${LONG_DATE}
 fi  
 
 ## remove the knb application directory
-if [ -d ${TOMCAT_HOME}/webapps/knb ]
+if [ -d ${TOMCAT_HOME}/webapps/metacat ]
 then
   echo "Removing the old metacat application directorties"
-  rm -rf ${TOMCAT_HOME}/webapps/knb
+  rm -rf ${TOMCAT_HOME}/webapps/metacat
 fi 
 
 ## copy the new war file into the webapps directory
-echo copying new knb.war file to ${TOMCAT_HOME}/webapps/knb.war
-cp ${SOURCE_DIR}/knb.war ${TOMCAT_HOME}/webapps/knb.war
+echo copying new metacat.war file to ${TOMCAT_HOME}/webapps/metacat.war
+cp ${SOURCE_DIR}/metacat.war ${TOMCAT_HOME}/webapps/metacat.war
 
 ## expand the war file
 CURR_DIR=`pwd`
 
-## make knb directory and extract knb.war into it.
-echo "Making knb application directory: ${TOMCAT_HOME}/webapps/knb"
-mkdir ${TOMCAT_HOME}/webapps/knb
-cd ${TOMCAT_HOME}/webapps/knb
+## make knb directory and extract metacat.war into it.
+echo "Making knb application directory: ${TOMCAT_HOME}/webapps/metacat"
+mkdir ${TOMCAT_HOME}/webapps/metacat
+cd ${TOMCAT_HOME}/webapps/metacat
 
-echo "extracting knb.war into ${TOMCAT_HOME}/webapps/knb"
-jar -xvf ${TOMCAT_HOME}/webapps/knb.war > /dev/null
-chown -R ${TOMCAT_USER} ${TOMCAT_HOME}/webapps/knb
+echo "extracting metacat.war into ${TOMCAT_HOME}/webapps/metacat"
+jar -xvf ${TOMCAT_HOME}/webapps/metacat.war > /dev/null
+chown -R ${TOMCAT_USER} ${TOMCAT_HOME}/webapps/metacat
 echo cd to $CURR_DIR
 cd $CURR_DIR
 
-chmod -R  +x ${TOMCAT_HOME}/webapps/knb/cgi-bin
+chmod -R  +x ${TOMCAT_HOME}/webapps/metacat/cgi-bin
 
 ###############################################################################
 # Create Metacat External File Space
@@ -116,17 +116,17 @@
 a2enmod jk
 
 ## copy in knb site file
-if [ -e /etc/apache2/sites-available/knb ]
+if [ -e /etc/apache2/sites-available/metacat ]
 then 
-  KNB_SITE_DIFF=`diff ${SOURCE_DIR}/knb /etc/apache2/sites-available/knb`
+  KNB_SITE_DIFF=`diff ${SOURCE_DIR}/metacat /etc/apache2/sites-available/metacat`
   if [ "${KNB_SITE_DIFF}" != "" ]
   then
-    echo "Backing up /etc/apache2/sites-available/knb to /etc/apache2/sites-available/knb.${LONG_DATE}"
-    mv /etc/apache2/sites-available/knb /etc/apache2/sites-available/knb.${LONG_DATE}
+    echo "Backing up /etc/apache2/sites-available/metacat to /etc/apache2/sites-available/metacat.${LONG_DATE}"
+    mv /etc/apache2/sites-available/metacat /etc/apache2/sites-available/metacat.${LONG_DATE}
   fi
 fi
 echo "Copying knb site file to /etc/apache2/sites-available/"
-cp ${SOURCE_DIR}/knb /etc/apache2/sites-available/
+cp ${SOURCE_DIR}/metacat /etc/apache2/sites-available/
 
 ## enable knb site
 echo "Enabling knb site"
Index: src/scripts/bash/measure-metacat-query-performance.sh
===================================================================
--- src/scripts/bash/measure-metacat-query-performance.sh	(revision 8264)
+++ src/scripts/bash/measure-metacat-query-performance.sh	(revision 8265)
@@ -10,7 +10,7 @@
 METACAT=../build/metacat.jar
 METACAT_CLIENT=../build/metacat-client.jar
 UTILITIES=../lib/utilities.jar
-METACATURL=http://chico.dyndns.org:8081/knb/metacat
+METACATURL=http://chico.dyndns.org:8081/metacat/metacat
 QUERY=../test/performance_measure_query
 TIME=2
 TOMCATUSER=tao
Index: src/perl/transfer_emldocs_from_metacat1_to_metacat2.pl
===================================================================
--- src/perl/transfer_emldocs_from_metacat1_to_metacat2.pl	(revision 8264)
+++ src/perl/transfer_emldocs_from_metacat1_to_metacat2.pl	(revision 8265)
@@ -41,8 +41,8 @@
 
 my $listname = "list_of_docids";
 
-my $metacat1_url = "https://mn-stage-ucsb-1.dataone.org/knb/metacat";
-my $metacat2_url = "https://demo2.test.dataone.org/knb/metacat";
+my $metacat1_url = "https://mn-stage-ucsb-1.dataone.org/metacat/metacat";
+my $metacat2_url = "https://demo2.test.dataone.org/metacat/metacat";
 my $username = "uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org";
 my $password = "xxx";
 
Index: src/perl/Metacat/test.pl
===================================================================
--- src/perl/Metacat/test.pl	(revision 8264)
+++ src/perl/Metacat/test.pl	(revision 8265)
@@ -40,7 +40,7 @@
 # Insert your test code below (better if it prints "ok 13"
 # (correspondingly "not ok 13") depending on the success of chunk 13
 # of the test code):
-my $metacatUrl = "http://snow.joneseckert.org:8080/knb/servlet/metacat";
+my $metacatUrl = "http://snow.joneseckert.org:8080/metacat/metacat";
 my $username = 'uid=jones,o=NCEAS,dc=ecoinformatics,dc=org';
 my $password = 'your-pw-goes-here';
 
Index: src/edu/ucsb/nceas/metacat/MetaCatServlet.java
===================================================================
--- src/edu/ucsb/nceas/metacat/MetaCatServlet.java	(revision 8264)
+++ src/edu/ucsb/nceas/metacat/MetaCatServlet.java	(revision 8265)
@@ -715,8 +715,8 @@
 			// Check if this is a simple read request that doesn't use the
 			// "action" syntax
 			// These URLs are of the form:
-			// http://localhost:8180/knb/metacat/docid/skinname
-			// e.g., http://localhost:8180/knb/metacat/test.1.1/knb
+			// http://localhost:8180/metacat/metacat/docid/skinname
+			// e.g., http://localhost:8180/metacat/metacat/test.1.1/knb
 			String pathInfo = request.getPathInfo();
 			if (pathInfo != null) {
 				String[] path = pathInfo.split("/");
Index: docs/dev/testing-metacat.html
===================================================================
--- docs/dev/testing-metacat.html	(revision 8264)
+++ docs/dev/testing-metacat.html	(revision 8265)
@@ -149,7 +149,7 @@
   <div class="code">&lt;workspace&gt;/metacat/test/test.properties</div>
   This should only hold one property: metacat.contextDir.  This should point to 
   the context directory for the metacat server you are testing.  For example:
-  <div class="code">metacat.contextDir=/var/lib/tomcat6/webapps/knb</div>
+  <div class="code">metacat.contextDir=/var/lib/tomcat6/webapps/metacat</div>
   The test classes will use this to determine where to look for the server
   metacat.properties file.</p>
   
@@ -159,9 +159,9 @@
   You will need to verify that all test.* properties are set correctly:
   <ul>
     <li>test.printdebug - true if you want debug output, false otherwise </li>
-    <li>test.metacatUrl - the url for the metacat servlet (i.e. http://localhost:8080/knb/metacat)</li>
-    <li>test.contextUrl - the url for the metacat web service (i.e. http://localhost:8080/knb)</li>
-    <li>test.metacatDeployDir - the directory where metacat is physically deployed (i.e. /usr/local/tomcat/webapps/knb)</li>
+    <li>test.metacatUrl - the url for the metacat servlet (i.e. http://localhost:8080/metacat/metacat)</li>
+    <li>test.contextUrl - the url for the metacat web service (i.e. http://localhost:8080/metacat)</li>
+    <li>test.metacatDeployDir - the directory where metacat is physically deployed (i.e. /usr/local/tomcat/webapps/metacat)</li>
     <li>test.mcUser - the first metacat test user ("uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org" should be fine)</li>
     <li>test.mcPassword - the first metacat test password ("kepler" should be fine)</li>
     <li>test.mcAnotherUser - the second metacat test user.  This user must be a member of the knb-usr 
@@ -264,7 +264,7 @@
   <p>For each Skin:</p>
   <ul>
   <li>View main skin page by going to:
-    <div class="code">http://dev.nceas.ucsb.edu/knb/style/skins/&lt;skin_name&gt;</div>
+    <div class="code">http://dev.nceas.ucsb.edu/metacat/style/skins/&lt;skin_name&gt;</div>
   for each skin, where &lt;skin_name&gt; is in:
     <div class="code">default, nceas, esa, knb, lter, ltss, obfs, nrs, sanparks, saeon</div>  
   Note that the kepler skin is installed on a different metacat instance and can be found at:
@@ -299,7 +299,7 @@
      <li>Use your search to find a document</li>
      <li>Choose the link to a document - you should see document details
      <li>In a separate browser, try the shortcut to the doc:
-       <div class="code">http://dev.nceas.ucsb.edu/knb/metacat/&lt;doc_id&gt;/&lt;skin_name&gt;</div>
+       <div class="code">http://dev.nceas.ucsb.edu/metacat/metacat/&lt;doc_id&gt;/&lt;skin_name&gt;</div>
      You should see the same results as going to the doc via search.</li>
      </ul>
   </li>
Index: docs/user/metacat/source/oaipmh.rst
===================================================================
--- docs/user/metacat/source/oaipmh.rst	(revision 8264)
+++ docs/user/metacat/source/oaipmh.rst	(revision 8265)
@@ -13,12 +13,12 @@
 supported by an OAI-PMH compliant data provider (also referred to as a 
 repository). These methods are:
 
-1. ``GetRecord`` – retrieves zero or one complete metadata record from a repository;
-2. ``Identify`` – retrieves information about a repository;
-3. ``ListIdentifiers`` – retrieves zero or more metadata record “headers” (not the complete metadata record) from a repository;
-4. ``ListMetadataFormats`` – retrieves a list of available metadata record formats supported by a repository;
-5. ``ListRecords`` – retrieves zero or more complete metadata records from a respository; and
-6. ``ListSets`` – retrieves the set structure from a repository.
+1. ``GetRecord`` - retrieves zero or one complete metadata record from a repository;
+2. ``Identify`` - retrieves information about a repository;
+3. ``ListIdentifiers`` - retrieves zero or more metadata record "headers" (not the complete metadata record) from a repository;
+4. ``ListMetadataFormats`` - retrieves a list of available metadata record formats supported by a repository;
+5. ``ListRecords`` - retrieves zero or more complete metadata records from a repository; and
+6. ``ListSets`` - retrieves the set structure from a repository.
 
 The OAI-PMH compliant data provider must accept requests from both HTTP GET 
 and HTTP POST request methods. Responses from the data provider must be 
@@ -105,17 +105,17 @@
 
 Users of the Metacat OAI-PMH Data Provider should be aware of the following issues:
 
-* 'Deleted' Status – OAI-PMH repositories can optionally flag records with 
+* 'Deleted' Status - OAI-PMH repositories can optionally flag records with 
   a 'deleted' status, indicating that a record in the metadata format 
   specified by the metadataPrefix is no longer available. Since Metacat does 
   not provide a mechanism for retrieving a list of deleted documents, the use 
   of the 'deleted' status is not supported in this implementation of the 
   OAI-PMH Data Provider. This represents a possible future enhancement.
-* Sets – OAI-PMH repositories can optionally support set hierarchies. Since it 
+* Sets - OAI-PMH repositories can optionally support set hierarchies. Since it 
   has not been determined how set hierarchies should be structured in 
   Metacat, this implementation of the OAI-PMH repository does not support 
   set hierarchies. This represents a possible future enhancement.
-* Datestamp Granularity – When expressing datestamps for repository documents, 
+* Datestamp Granularity - When expressing datestamps for repository documents, 
   OAI-PMH allows two levels of granularity: day granularity and seconds 
   granularity. Since the Metacat database stores the value of its 
   ``xml_documents.date_updated`` field in day granularity, it is the level 
@@ -133,11 +133,11 @@
 
 Users of the Metacat OAI-PMH Harvester should be aware of the following issues:
 
-* Handling of 'Deleted' status –  The Metacat OAI-PMH Harvester program does 
+* Handling of 'Deleted' status -  The Metacat OAI-PMH Harvester program does 
   check to see whether a 'deleted' status is flagged for a harvested document, 
   and if it is, the document is correspondingly deleted from the Metacat repository.
-* Datestamp Granularity – When expressing datestamps for repository documents, 
-  OAI-PMH allows two levels of granularity – day granularity and seconds 
+* Datestamp Granularity - When expressing datestamps for repository documents, 
+  OAI-PMH allows two levels of granularity - day granularity and seconds 
   granularity. Since the Metacat database stores the value of its 
   ``xml_documents.last_updated`` field in day granularity, it is also the 
   level that is supported by both the Metacat OAI-PMH Data Provider and the 
@@ -175,12 +175,12 @@
 
    ::
    
-     ``oaipmh.repositoryIdentifier`` – A string that identifies this repository
-     ``Identify.adminEmail`` – The email address of the repository administrator
+     ``oaipmh.repositoryIdentifier`` - A string that identifies this repository
+     ``Identify.adminEmail`` - The email address of the repository administrator
 
 3. Edit the deployment descriptor (``web.xml``) file, also in the WEB-INF 
    directory. Uncomment the servlet-name and servlet-mapping entries for the 
-   DataProvider servlet by removing the surrounding “<!--“ and “-->” strings:
+   DataProvider servlet by removing the surroundin "<!--" and "-->" strings:
 
    ::
    
@@ -213,7 +213,7 @@
 +----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
 | AbstractCatalog.secondsToLive          | 3600                                                                       | The lifetime, in seconds, of the resumptionToken.                                                                                               |
 +----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
-| AbstractCatalog.granularity            | YYYY-MM-DD or                                                              | Granularity of datestamps. Either ‘days granularity’ or ‘seconds granularity’ values can be used.                                               |
+| AbstractCatalog.granularity            | YYYY-MM-DD or                                                              | Granularity of datestamps. Either "days granularity" or "seconds granularity" values can be used.                                               |
 |                                        | YYYY-MM-DDThh:mm:ssZ                                                       |                                                                                                                                                 |
 +----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
 | Identify.repositoryName                | Metacat OAI-PMH Data Provider                                              | A name for the repository.                                                                                                                      |
@@ -220,7 +220,7 @@
 +----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
 | Identify.earliestDatestamp             | 2000-01-01T00:00:00Z                                                       | Earliest datestamp supported by this repository                                                                                                 |
 +----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
-| Identify.deletedRecord                 | yes or no                                                                  | Use ‘yes’ if the repository indicates the status of deleted records; use ‘no’ if it doesn’t.                                                    |
+| Identify.deletedRecord                 | yes or no                                                                  | Use "yes" if the repository indicates the status of deleted records; use "no" if it doesn't.                                                    |
 +----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
 | Identify.adminEmail                    | mailto:tech_support@someplace.org                                          | Email address of the repository administrator.                                                                                                  |
 +----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -316,7 +316,7 @@
          -dn uid=jdoe,o=myorg,dc=ecoinformatics,dc=org \
          -password some_password \
          -metadataPrefix oai_dc \
-         http://baseurl.repository.org/knb/dataProvider
+         http://baseurl.repository.org/metacat/dataProvider
 
    On Linux/Unix: 
 
@@ -326,7 +326,7 @@
          -dn uid=jdoe,o=myorg,dc=ecoinformatics,dc=org \
          -password some_password \
          -metadataPrefix oai_dc \
-         http://baseurl.repository.org/knb/dataProvider
+         http://baseurl.repository.org/metacat/dataProvider
 
                         
 Command line options and parameters are described in the following table:
@@ -346,7 +346,7 @@
 +-----------------------------+----------------------------------------------------+-----------------------------------------------------------------------------------------------------+
 | -setSpec                    | ``-setSpec someSet``                               | Harvest documents belonging to this set. (Optional)                                                 |
 +-----------------------------+----------------------------------------------------+-----------------------------------------------------------------------------------------------------+
-| base_url                    | ``http://baseurl.repository.org/knb/dataProvider`` | Base URL of the remote repository                                                                   |
+| base_url                    | ``http://baseurl.repository.org/metacat/dataProvider`` | Base URL of the remote repository                                                                   |
 +-----------------------------+----------------------------------------------------+-----------------------------------------------------------------------------------------------------+
 
 
Index: docs/user/metacat/source/harvester.rst
===================================================================
--- docs/user/metacat/source/harvester.rst	(revision 8264)
+++ docs/user/metacat/source/harvester.rst	(revision 8265)
@@ -126,13 +126,13 @@
 
    ::
    
-     http://somehost.somelocation.edu:8080/knb/index.jsp
+     http://somehost.somelocation.edu:8080/metacat/index.jsp
 
    then the Harvester Registration page would be accessed at: 
 
    ::
    
-     http://somehost.somelocation.edu:8080/knb/style/skins/default/harvesterRegistrationLogin.jsp
+     http://somehost.somelocation.edu:8080/metacat/style/skins/default/harvesterRegistrationLogin.jsp
 
 .. figure:: images/screenshots/image065.jpg
    :align: center
@@ -267,7 +267,7 @@
 
    ::
    
-     set METACAT_HOME=C:\somePath\knb
+     set METACAT_HOME=C:\somePath\metacat
 
    On Linux/Unix (bash shell): 
    
@@ -494,13 +494,13 @@
 
    ::
    
-     http://somehost.somelocation.edu:8080/knb/index.jsp
+     http://somehost.somelocation.edu:8080/metacat/index.jsp
 
    then the Harvester Registration page would be accessed at: 
 
    ::
 
-     http://somehost.somelocation.edu:8080/knb/style/skins/default/harvesterRegistrationLogin.jsp
+     http://somehost.somelocation.edu:8080/metacat/style/skins/default/harvesterRegistrationLogin.jsp
 
 2. Enter and submit your Metacat account information. On the subsequent screen, 
    click Unregister to remove your site and discontinue harvests. 
Index: build.properties
===================================================================
--- build.properties	(revision 8264)
+++ build.properties	(revision 8265)
@@ -10,7 +10,6 @@
 # Tomcat dev deployment directory
 # build.tomcat.dir=/usr/local/tomcat
 build.tomcat.dir=/Users/leinfelder/tools/apache-tomcat-6
-
 # install ant target uses this to determine where to drop 
 # the war file in an installation.  Test classes will use
 # this value to find metacat.properties
@@ -20,8 +19,8 @@
 # CVS access to retrieve latest EML, seek and utilities 
 cvsroot=:ext:${env.USER}@cvs.ecoinformatics.org:/cvs
 
-## metacat.context will be used to name war only
-metacat.context=knb
+## metacat.context will be used to name war
+metacat.context=metacat
 workflowscheduler.context=workflowscheduler
 authority.context=authority
 
