Author: crossley Date: Sun May 24 15:08:54 2009 New Revision: 778171 URL: http://svn.apache.org/viewvc?rev=778171&view=rev Log: Copy the new description to the various other documents. Tweak the concise description, to align with best practice for trademarks. Thanks to assistance from Apache PRC. Issue: FOR-1171
Modified: forrest/trunk/README.txt forrest/trunk/admin/announcement-0.8.txt forrest/trunk/etc/RELEASE-NOTES-0.8.txt forrest/trunk/index.html forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-simple.xml forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-site.xml forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/plain.xml forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/doap-forrest.xml forrest/trunk/site-author/content/doap.xml forrest/trunk/site-author/content/xdocs/flyer.xml forrest/trunk/site-author/status.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/doap/doap-forrest.xml Modified: forrest/trunk/README.txt URL: http://svn.apache.org/viewvc/forrest/trunk/README.txt?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/README.txt (original) +++ forrest/trunk/README.txt Sun May 24 15:08:54 2009 @@ -1,12 +1,12 @@ What is Apache Forrest ---------------------- -Apache Forrest is a publishing framework that transforms -input from various sources into a unified presentation -in one or more output formats. The modular and extensible -plugin architecture is based on Apache Cocoon and relevant -standards, which separates presentation from content. -Forrest can generate static documents, or be used as a -dynamic server, or be deployed by its automated facility. +Apache Forrest (tm) software is a publishing framework that transforms +input from various sources into a unified presentation in one or more +output formats. The modular and extensible plug-in architecture of +Apache Forrest is based on Apache Cocoon and the relevant industry +standards that separate presentation from content. Forrest can generate +static documents, or be used as a dynamic server, or be deployed by its +automated facility. Requirements ------------ Modified: forrest/trunk/admin/announcement-0.8.txt URL: http://svn.apache.org/viewvc/forrest/trunk/admin/announcement-0.8.txt?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/admin/announcement-0.8.txt (original) +++ forrest/trunk/admin/announcement-0.8.txt Sun May 24 15:08:54 2009 @@ -5,11 +5,12 @@ Apache Forrest is pleased to release the new version: apache-forrest-0.8 http://forrest.apache.org/mirrors.cgi -Apache Forrest is a publishing framework that transforms -input from various sources into a unified presentation -in one or more output formats. The modular and extensible -plugin architecture is based on Apache Cocoon and relevant -standards, which separates presentation from content. +Apache Forrest (tm) software is a publishing framework +that transforms input from various sources into a unified +presentation in one or more output formats. The modular +and extensible plug-in architecture of Apache Forrest +is based on Apache Cocoon and the relevant industry +standards that separate presentation from content. Forrest can generate static documents, or be used as a dynamic server, or be deployed by its automated facility. Modified: forrest/trunk/etc/RELEASE-NOTES-0.8.txt URL: http://svn.apache.org/viewvc/forrest/trunk/etc/RELEASE-NOTES-0.8.txt?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/etc/RELEASE-NOTES-0.8.txt (original) +++ forrest/trunk/etc/RELEASE-NOTES-0.8.txt Sun May 24 15:08:54 2009 @@ -6,12 +6,13 @@ It can be downloaded from one of the Apache Software Foundation mirror sites [Link: http://forrest.apache.org/mirrors.cgi]. - Apache Forrest is a publishing framework that transforms input from - various sources into a unified presentation in one or more output - formats. The modular and extensible plugin architecture is based on - Apache Cocoon and relevant standards, which separates presentation from - content. Forrest can generate static documents, or be used as a dynamic - server, or be deployed by its automated facility. + Apache Forrest (tm) software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. Requirements ============ Modified: forrest/trunk/index.html URL: http://svn.apache.org/viewvc/forrest/trunk/index.html?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/index.html (original) +++ forrest/trunk/index.html Sun May 24 15:08:54 2009 @@ -30,12 +30,13 @@ <hr /> <h2>What is this?</h2> <p> - Apache Forrest is a publishing framework that transforms input from - various sources into a unified presentation in one or more output formats. - The modular and extensible plugin architecture is based on Apache Cocoon - and relevant standards, which separates presentation from content. Forrest - can generate static documents, or be used as a dynamic server, or be - deployed by its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </p> <h2>What do I do now?</h2> <p> Modified: forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-simple.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-simple.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-simple.xml (original) +++ forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-simple.xml Sun May 24 15:08:54 2009 @@ -27,12 +27,13 @@ <a href="link-simple.html">link</a> </p> <p> - Apache Forrest is a publishing framework that transforms input from - various sources into a unified presentation in one or more output - formats. The modular and extensible plugin architecture is based on - Apache Cocoon and relevant standards, which separates presentation from - content. Forrest can generate static documents, or be used as a dynamic - server, or be deployed by its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </p> </section> </body> Modified: forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-site.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-site.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-site.xml (original) +++ forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/link-site.xml Sun May 24 15:08:54 2009 @@ -27,12 +27,13 @@ <a href="site:link-simple">link</a> </p> <p> - Apache Forrest is a publishing framework that transforms input from - various sources into a unified presentation in one or more output - formats. The modular and extensible plugin architecture is based on - Apache Cocoon and relevant standards, which separates presentation from - content. Forrest can generate static documents, or be used as a dynamic - server, or be deployed by its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </p> </section> </body> Modified: forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/plain.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/plain.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/plain.xml (original) +++ forrest/trunk/main/template-sites/benchmark/src/documentation/content/xdocs/plain.xml Sun May 24 15:08:54 2009 @@ -24,12 +24,13 @@ <section id="overview"> <title>Overview</title> <p> - Apache Forrest is a publishing framework that transforms input from - various sources into a unified presentation in one or more output - formats. The modular and extensible plugin architecture is based on - Apache Cocoon and relevant standards, which separates presentation from - content. Forrest can generate static documents, or be used as a dynamic - server, or be deployed by its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </p> </section> </body> Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/doap-forrest.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/doap-forrest.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/doap-forrest.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/doap-forrest.xml Sun May 24 15:08:54 2009 @@ -48,12 +48,13 @@ Aggregated multi-channel documentation framework, separation of concerns. </doap:shortdesc> <doap:description xml:lang="en"> - Apache Forrest is a publishing framework that transforms input from various - sources into a unified presentation in one or more output formats. The - modular and extensible plugin architecture is based on Apache Cocoon and - relevant standards, which separates presentation from content. Forrest can - generate static documents, or be used as a dynamic server, or be deployed by - its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </doap:description> <doap:programming-language xml:lang="en">Java</doap:programming-language> <doap:category rdf:resource="http://projects.apache.org/category/build-management"/> Modified: forrest/trunk/site-author/content/doap.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/doap.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/site-author/content/doap.xml (original) +++ forrest/trunk/site-author/content/doap.xml Sun May 24 15:08:54 2009 @@ -48,12 +48,13 @@ Aggregated multi-channel documentation framework, separation of concerns. </doap:shortdesc> <doap:description xml:lang="en"> - Apache Forrest is a publishing framework that transforms input from various - sources into a unified presentation in one or more output formats. The - modular and extensible plugin architecture is based on Apache Cocoon and - relevant standards, which separates presentation from content. Forrest can - generate static documents, or be used as a dynamic server, or be deployed by - its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </doap:description> <doap:programming-language xml:lang="en">Java</doap:programming-language> <doap:category rdf:resource="http://projects.apache.org/category/build-management"/> Modified: forrest/trunk/site-author/content/xdocs/flyer.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/flyer.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/flyer.xml (original) +++ forrest/trunk/site-author/content/xdocs/flyer.xml Sun May 24 15:08:54 2009 @@ -22,11 +22,12 @@ </header> <body> <p> - Apache Forrest (<a href="site:forrest">forrest.apache.org</a>) is a - publishing framework that transforms input from various sources into a - unified presentation in one or more output formats. The modular and - extensible plugin architecture is based on Apache Cocoon and relevant - standards, which separates presentation from content. Forrest can generate + Apache Forrest™ software (<a href="site:forrest">forrest.apache.org</a>) + is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate static documents, or be used as a dynamic server, or be deployed by its automated facility. </p> Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Sun May 24 15:08:54 2009 @@ -76,12 +76,13 @@ Foundation mirror sites</link>. </p> <p> - Apache Forrest is a publishing framework that transforms input from - various sources into a unified presentation in one or more output - formats. The modular and extensible plugin architecture is based on - Apache Cocoon and relevant standards, which separates presentation - from content. Forrest can generate static documents, or be used as a - dynamic server, or be deployed by its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </p> </section> <section> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/doap/doap-forrest.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/doap/doap-forrest.xml?rev=778171&r1=778170&r2=778171&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/doap/doap-forrest.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/doap/doap-forrest.xml Sun May 24 15:08:54 2009 @@ -48,12 +48,13 @@ Aggregated multi-channel documentation framework, separation of concerns. </doap:shortdesc> <doap:description xml:lang="en"> - Apache Forrest is a publishing framework that transforms input from various - sources into a unified presentation in one or more output formats. The - modular and extensible plugin architecture is based on Apache Cocoon and - relevant standards, which separates presentation from content. Forrest can - generate static documents, or be used as a dynamic server, or be deployed by - its automated facility. + Apache Forrest™ software is a publishing framework that transforms + input from various sources into a unified presentation in one or more + output formats. The modular and extensible plug-in architecture of + Apache Forrest is based on Apache Cocoon and the relevant industry + standards that separate presentation from content. Forrest can generate + static documents, or be used as a dynamic server, or be deployed by its + automated facility. </doap:description> <doap:programming-language xml:lang="en">Java</doap:programming-language> <doap:category rdf:resource="http://projects.apache.org/category/build-management"/>