svn commit: r1080655 - in /tiles: framework/trunk/src/site/ framework/trunk/src/site/xdoc/dev/ framework/trunk/tiles-freemarker/ framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/ framework/trunk/tiles-velocity/ site/src/site/

apetrelli Fri, 11 Mar 2011 08:38:10 -0800

Author: apetrelli
Date: Fri Mar 11 16:37:42 2011
New Revision: 1080655

URL: http://svn.apache.org/viewvc?rev=1080655&view=rev
Log:
TILESSHARED-24
Fixed some more trademark symbols.


Modified:
    tiles/framework/trunk/src/site/site.xml
    tiles/framework/trunk/src/site/xdoc/dev/building.xml
    tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml
    tiles/framework/trunk/tiles-freemarker/pom.xml
    
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
    tiles/framework/trunk/tiles-velocity/pom.xml
    tiles/site/src/site/site.xml

Modified: tiles/framework/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/site.xml?rev=1080655&r1=1080654&r2=1080655&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/site.xml (original)
+++ tiles/framework/trunk/src/site/site.xml Fri Mar 11 16:37:42 2011
@@ -36,7 +36,7 @@
 
         <links>
             <item name="Apache" href="http://www.apache.org"; />
-            <item name="Tiles 2" href="http://tiles.apache.org"; />
+            <item name="Tiles" href="http://tiles.apache.org"; />
         </links>
 
 

Modified: tiles/framework/trunk/src/site/xdoc/dev/building.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/xdoc/dev/building.xml?rev=1080655&r1=1080654&r2=1080655&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/xdoc/dev/building.xml (original)
+++ tiles/framework/trunk/src/site/xdoc/dev/building.xml Fri Mar 11 16:37:42 
2011
@@ -24,7 +24,7 @@
 <document>
 
     <properties>
-        <title>Apache Tiles 2</title>
+        <title>Apache Tiles&#8482;</title>
     </properties>
 
     <body>
@@ -41,7 +41,7 @@
             notice missing pictures inside JavaDocs pages.</p>
           </subsection>
           <subsection name="Building main packages">
-            <p>To build Tiles 2 from source you need to:</p>
+            <p>To build Tiles from source you need to:</p>
             <ul>
             <li><p><a href="../download.html">download</a> the source
             distribution, or checkout the latest version:</p>

Modified: tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml?rev=1080655&r1=1080654&r2=1080655&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml (original)
+++ tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml Fri Mar 11 16:37:42 
2011
@@ -24,11 +24,11 @@
 <document>
 
     <properties>
-        <title>Apache Tiles 2</title>
+        <title>Apache Tiles&#8482;</title>
     </properties>
 
     <body>
-        <section name="Tiles 2">
+        <section name="Apache Tiles&#8482;">
         <subsection name="Snapshots">
 
         <p>Looking for snapshot builds of the latest version of Tiles?
@@ -46,7 +46,7 @@
         </source>
 
         <p>After configuring the repository, declare a dependency on
-        Tiles 2:</p>
+        Tiles:</p>
 
         <source><![CDATA[
           <dependency>
@@ -63,7 +63,7 @@
     here</a>, or a nightly build, <a
     
href="http://people.apache.org/builds/struts/nightlies/tiles/";>here</a>.</p>
 
-   <p>You can see Tiles 2 in action by downloading a snapshot of the 
'tiles-test' webapp,
+   <p>You can see Tiles in action by downloading a snapshot of the 
'tiles-test' webapp,
    <a 
href="http://people.apache.org/repo/m2-snapshot-repository/org/apache/struts/tiles/tiles-test/2.0-SNAPSHOT/";>
    here</a>.</p>
 

Modified: tiles/framework/trunk/tiles-freemarker/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/pom.xml?rev=1080655&r1=1080654&r2=1080655&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/pom.xml (original)
+++ tiles/framework/trunk/tiles-freemarker/pom.xml Fri Mar 11 16:37:42 2011
@@ -26,7 +26,7 @@
   <groupId>org.apache.tiles</groupId>
   <artifactId>tiles-freemarker</artifactId>
   <name>Tiles - FreeMarker Support</name>
-  <description>Support for FreeMarker in Tiles 2. For more read 
http://tiles.apache.org/framework/tutorial/integration/freemarker.html</description>
+  <description>Support for FreeMarker in Apache Tiles&#8482;. For more read 
http://tiles.apache.org/framework/tutorial/integration/freemarker.html</description>
   <parent>
        <artifactId>tiles-parent</artifactId>
        <groupId>org.apache.tiles</groupId>

Modified: 
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=1080655&r1=1080654&r2=1080655&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml 
(original)
+++ 
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml 
Fri Mar 11 16:37:42 2011
@@ -27,7 +27,7 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
          version="2.5">
 
-    <display-name>Tiles 2 Test Application</display-name>
+    <display-name>Tiles Test Application</display-name>
     <distributable/>
 
     <listener>
@@ -82,7 +82,7 @@
     <servlet>
         <servlet-name>freemarker</servlet-name>
         
<servlet-class>org.apache.tiles.freemarker.servlet.TilesFreemarkerServlet</servlet-class>
-        
+
         <!-- FreemarkerServlet settings: -->
         <init-param>
             <param-name>TemplatePath</param-name>
@@ -96,7 +96,7 @@
             <param-name>ContentType</param-name>
             <param-value>text/html</param-value>
         </init-param>
-        
+
         <!-- FreeMarker settings: -->
         <init-param>
             <param-name>template_update_delay</param-name>
@@ -110,14 +110,14 @@
             <param-name>number_format</param-name>
             <param-value>0.##########</param-value>
         </init-param>
-        
+
         <load-on-startup>5</load-on-startup>
     </servlet>
 
     <servlet>
       <servlet-name>velocity</servlet-name>
       
<servlet-class>org.apache.velocity.tools.view.VelocityViewServlet</servlet-class>
-    
+
       <!--
         Unless you plan to put your tools.xml and velocity.properties under
         different folders or give them different names, then these two
@@ -128,7 +128,7 @@
         <param-name>org.apache.velocity.toolbox</param-name>
         <param-value>/WEB-INF/tools.xml</param-value>
       </init-param>
-    
+
       <init-param>
         <param-name>org.apache.velocity.properties</param-name>
         <param-value>/WEB-INF/velocity.properties</param-value>

Modified: tiles/framework/trunk/tiles-velocity/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/pom.xml?rev=1080655&r1=1080654&r2=1080655&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-velocity/pom.xml Fri Mar 11 16:37:42 2011
@@ -31,7 +31,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tiles-velocity</artifactId>
   <packaging>jar</packaging>
-  <description>Velocity Support in Tiles 2</description>
+  <description>Velocity Support in Tiles</description>
   <name>Tiles - Velocity Support</name>
   <dependencies>
     <dependency>

Modified: tiles/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/tiles/site/src/site/site.xml?rev=1080655&r1=1080654&r2=1080655&view=diff
==============================================================================
--- tiles/site/src/site/site.xml (original)
+++ tiles/site/src/site/site.xml Fri Mar 11 16:37:42 2011
@@ -36,7 +36,7 @@
 
         <links>
             <item name="Apache" href="http://www.apache.org"; />
-            <item name="Tiles 2" href="http://tiles.apache.org"; />
+            <item name="Tiles" href="http://tiles.apache.org"; />
         </links>
 
         <menu name="Apache Tiles&#8482;">

svn commit: r1080655 - in /tiles: framework/trunk/src/site/ framework/trunk/src/site/xdoc/dev/ framework/trunk/tiles-freemarker/ framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/ framework/trunk/tiles-velocity/ site/src/site/

Reply via email to