Skip to content
Browse files

merged

  • Loading branch information...
2 parents ff675b4 + c8f812e commit 68e33b7c73c311ff6b4b7d215e2af41b5fb017b4 @tjweir committed May 26, 2010
Showing with 12 additions and 9 deletions.
  1. +1 −1 site/10_release.html
  2. +1 −1 site/docs/getting_started.html
  3. +1 −1 site/download.html
  4. +7 −4 site/index.html
  5. +1 −1 site/quotes.html
  6. +1 −1 site/team.html
View
2 site/10_release.html
@@ -28,7 +28,7 @@
<li class="first"><a href="index.html">Home</a></li>
<li><a href="docs/getting_started.html" onclick="javascript:pageTracker._trackPageview('/docs/getting_started.html');">Getting Started</a></li>
<li><a href="download.html">Download</a></li>
- <li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
+ <li><a href="http://scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
<li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>
View
2 site/docs/getting_started.html
@@ -30,7 +30,7 @@
<li class="first"><a href="../index.html">Home</a></li>
<li><a href="getting_started.html" onclick="javascript:pageTracker._trackPageview('/docs/getting_started.html');">Getting Started</a></li>
<li><a href="../download.html">Download</a></li>
- <li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
+ <li><a href="http://scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
<li><a href="http://wiki.github.com/dpp/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="../team.html">Team</a></li>
View
2 site/download.html
@@ -30,7 +30,7 @@
<li class="first"><a href="index.html">Home</a></li>
<li><a href="docs/getting_started.html" onclick="javascript:pageTracker._trackPageview('/docs/getting_started.html');">Getting Started</a></li>
<li><a href="download.html">Download</a></li>
- <li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
+ <li><a href="http://scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
<li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>
View
11 site/index.html
@@ -45,7 +45,7 @@
<a href="download.html">Download</a>
</li>
<li>
- <a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a>
+ <a href="http://scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a>
</li>
<li>
<a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a>
@@ -96,11 +96,14 @@
News
</h1>
<h2>
- Lift 2.0 Progressing
+ <a href="http://groups.google.com/group/liftweb/browse_thread/thread/32e93cfbb4ae3c16/8e5bb7da07f3d088?hl=en&lnk=gst">Lift 2.0 Milestone 5
+ available</a>
</h2>
<p>
- 2010/05/15 - Lift 2.0 is under active development and the Lift community released Milestone 5 on May 5. Lift 2.0 will be released after Scala 2.8 is released. Please see the <a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Lift</a> and <a href="http://groups.google.com/group/lift-announce">Lift Announce</a> Google Groups for more news.<br />
- </p>
+ 2010/05/05 - Lift is evolving toward its 2.0 release (currently
+ schedule for July, 2010.) Check out the latest milestone
+ release, M5. And, yes, it's production ready.<br />
+ </p><br />
<h2>
<a href="10_release.html">Lift 1.0 Released!</a>
</h2>
View
2 site/quotes.html
@@ -30,7 +30,7 @@
<li class="first"><a href="index.html">Home</a></li>
<li><a href="docs/getting_started.html" onclick="javascript:pageTracker._trackPageview('/docs/getting_started.html');">Getting Started</a></li>
<li><a href="download.html">Download</a></li>
- <li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
+ <li><a href="http://scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
<li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>
View
2 site/team.html
@@ -30,7 +30,7 @@
<li class="first"><a href="index.html">Home</a></li>
<li><a href="docs/getting_started.html" onclick="javascript:pageTracker._trackPageview('/docs/getting_started.html');">Getting Started</a></li>
<li><a href="download.html">Download</a></li>
- <li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
+ <li><a href="http://scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
<li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>

0 comments on commit 68e33b7

Please sign in to comment.
Something went wrong with that request. Please try again.