Permalink
Browse files

Revert API link

  • Loading branch information...
1 parent 68e33b7 commit b1315bdf2d72678b41766f49e42a34bd6d1da52c @tjweir committed May 26, 2010
Showing with 9 additions and 5 deletions.
  1. +1 −1 site/10_release.html
  2. +4 −0 site/docs/getting_started.html
  3. +1 −1 site/download.html
  4. +1 −1 site/index.html
  5. +1 −1 site/quotes.html
  6. +1 −1 site/team.html
View
@@ -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://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/scaladocs/liftweb/1.0/" 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>
@@ -30,7 +30,11 @@
<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>
+<<<<<<< .merge_file_sUosF3
<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://scala-tools.org/scaladocs/liftweb/1.0/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
+>>>>>>> .merge_file_eIzLrE
<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
@@ -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://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/scaladocs/liftweb/1.0/" 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
@@ -45,7 +45,7 @@
<a href="download.html">Download</a>
</li>
<li>
- <a href="http://scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a>
+ <a href="http://scala-tools.org/scaladocs/liftweb/1.0/" 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>
View
@@ -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://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/scaladocs/liftweb/1.0/" 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
@@ -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://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/scaladocs/liftweb/1.0/" 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 b1315bd

Please sign in to comment.