Return-Path: 
 <commits-return-7805-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5867017DF6
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Thu, 19 Mar 2015 01:12:12 +0000 (UTC)
Received: (qmail 92554 invoked by uid 500); 19 Mar 2015 01:12:12 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 92504 invoked by uid 500); 19 Mar 2015 01:12:12 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 92495 invoked by uid 99); 19 Mar 2015 01:12:12 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Mar 2015 01:12:12 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 04312AC0163
	for <commits@manifoldcf.apache.org>; Thu, 19 Mar 2015 01:12:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1667646 - in /manifoldcf/site/trunk/src/documentation:
 content/xdocs/en_US/download.xml content/xdocs/en_US/index.xml
 content/xdocs/index.xml content/xdocs/ja_JP/index.xml
 content/xdocs/site.xml content/xdocs/zh_CN/index.xml skinconf.xml
Date: Thu, 19 Mar 2015 01:12:11 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150319011212.04312AC0163@hades.apache.org>

Author: kwright
Date: Thu Mar 19 01:12:11 2015
New Revision: 1667646

URL: http://svn.apache.org/r1667646
Log:
Update site layout and trademark symbols

Modified:
    manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/download.xml
    manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/index.xml
    manifoldcf/site/trunk/src/documentation/content/xdocs/index.xml
    manifoldcf/site/trunk/src/documentation/content/xdocs/ja_JP/index.xml
    manifoldcf/site/trunk/src/documentation/content/xdocs/site.xml
    manifoldcf/site/trunk/src/documentation/content/xdocs/zh_CN/index.xml
    manifoldcf/site/trunk/src/documentation/skinconf.xml

Modified: manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/download.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/download.xml?rev=1667646&r1=1667645&r2=1667646&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/download.xml (original)
+++ manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/download.xml Thu Mar 19 01:12:11 2015
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
           "http://forrest.apache.org/dtd/document-v20.dtd">
@@ -35,7 +35,7 @@
     </section>
 
     <section>
-      <title>ManifoldCF</title>
+      <title>ManifoldCF™</title>
       
       <section>
         <title>Latest 2.x release (Apache ManifoldCF 2.0.2 2015 Mar 02)</title>

Modified: manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/index.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/index.xml?rev=1667646&r1=1667645&r2=1667646&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/index.xml (original)
+++ manifoldcf/site/trunk/src/documentation/content/xdocs/en_US/index.xml Thu Mar 19 01:12:11 2015
@@ -23,7 +23,7 @@
 <document> 
 
   <header> 
-    <title>Welcome to Apache ManifoldCF!</title> 
+    <title>Welcome to Apache ManifoldCF™!</title> 
   </header> 
 
   <body> 

Modified: manifoldcf/site/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/content/xdocs/index.xml?rev=1667646&r1=1667645&r2=1667646&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/content/xdocs/index.xml (original)
+++ manifoldcf/site/trunk/src/documentation/content/xdocs/index.xml Thu Mar 19 01:12:11 2015
@@ -22,7 +22,7 @@
 
 <document> 
   <header>
-    <title>Welcome to the Apache ManifoldCF project!</title>
+    <title>Welcome to the Apache ManifoldCF™ project!</title>
   </header>
   <body>
     <p>Please click the appropriate tab above to see this site in the language of your choice.</p>

Modified: manifoldcf/site/trunk/src/documentation/content/xdocs/ja_JP/index.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/content/xdocs/ja_JP/index.xml?rev=1667646&r1=1667645&r2=1667646&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/content/xdocs/ja_JP/index.xml (original)
+++ manifoldcf/site/trunk/src/documentation/content/xdocs/ja_JP/index.xml Thu Mar 19 01:12:11 2015
@@ -23,7 +23,7 @@
 <document> 
 
   <header> 
-    <title>Apache ManifoldCFにようこそ！</title> 
+    <title>Apache ManifoldCF™にようこそ！</title> 
   </header> 
 
   <body> 

Modified: manifoldcf/site/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/content/xdocs/site.xml?rev=1667646&r1=1667645&r2=1667646&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ manifoldcf/site/trunk/src/documentation/content/xdocs/site.xml Thu Mar 19 01:12:11 2015
@@ -22,6 +22,7 @@
   <english label="English" href="en_US/" tab="en_US">
   
     <news        label="Welcome"          href="index.html" tab="en_US" />    
+    <dev label="Download" href="download.html" />
     
     <project label="License">
       <license label="Apache License" href="ext:license" />
@@ -41,7 +42,6 @@
     </docs>
     
     <resources label="Resources">
-      <dev label="Download" href="download.html" />
       <mail        label="Mailing Lists"    href="mail.html" />    
       <dev label="Developer/Integrator Resources" href="developer-resources.html"/>
       <dev label="Security Analysis" href="security.html"/>
@@ -65,9 +65,9 @@
   
   <japanese label="日本語" href="ja_JP/" tab="ja_JP">
     <index label="概要" href="index.html" tab="ja_JP"/>
+    <dev label="ダウンロード" href="download.html" />
     
     <docs label="ドキュメント">
-      <dev label="ダウンロード" href="download.html" />
       <dev label="リリースドキュメント" href="release-documentation.html"/>
       <mail label="メーリングリスト"    href="mail.html" />   
       <dev label="開発者リソース" href="developer-resources.html"/>
@@ -77,9 +77,9 @@
 
   <chinese label="中文" href="zh_CN/" tab="zh_CN">
     <index label="概要" href="index.html" tab="zh_CN"/>
+    <dev label="下载" href="download.html" />
     
     <docs label="文档">
-      <dev label="下载" href="download.html" />
       <dev label="发布文档" href="release-documentation.html"/>
       <mail label="邮件列表"    href="mail.html" />   
       <dev label="开发人员资源" href="developer-resources.html"/>

Modified: manifoldcf/site/trunk/src/documentation/content/xdocs/zh_CN/index.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/content/xdocs/zh_CN/index.xml?rev=1667646&r1=1667645&r2=1667646&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/content/xdocs/zh_CN/index.xml (original)
+++ manifoldcf/site/trunk/src/documentation/content/xdocs/zh_CN/index.xml Thu Mar 19 01:12:11 2015
@@ -23,7 +23,7 @@
 <document> 
 
   <header> 
-    <title>欢迎来到Apache ManifoldCF！</title> 
+    <title>欢迎来到Apache ManifoldCF™！</title> 
   </header> 
 
   <body> 

Modified: manifoldcf/site/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/skinconf.xml?rev=1667646&r1=1667645&r2=1667646&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/skinconf.xml (original)
+++ manifoldcf/site/trunk/src/documentation/skinconf.xml Thu Mar 19 01:12:11 2015
@@ -90,7 +90,7 @@ which will be used to configure the chos
   <favicon-url>images/favicon.ico</favicon-url>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2009-2014</year>
+  <year>2009-2015</year>
   <vendor>The Apache Software Foundation.</vendor>
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
   <!-- Optional text trademark statement below the copyright statement -->