Author: apetrelli
Date: Fri Mar 11 16:31:13 2011
New Revision: 1080645
URL: http://svn.apache.org/viewvc?rev=1080645&view=rev
Log:
TILESSHARED-24
Added trademark symbole where needed.
Modified:
tiles/framework/trunk/assembly/src/site/site.xml
tiles/framework/trunk/src/site/site.xml
tiles/framework/trunk/src/site/xdoc/index.xml
tiles/framework/trunk/tiles-api/src/site/site.xml
tiles/framework/trunk/tiles-compat/src/site/site.xml
tiles/framework/trunk/tiles-core/src/site/site.xml
tiles/framework/trunk/tiles-jsp/src/site/site.xml
tiles/framework/trunk/tiles-portlet/src/site/site.xml
tiles/framework/trunk/tiles-servlet/src/site/site.xml
tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml
tiles/site/src/site/site.xml
tiles/site/src/site/xdoc/index.xml
tiles/site/src/site/xdoc/mail.xml
tiles/site/src/site/xdoc/volunteers.xml
Modified: tiles/framework/trunk/assembly/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/site/site.xml (original)
+++ tiles/framework/trunk/assembly/src/site/site.xml Fri Mar 11 16:31:13 2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - Assembly">
+<project name="Apache Tiles™ - Assembly">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/framework/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/site.xml (original)
+++ tiles/framework/trunk/src/site/site.xml Fri Mar 11 16:31:13 2011
@@ -21,14 +21,14 @@
* under the License.
*/
-->
-<project name="Apache Tiles - Framework">
+<project name="Apache Tiles™ - Framework">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
<href>http://www.apache.org</href>
</bannerLeft>
<bannerRight>
- <name>Apache Tiles 2</name>
+ <name>Apache Tiles™</name>
<src>http://tiles.apache.org/images/logo.png</src>
<href>http://tiles.apache.org</href>
</bannerRight>
@@ -40,7 +40,7 @@
</links>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../index.html"/>
Modified: tiles/framework/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/xdoc/index.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/xdoc/index.xml (original)
+++ tiles/framework/trunk/src/site/xdoc/index.xml Fri Mar 11 16:31:13 2011
@@ -29,7 +29,7 @@
<body>
- <section name="Tiles 2">
+ <section name="Apache Tiles™">
<p><strong><a href="http://tiles.apache.org";>Apache Tiles</a></strong>
is a templating framework built to simplify the development of web
Modified: tiles/framework/trunk/tiles-api/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/site/site.xml (original)
+++ tiles/framework/trunk/tiles-api/src/site/site.xml Fri Mar 11 16:31:13 2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - API">
+<project name="Apache Tiles™ - API">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/framework/trunk/tiles-compat/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/site/site.xml (original)
+++ tiles/framework/trunk/tiles-compat/src/site/site.xml Fri Mar 11 16:31:13
2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - Compatibility Library">
+<project name="Apache Tiles™ - Compatibility Library">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/framework/trunk/tiles-core/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/site/site.xml (original)
+++ tiles/framework/trunk/tiles-core/src/site/site.xml Fri Mar 11 16:31:13 2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - Core Library">
+<project name="Apache Tiles™ - Core Library">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/framework/trunk/tiles-jsp/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/site/site.xml (original)
+++ tiles/framework/trunk/tiles-jsp/src/site/site.xml Fri Mar 11 16:31:13 2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - JSP support">
+<project name="Apache Tiles™ - JSP support">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/framework/trunk/tiles-portlet/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-portlet/src/site/site.xml (original)
+++ tiles/framework/trunk/tiles-portlet/src/site/site.xml Fri Mar 11 16:31:13
2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - Portlet Support">
+<project name="Apache Tiles™ - Portlet Support">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/framework/trunk/tiles-servlet/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/site/site.xml (original)
+++ tiles/framework/trunk/tiles-servlet/src/site/site.xml Fri Mar 11 16:31:13
2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - Servlet Support">
+<project name="Apache Tiles™ - Servlet Support">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml Fri Mar
11 16:31:13 2011
@@ -21,10 +21,10 @@
* under the License.
*/
-->
-<project name="Apache Tiles - Test web application">
+<project name="Apache Tiles™ - Test web application">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/site/src/site/site.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/site/src/site/site.xml (original)
+++ tiles/site/src/site/site.xml Fri Mar 11 16:31:13 2011
@@ -21,14 +21,14 @@
* under the License.
*/
-->
-<project name="Apache Tiles 2">
+<project name="Apache Tiles™">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
<href>http://www.apache.org</href>
</bannerLeft>
<bannerRight>
- <name>Apache Tiles 2</name>
+ <name>Apache Tiles™</name>
<src>/images/logo.png</src>
<href>http://tiles.apache.org</href>
</bannerRight>
@@ -39,7 +39,7 @@
<item name="Tiles 2" href="http://tiles.apache.org"; />
</links>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Welcome"
href="/index.html"/>
Modified: tiles/site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/index.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/site/src/site/xdoc/index.xml (original)
+++ tiles/site/src/site/xdoc/index.xml Fri Mar 11 16:31:13 2011
@@ -22,7 +22,7 @@
<body>
- <section name="Tiles 2">
+ <section name="Apache Tiles™">
<div id="downloadbox">
<strong>Get Tiles</strong>
@@ -104,7 +104,7 @@
<div>
<p>
<strong>
- <a href="http://tiles.apache.org";>Apache Tiles</a>
+ <a href="http://tiles.apache.org";>Apache Tiles™</a>
</strong>
is a templating framework built to simplify the development of
web
@@ -169,6 +169,14 @@
<!-- <a name="downloads" /> -->
</div>
</section>
+ <section name="About Tiles as an Apache project">
+
+ <p>Apache Tiles™ is an <a href="http://www.apache.org/";>Apache
project</a>,
+ and is part of a larger community of developers and users.
+ </p>
+ <p>Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache
Tiles project
+ logo are trademarks of The Apache Software Foundation</p>
+ </section>
</body>
</document>
Modified: tiles/site/src/site/xdoc/mail.xml
URL:
http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/mail.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/site/src/site/xdoc/mail.xml (original)
+++ tiles/site/src/site/xdoc/mail.xml Fri Mar 11 16:31:13 2011
@@ -35,7 +35,7 @@ limitations under the License.
subscribed to
that mailing list. Mailing lists are the primary means of
communication
- for people working within the Apache Tiles Project.
+ for people working within the Apache Tiles™ Project.
</p>
<subsection name="Guidelines">
Modified: tiles/site/src/site/xdoc/volunteers.xml
URL:
http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/volunteers.xml?rev=1080645&r1=1080644&r2=1080645&view=diff
==============================================================================
--- tiles/site/src/site/xdoc/volunteers.xml (original)
+++ tiles/site/src/site/xdoc/volunteers.xml Fri Mar 11 16:31:13 2011
@@ -99,7 +99,7 @@ limitations under the License.
<subsection name="About the Committers">
<p>
- Project committers are the core Apache Tiles community.
+ Project committers are the core Apache Tiles™
community.
</p>
<h4 id="apetrelli">Antonio Petrelli</h4>
@@ -130,14 +130,14 @@ limitations under the License.
bugs and enhancements in Tiles. After a while, in June
2006, I've been invited by Greg Reddin himself to become a
committer: you can't imagine my joy! So I joined the team
- that transformed Struts Tiles to Apache Tiles.</p>
+ that transformed Struts Tiles to Apache Tiles™.</p>
<p>I am also a <a href="http://struts.apache.org/";>Struts</a>
committer. My other Java EE interests are in the view layer
and in synchronization between client's browser and
application server: the latter led me to create
<a href="http://scopes.sourceforge.net/";>Scopes</a>.</p>
-
+
<h4 id="craigmcc">Craig R. McClanahan</h4>
<h4 id="ddewolf">David H. DeWolf</h4>
@@ -174,7 +174,7 @@ limitations under the License.
In my spare time, I enjoy spending time with my wife
Teresa and
our 4 kids (under 6!), Sarah, Joseph, Rebekah, and
Catherine. We
now live in Northern Virginia. </p>
-
+
<h4 id="greddin">Greg Reddin</h4>
<h4 id="martinc">Martin Cooper</h4>
<h4 id="nbubna">Nathan Bubna</h4>
