You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by bu...@apache.org on 2011/07/29 18:10:22 UTC
svn commit: r793449 - in /websites/staging/etch/trunk/content/etch: ./ css/
Author: buildbot
Date: Fri Jul 29 16:10:20 2011
New Revision: 793449
Log:
Staging update by buildbot
Modified:
websites/staging/etch/trunk/content/etch/archive-pre-apache.html
websites/staging/etch/trunk/content/etch/archive.html
websites/staging/etch/trunk/content/etch/buildserver.html
websites/staging/etch/trunk/content/etch/contributors.html
websites/staging/etch/trunk/content/etch/css/layout.css
websites/staging/etch/trunk/content/etch/documentation-faq.html
websites/staging/etch/trunk/content/etch/documentation-manual.html
websites/staging/etch/trunk/content/etch/documentation.html
websites/staging/etch/trunk/content/etch/downloads.html
websites/staging/etch/trunk/content/etch/get-involved.html
websites/staging/etch/trunk/content/etch/getting-started.html
websites/staging/etch/trunk/content/etch/index.html
websites/staging/etch/trunk/content/etch/issue-tracking.html
websites/staging/etch/trunk/content/etch/mailinglists.html
websites/staging/etch/trunk/content/etch/presentations.html
websites/staging/etch/trunk/content/etch/roadmap.html
websites/staging/etch/trunk/content/etch/sources.html
websites/staging/etch/trunk/content/etch/tools.html
Modified: websites/staging/etch/trunk/content/etch/archive-pre-apache.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/archive-pre-apache.html (original)
+++ websites/staging/etch/trunk/content/etch/archive-pre-apache.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/archive.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/archive.html (original)
+++ websites/staging/etch/trunk/content/etch/archive.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/buildserver.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/buildserver.html (original)
+++ websites/staging/etch/trunk/content/etch/buildserver.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/contributors.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/contributors.html (original)
+++ websites/staging/etch/trunk/content/etch/contributors.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/css/layout.css
==============================================================================
--- websites/staging/etch/trunk/content/etch/css/layout.css (original)
+++ websites/staging/etch/trunk/content/etch/css/layout.css Fri Jul 29 16:10:20 2011
@@ -247,6 +247,7 @@ table {
width:100%;
border:1px solid #bbb;
margin-bottom:10px;
+ font-size:1.2em;
}
col.colC {
width:8em;
@@ -257,7 +258,9 @@ th, td {
}
thead th {
border-bottom:2px solid #888;
- background:#bbb;
+ border:1px solid #3e4f90;
+ background:#3e4f90;
+ color: #fff;
padding:.4em 1em .2em;
}
thead th.table-head {
@@ -265,14 +268,14 @@ thead th.table-head {
font-weight:normal;
text-transform:uppercase;
color:#fff;
- background:#555;
- border:1px solid #555;
+ background:#3e4f90;
+ border:1px solid #bbb;
}
tbody th,
tbody td {
border-top:1px solid #bbb;
border-bottom:1px solid #bbb;
- background:#eee;
+ background:#fff;
}
tbody tr.odd th,
tbody tr.odd td {
Modified: websites/staging/etch/trunk/content/etch/documentation-faq.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/documentation-faq.html (original)
+++ websites/staging/etch/trunk/content/etch/documentation-faq.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/documentation-manual.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/documentation-manual.html (original)
+++ websites/staging/etch/trunk/content/etch/documentation-manual.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/documentation.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/documentation.html (original)
+++ websites/staging/etch/trunk/content/etch/documentation.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
@@ -82,6 +80,7 @@
</div>
<div id="content">
<h1 id="documentation">Documentation</h1>
+<p>We are currently working on a restructuring and expansion of the Etch documentation. In the meanwhile you can use the existing documentation pages available at <a href="https://cwiki.apache.org/ETCH/documentation.html">https://cwiki.apache.org/ETCH/documentation.html</a>.</p>
</div>
<div class="clear"></div>
Modified: websites/staging/etch/trunk/content/etch/downloads.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/downloads.html (original)
+++ websites/staging/etch/trunk/content/etch/downloads.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/get-involved.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/get-involved.html (original)
+++ websites/staging/etch/trunk/content/etch/get-involved.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/getting-started.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/getting-started.html (original)
+++ websites/staging/etch/trunk/content/etch/getting-started.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
@@ -82,18 +80,153 @@
</div>
<div id="content">
<h1 id="getting_started">Getting Started</h1>
-<p>Following steps give you an introduction how to configure, build and work with the Apache Incubator Etch sources. At the the moment we support Windows and Linux builds. </p>
+<p>The following steps give you an introduction how to configure, build and work with the Apache Incubator Etch sources. At the the moment we support Windows and Linux builds. </p>
<ol>
-<li>Preconditions</li>
-<li>Get the source code</li>
-<li>Build sources</li>
+<li><a href="#Preconditions">Preconditions</a></li>
+<li><a href="#getSourceCode">Get the source code</a></li>
+<li><a href="#buildSources">Build sources</a></li>
+</ol>
+<p>After your build of Apache Incubator Etch was successful, you will be able to run the examples in the example directory. </p>
+<h3 id="Preconditions">Preconditions</h3>
+<p>The tools and libraries mentioned in the following listing must be available on your development machine in order to be able to work with Etch.
+It is a good practice to set up a folder containing the external dependencies of all the bindings you would like to build. This folder will be called <strong>ETCH_EXTERNAL_DEPENDS</strong> later on. </p>
+<p>You can use the workspace contents of our continous integration server as a reference
+for your machine:</p>
+<ul>
+<li>Win32: <a href="https://builds.apache.org/job/etch-trunk-windows-x86/ws/externals/">https://builds.apache.org/job/etch-trunk-windows-x86/ws/externals/</a></li>
+<li>Linux: <a href="https://builds.apache.org/job/etch-trunk-linux-x86/ws/externals/">https://builds.apache.org/job/etch-trunk-linux-x86/ws/externals/</a></li>
+</ul>
+<table style="width:99%;">
+ <thead>
+ <tr>
+ <th>Component</th>
+ <th>Prerequisites and dependencies</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td style="vertical-align:middle; width:200px">Etch compiler/code generator <br/><b>[mandatory for each binding]</b></td>
+ <td>
+ <ul>
+ <li>Java JDK version 1.5_011 or higher</li>
+ <li>Apache Ant 1.8.2 or higher</li>
+ <li>JavaCC 4.0</li>
+ <li>JUnit 4.3.1</li>
+ <li> Velocity 1.5</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Binding Java
+ </td>
+ <td>
+ no additional dependencies
+ </td>
+ </tr>
+ <tr>
+ <td>Binding C#</td>
+ <td>
+ <ul>
+ <li>Apache Ant DotNet 1.0</li>
+ <li>.NET Framework 2.0 (Visual Studio 2005)</li>
+ <li>(Mono 1.9 support is experimental)</li>
+ <li>NUnit 2.5.9.10348</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>Binding C</td>
+ <td>
+ <ul>
+ <li>Apache APR 1.3.12</li>
+ <li>Apache APR Util 1.3.12</li>
+ <li>Apache APR iconv</li>
+ <li>Cunit 2.1</li>
+ <li>Apache Ant CMake 1.0 (cmakeant.jar)</li>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+<p>After the download of all the dependencies mentioned above you should now have the following structure (if you want to compile and build for all language bindings):</p>
+<div class="codehilite"><pre><span class="n">ETCH_EXTERNAL_DEPENDS</span><span class="o">/</span>
+ <span class="n">javacc</span><span class="o">/</span>
+ <span class="mf">4.0</span><span class="o">/</span>
+ <span class="n">javacc</span><span class="o">.</span><span class="n">jar</span>
+ <span class="n">junit</span> <span class="o">/</span>
+ <span class="mf">4.3.1</span><span class="o">/</span>
+ <span class="n">junit</span><span class="o">-</span><span class="mf">4.3.1</span><span class="o">.</span><span class="n">jar</span>
+ <span class="n">nunit</span><span class="o">/</span>
+ <span class="mf">2.4.7</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">contents</span> <span class="n">of</span> <span class="n">nunit</span> <span class="mf">2.4.7</span> <span class="n">release</span> <span class="n">tgz</span><span class="o">/</span><span class="n">zip</span><span class="p">]</span>
+ <span class="mf">2.5.9.10348</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">contents</span> <span class="n">of</span> <span class="n">nunit</span> <span class="mf">2.5.9.10348</span> <span class="n">release</span> <span class="n">tgz</span><span class="o">/</span><span class="n">zip</span><span class="p">]</span>
+ <span class="n">velocity</span><span class="o">/</span>
+ <span class="mf">1.5</span><span class="o">/</span>
+ <span class="n">velocity</span><span class="o">-</span><span class="n">dep</span><span class="o">-</span><span class="mf">1.5</span><span class="o">.</span><span class="n">jar</span>
+ <span class="n">apache</span><span class="o">-</span><span class="n">ant</span><span class="o">/</span>
+ <span class="mf">1.8.2</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">contents</span> <span class="n">of</span> <span class="n">apache</span> <span class="n">ant</span> <span class="mf">1.8.2</span> <span class="n">release</span> <span class="n">tgz</span><span class="o">/</span><span class="n">zip</span><span class="p">]</span>
+ <span class="n">apache</span><span class="o">-</span><span class="n">ant</span><span class="o">-</span><span class="n">cmake</span><span class="o">/</span>
+ <span class="mf">1.0</span><span class="o">/</span>
+ <span class="n">cmakeant</span><span class="o">.</span><span class="n">jar</span>
+ <span class="n">apache</span><span class="o">-</span><span class="n">ant</span><span class="o">-</span><span class="n">dotnet</span><span class="o">/</span>
+ <span class="mf">1.0</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">contents</span> <span class="n">of</span> <span class="n">apache</span> <span class="n">ant</span> <span class="n">dotnet</span> <span class="mf">1.0</span> <span class="n">release</span> <span class="n">tgz</span><span class="o">/</span><span class="n">zip</span><span class="p">]</span>
+ <span class="n">apr</span><span class="o">/</span>
+ <span class="mf">1.3.2</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">apr</span> <span class="n">binary</span> <span class="n">installation</span><span class="p">,</span> <span class="n">see</span> <span class="n">above</span><span class="p">]</span>
+ <span class="n">cmake</span><span class="o">/</span>
+ <span class="mf">2.8.2</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">contents</span> <span class="n">of</span> <span class="n">cmake</span> <span class="n">standalone</span> <span class="mf">2.8.2</span> <span class="n">release</span> <span class="n">tgz</span><span class="o">/</span><span class="n">zip</span><span class="p">]</span>
+ <span class="n">cunit</span><span class="o">/</span>
+ <span class="mf">2.1</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">built</span> <span class="n">cunit</span> <span class="n">version</span><span class="p">,</span>
+ <span class="n">on</span> <span class="n">linux:</span> <span class="n">you</span> <span class="n">can</span> <span class="n">skip</span> <span class="n">this</span> <span class="ow">and</span> <span class="k">use</span> <span class="nb">system</span> <span class="n">libraries</span> <span class="n">on</span> <span class="n">your</span> <span class="n">machine</span><span class="p">,</span> <span class="n">e</span><span class="o">.</span><span class="n">g</span><span class="o">.</span> <span class="n">apt</span><span class="o">-</span><span class="n">get</span> <span class="n">install</span> <span class="n">libcunit1</span> <span class="n">libcunit1</span><span class="o">-</span><span class="n">dev</span>
+ <span class="n">on</span> <span class="n">win32:</span> <span class="n">see</span> <span class="n">binding</span><span class="o">-</span><span class="n">c</span><span class="sr">/runtime/c</span><span class="o">/</span><span class="n">README</span><span class="o">.</span><span class="n">txt</span> <span class="k">for</span> <span class="n">instructions</span> <span class="n">on</span> <span class="n">building</span> <span class="n">cunit</span> <span class="n">on</span> <span class="n">Win32</span><span class="p">]</span>
+ <span class="n">nsis</span><span class="o">/</span> <span class="p">(</span><span class="n">WINDOWS</span> <span class="n">ONLY</span><span class="p">)</span>
+ <span class="mf">2.23</span><span class="o">/</span>
+ <span class="p">[</span><span class="n">skip</span> <span class="k">if</span> <span class="n">you</span> <span class="n">want</span> <span class="nb">no</span> <span class="n">installer</span> <span class="n">built</span><span class="p">,</span> <span class="k">else</span><span class="p">:</span> <span class="n">contents</span> <span class="n">of</span> <span class="n">nsis</span> <span class="mf">2.23</span> <span class="n">standalone</span> <span class="n">zip</span><span class="o">/</span><span class="n">tgz</span><span class="p">]</span>
+</pre></div>
+
+
+<h3 id="getSourceCode">Get the source code</h3>
+<p>You can checkout the source tree by using the following SVN command:</p>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/incubator/</span><span class="n">etch</span><span class="sr">/trunk/</span>
+</pre></div>
+
+
+<p>If you prefer to use Git you can use git-svn:</p>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">svn</span> <span class="n">clone</span> <span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/incubator/</span><span class="n">etch</span><span class="sr">/trunk/</span>
+</pre></div>
+
+
+<h3 id="buildSources">Build sources</h3>
+<p>As soon as all the required dependencies and the source is available on your machine, you are able to build Etch.</p>
+<h5 id="ant_build">Ant Build</h5>
+<ol>
+<li>
+<p>Open the <code>scripts/antSetup.bat</code> (Windows) or <code>scripts/antSetup.sh</code> (Linux) with your favourite text editor</p>
+</li>
+<li>
+<p>Check if every environment variable set by the script points to the right location</p>
+</li>
+<li>
+<p>Run the antSetup script to prepare your build environment</p>
+<p>Win32:
+ <code>scripts/antSetup.bat</code></p>
+<p>Linux:
+ <code>source scripts/antSetup.sh</code></p>
+</li>
+<li>
+<p>Check the correctness of the paths to the jar archives Etch depends on in the <code>build.dependencies</code> file inside the root folder.</p>
+</li>
+<li>
+<p>Start build by executeing <code>ant debug</code> at the shell prompt</p>
+</li>
</ol>
-<h3 id="preconditions">Preconditions</h3>
-<p>Information about Preconditions</p>
-<h3 id="get_the_source_code">Get the source code</h3>
-<p>Information how to get the source code</p>
-<h3 id="build_sources">Build sources</h3>
-<p>Information how to build the sources</p>
</div>
<div class="clear"></div>
Modified: websites/staging/etch/trunk/content/etch/index.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/index.html (original)
+++ websites/staging/etch/trunk/content/etch/index.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/issue-tracking.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/issue-tracking.html (original)
+++ websites/staging/etch/trunk/content/etch/issue-tracking.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/mailinglists.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/mailinglists.html (original)
+++ websites/staging/etch/trunk/content/etch/mailinglists.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/presentations.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/presentations.html (original)
+++ websites/staging/etch/trunk/content/etch/presentations.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
@@ -82,6 +80,21 @@
</div>
<div id="content">
<h1 id="presentations">Presentations</h1>
+<p>The Etch middleware has been introduced on several events. Please find the slides and corresponding videos below:</p>
+<ul>
+<li>FOSDEM 2011<ul>
+<li>Slides at <a href="http://www.slideshare.net/grandyho/apache-etch-introduction-fosdem-2011">Slideshare</a></li>
+<li>Video at <a href="http://www.youtube.com/watch?v=1h76ch2-G-M">Youtube</a></li>
+</ul>
+</li>
+<li>
+<p>Cisco Unified Application Environment Developer Conference</p>
+<ul>
+<li>Slides can be found <a href="http://developer.cisco.com/c/document_library/get_file?groupId=13403&folderId=63902&name=DLFE-8208.pdf">here</a></li>
+<li>Video is available <a href="http://developer.cisco.com/web/cuae/devconf2008_session_3">here</a></li>
+</ul>
+</li>
+</ul>
</div>
<div class="clear"></div>
Modified: websites/staging/etch/trunk/content/etch/roadmap.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/roadmap.html (original)
+++ websites/staging/etch/trunk/content/etch/roadmap.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/sources.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/sources.html (original)
+++ websites/staging/etch/trunk/content/etch/sources.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>
Modified: websites/staging/etch/trunk/content/etch/tools.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/tools.html (original)
+++ websites/staging/etch/trunk/content/etch/tools.html Fri Jul 29 16:10:20 2011
@@ -66,8 +66,6 @@
<h1 id="documentation">Documentation</h1>
<ul>
<li><a href="documentation.html">Overview</a></li>
-<li><a href="documentation-manual.html">Manual</a></li>
-<li><a href="documentation-faq.html">FAQ</a></li>
<li><a href="presentations.html">Presentations</a></li>
</ul>
<h1 id="foundation">Foundation</h1>