You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2011/08/10 17:50:36 UTC

svn commit: r1156239 - in /lucene/cms/trunk: content/lucene/core/ content/lucene/solr/ lib/ templates/

Author: gsingers
Date: Wed Aug 10 15:50:35 2011
New Revision: 1156239

URL: http://svn.apache.org/viewvc?rev=1156239&view=rev
Log:
LUCENE-2748: working towards no news on inner pages

Added:
    lucene/cms/trunk/content/lucene/core/developer.mdtext
    lucene/cms/trunk/content/lucene/core/features.mdtext
    lucene/cms/trunk/content/lucene/solr/discussion.mdtext
      - copied, changed from r1155009, lucene/cms/trunk/content/lucene/solr/mailing-lists.mdtext
    lucene/cms/trunk/templates/core-simple.html
    lucene/cms/trunk/templates/openrelevance-simple.html
    lucene/cms/trunk/templates/pylucene-simple.html
    lucene/cms/trunk/templates/solr-simple.html
      - copied, changed from r1156116, lucene/cms/trunk/templates/solr.html
Removed:
    lucene/cms/trunk/content/lucene/solr/mailing-lists.mdtext
Modified:
    lucene/cms/trunk/lib/path.pm
    lucene/cms/trunk/templates/solr.html

Added: lucene/cms/trunk/content/lucene/core/developer.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/lucene/core/developer.mdtext?rev=1156239&view=auto
==============================================================================
--- lucene/cms/trunk/content/lucene/core/developer.mdtext (added)
+++ lucene/cms/trunk/content/lucene/core/developer.mdtext Wed Aug 10 15:50:35 2011
@@ -0,0 +1,68 @@
+#Source Code
+The source files are now stored using Subversion (see http://subversion.tigris.org/ and http://svnbook.red-bean.com/)
+
+- Latest <b>trunk</b>:
+<code>svn checkout http://svn.apache.org/repos/asf/lucene/dev/trunk lucene_trunk</code>
+
+- Latest <b>stable 3.x branch</b>:
+<code>svn checkout http://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x lucene_3x</code>
+
+
+
+#Changes List
+
+- Current changes list <em>(as of the most recent nightly <b>trunk</b> build)</em> is available
+<a href="https://builds.apache.org/hudson/job/Lucene-trunk/lastSuccessfulBuild/artifact/artifacts/changes/Changes.html">
+here</a>.
+- Current changes list <em>(as of the most recent nightly <b>stable 3.x branch</b> build)</em> is available
+<a href="https://builds.apache.org/hudson/job/Lucene-3.x/lastSuccessfulBuild/artifact/artifacts/changes/Changes.html">
+here</a>.
+
+
+#Making a Contribution
+Lucene Java is always looking for contributions, especially in the areas of documentation. See the <a
+href="http://wiki.apache.org/lucene-java">Wiki</a> for details on contributing.
+
+#Nightly Builds
+
+<a href="http://jenkins-ci.org/">Jenkins</a> is providing continuous integration capabilities to the Lucene
+project. It is responsible for running nightly builds, code coverage reports as well as building the nightly version
+of the website.
+
+#Nightly Build Documentation
+Unofficial Documentation <em>(as of the most recent nightly <b>trunk</b> build)</em> is available <a href="http://lucene.apache.org/java/docs/nightly/index.html">here</a>.
+#Nightly Build Javadocs
+Unofficial nightly Javadocs are also generated by Jenkins:
+
+- Unofficial Javadocs from the nightly <b>trunk</b> build are available <a href="https://builds.apache.org/hudson/job/Lucene-trunk/javadoc/">here</a>.
+- Unofficial Javadocs from the nightly <b>stable 3.x branch</b> build are available <a href="https://builds.apache.org/hudson/job/Lucene-3.x/javadoc/">here</a>.
+
+
+#Clover Test Coverage Reports
+<a href="http://www.atlassian.com/software/clover/">Clover</a> test coverage results are available:
+
+- As of the most recent nightly <b>trunk</b> build:
+    <a href="https://builds.apache.org/hudson/job/Lucene-trunk/lastSuccessfulBuild/clover-report/">here</a>
+
+- As of the most recent nightly <b>stable 3.x branch</b> build:
+    <a href="https://builds.apache.org/hudson/job/Lucene-3.x/lastSuccessfulBuild/clover-report/">here</a>
+
+
+
+#Nightly Build Download
+
+- Nightly build artifacts are based on the <b>trunk</b> version of the code checked into
+    <a href="https://svn.apache.org/repos/asf/lucene/dev/trunk">SVN</a>:<br/>
+  <a href="https://builds.apache.org/hudson/job/Lucene-trunk/lastSuccessfulBuild/artifact/artifacts/">Download trunk Artifacts</a>.
+  Also Maven artifacts are available
+  <a href="https://builds.apache.org/hudson/job/Lucene-Solr-Maven-trunk/lastSuccessfulBuild/artifact/maven_artifacts/">here</a>.
+
+- Nightly build artifacts are based on the <b>stable 3.x branch</b> version of the code checked into
+    <a href="https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x">SVN</a>:<br/>
+  <a href="https://builds.apache.org/hudson/job/Lucene-3.x/lastSuccessfulBuild/artifact/artifacts/">Download 3.x Artifacts</a>.
+  Also Maven artifacts are available
+  <a href="https://builds.apache.org/hudson/job/Lucene-Solr-Maven-3.x/lastSuccessfulBuild/artifact/maven_artifacts/">here</a>.
+
+
+
+

Added: lucene/cms/trunk/content/lucene/core/features.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/lucene/core/features.mdtext?rev=1156239&view=auto
==============================================================================
--- lucene/cms/trunk/content/lucene/core/features.mdtext (added)
+++ lucene/cms/trunk/content/lucene/core/features.mdtext Wed Aug 10 15:50:35 2011
@@ -0,0 +1,32 @@
+#Features
+Lucene offers powerful features through a simple API:
+
+
+##Scalable, High-Performance Indexing
+
+- over 95GB/hour on modern hardware<br/>
+- small RAM requirements -- only 1MB heap
+- incremental indexing as fast as batch indexing
+- index size roughly 20-30% the size of text indexed
+
+##Powerful, Accurate and Efficient Search Algorithms
+
+- ranked searching -- best results returned first
+- many powerful query types: phrase queries, wildcard queries, proximity
+	queries, range queries and more
+- fielded searching (e.g., title, author, contents)
+- date-range searching
+- sorting by any field
+- multiple-index searching with merged results
+- allows simultaneous update and searching
+
+
+
+##Cross-Platform Solution
+
+- Available as Open Source software under the
+	<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License</a>
+	which lets you use Lucene in both commercial and Open Source programs
+- 100%-pure Java
+- Implementations <a href="http://wiki.apache.org/lucene-java/LuceneImplementations">in other
+	programming languages available</a> that are index-compatible

Copied: lucene/cms/trunk/content/lucene/solr/discussion.mdtext (from r1155009, lucene/cms/trunk/content/lucene/solr/mailing-lists.mdtext)
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/lucene/solr/discussion.mdtext?p2=lucene/cms/trunk/content/lucene/solr/discussion.mdtext&p1=lucene/cms/trunk/content/lucene/solr/mailing-lists.mdtext&r1=1155009&r2=1156239&rev=1156239&view=diff
==============================================================================
--- lucene/cms/trunk/content/lucene/solr/mailing-lists.mdtext (original)
+++ lucene/cms/trunk/content/lucene/solr/discussion.mdtext Wed Aug 10 15:50:35 2011
@@ -1,4 +1,4 @@
-## Core User List
+# Core User List
 
 This list is for users of Java Lucene to ask questions, share knowledge,
 and discuss issues. <b>Do</b> send mail to this list with usage and configuration questions and problems.  Also, please
@@ -8,31 +8,41 @@ send questions to this list to verify yo
 - [Unsubscribe](mailto:solr-user-unsubscribe@lucene.apache.org)
 - [Official Archive](http://mail-archives.apache.org/mod_mbox/lucene-solr-user/)
 
-## Developer List
+# Developer List
 
 This is the list where participating developers of the Java Lucene project meet
 and discuss issues concerning Lucene internals, code changes/additions, etc. Do not send mail to this list
 with usage questions or configuration questions and problems.
 
-### Discussion list:
+# Discussion list:
 
 - [Subscribe](mailto:dev-subscribe@lucene.apache.org) *Do not send mail to this list with usage questions or configuration questions and problems.*
 - [Unsubscribe](mailto:dev-unsubscribe@lucene.apache.org)
 - [Official Archive](http://mail-archives.apache.org/mod_mbox/lucene-dev/)
 
 
-### Commit notifications:
+# Commit notifications:
 
 - [Subscribe](mailto:dev-commits-subscribe@lucene.apache.org)
 - [Unsubscribe](mailto:dev-commits-unsubscribe@lucene.apache.org)
 - [Archive](http://mail-archives.apache.org/mod_mbox/lucene-dev-commits/)
 
-## Mail Archives
+# IRC
+
+There are two primary IRC channels dedicated to Lucene at *chat.freenode.org*.
+- *#lucene* -- Channel for user questions
+- *#lucene-dev* -- Logged channel for Lucene development questions
+
+The IRC channel can be used for online discussion about Lucene related stuff,
+but developers should be careful to transfer all the official decisions or useful discussions to the issue tracking system.
+
+
+# Mail Archives
 
 The Solr Wiki maintains a list of searchable mailing list archives at [http://wiki.apache.org/solr/MailingListArchives](http://wiki.apache.org/solr/MailingListArchives).
 No endorsement is implied by the listing of an archive on the Wiki.
 
-## Other Mailing Lists
+# Other Mailing Lists
 
 Each Lucene project maintains its own mailing lists.  Please refer to the project you are interested in for details
     on subscribing to its mailing list.  For the Lucene TLP General mailing list, go [here](http://lucene.apache.org/mail.html).
\ No newline at end of file

Modified: lucene/cms/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/lib/path.pm?rev=1156239&r1=1156238&r2=1156239&view=diff
==============================================================================
--- lucene/cms/trunk/lib/path.pm (original)
+++ lucene/cms/trunk/lib/path.pm Wed Aug 10 15:50:35 2011
@@ -3,38 +3,62 @@ use ASF::Value;
 
 # taken from django's url.py
 
+# Patterns should go from more restrictive matches to less restrictive.
 our @patterns = (
 
-#	[qr!/sitemap\.html$!, sitemap => { headers => { title => "Lucene Sitemap" }} ],
+  #	[qr!/sitemap\.html$!, sitemap => { headers => { title => "Lucene Sitemap" }} ],
+  # separate ones for the index.html pages, as they will include the news
+	 [qr!core\/index\.mdtext$!, main => { template => "core.html",
+	   svn      => ASF::Value::SVN->new(project => "lucene/dev/trunk/lucene", limit => 5),
+  	 jira     => ASF::Value::Jira->new(limit => 5,
+                                url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
+     dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
+                                            limit => 3),
+     coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
+                                            limit => 3)
+	}],
+	[qr!solr\/index\.mdtext$!, main => { template => "solr.html",
+	  svn      => ASF::Value::SVN->new(project => "lucene/dev/trunk/solr", limit => 5),
+  	 jira     => ASF::Value::Jira->new(limit => 5,
+                                url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+SOLR+ORDER+BY+updatedDate+DESC&tempMax=20"),
+     dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
+                                            limit => 3),
+     solruser => ASF::Value::Mail->new(list => 'solr-user@lucene.apache.org',
+                                            limit => 3),
+	 }],
+	[qr!pylucene\/index\.mdtext$!, main => { template => "pylucene.html" }],
+	[qr!openrelevance\/index\.mdtext$!, main => { template => "openrelevance.html" }],
+
 	[qr!privacy\.mdtext$!, main => { template => "simple.html",
 	   svn      => ASF::Value::SVN->new(project => "lucene", limit => 5),
   	 jira     => ASF::Value::Jira->new(limit => 5,
-                                            url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
+                                url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
      dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
                                             limit => 3),
      coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
                                             limit => 3)
 	  }],
-	 [qr!core\/.*?\.mdtext$!, main => { template => "core.html",
-	   svn      => ASF::Value::SVN->new(project => "lucene", limit => 5),
+	 [qr!core\/.*?\.mdtext$!, main => { template => "core-simple.html",
+	   svn      => ASF::Value::SVN->new(project => "lucene/dev/trunk/lucene", limit => 5),
   	 jira     => ASF::Value::Jira->new(limit => 5,
-                                            url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
+                                url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+LUCENE+ORDER+BY+updatedDate+DESC&tempMax=20"),
      dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
                                             limit => 3),
      coreuser => ASF::Value::Mail->new(list => 'java-user@lucene.apache.org',
                                             limit => 3)
 	}],
-	[qr!solr\/.*?\.mdtext$!, main => { template => "solr.html",
+	[qr!solr\/.*?\.mdtext$!, main => { template => "solr-simple.html",
 	  svn      => ASF::Value::SVN->new(project => "lucene/dev/trunk/solr", limit => 5),
   	 jira     => ASF::Value::Jira->new(limit => 5,
-                                            url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+SOLR+ORDER+BY+updatedDate+DESC&tempMax=20"),
+                                url => "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-comments-rss/temp/SearchRequest.xml?jqlQuery=project+%3D+SOLR+ORDER+BY+updatedDate+DESC&tempMax=20"),
      dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',
                                             limit => 3),
      solruser => ASF::Value::Mail->new(list => 'solr-user@lucene.apache.org',
                                             limit => 3),
 	 }],
-	[qr!pylucene\/.*?\.mdtext$!, main => { template => "pylucene.html" }],
-	[qr!openrelevance\/.*?\.mdtext$!, main => { template => "openrelevance.html" }],
+	[qr!pylucene\/.*?\.mdtext$!, main => { template => "pylucene-simple.html" }],
+	[qr!openrelevance\/.*?\.mdtext$!, main => { template => "openrelevance-simple.html" }],
+
 	# keep the general one last
   [qr!\.mdtext$!, main => { template => "main.html",
      dev => ASF::Value::Mail->new(list => 'dev@lucene.apache.org',

Added: lucene/cms/trunk/templates/core-simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/core-simple.html?rev=1156239&view=auto
==============================================================================
--- lucene/cms/trunk/templates/core-simple.html (added)
+++ lucene/cms/trunk/templates/core-simple.html Wed Aug 10 15:50:35 2011
@@ -0,0 +1,7 @@
+{% extends "core.html" %}
+{#
+No news section
+#}
+
+{% block news %}
+{% endblock %}

Added: lucene/cms/trunk/templates/openrelevance-simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/openrelevance-simple.html?rev=1156239&view=auto
==============================================================================
--- lucene/cms/trunk/templates/openrelevance-simple.html (added)
+++ lucene/cms/trunk/templates/openrelevance-simple.html Wed Aug 10 15:50:35 2011
@@ -0,0 +1,6 @@
+{% extends "openrelevance.html" %}
+{#
+No news section
+#}
+{% block news %}
+{% endblock %}

Added: lucene/cms/trunk/templates/pylucene-simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/pylucene-simple.html?rev=1156239&view=auto
==============================================================================
--- lucene/cms/trunk/templates/pylucene-simple.html (added)
+++ lucene/cms/trunk/templates/pylucene-simple.html Wed Aug 10 15:50:35 2011
@@ -0,0 +1,6 @@
+{% extends "pylucene.html" %}
+{#
+No news section
+#}
+{% block news %}
+{% endblock %}

Copied: lucene/cms/trunk/templates/solr-simple.html (from r1156116, lucene/cms/trunk/templates/solr.html)
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-simple.html?p2=lucene/cms/trunk/templates/solr-simple.html&p1=lucene/cms/trunk/templates/solr.html&r1=1156116&r2=1156239&rev=1156239&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr.html (original)
+++ lucene/cms/trunk/templates/solr-simple.html Wed Aug 10 15:50:35 2011
@@ -1,151 +1,6 @@
-{% extends "main.html" %}
-{% block head %}
-<head>
-  <!--
-
-
-      Licensed to the Apache Software Foundation (ASF) under one or more
-      contributor license agreements.  See the NOTICE file distributed with
-      this work for additional information regarding copyright ownership.
-      The ASF licenses this file to You under the Apache License, Version 2.0
-      (the "License"); you may not use this file except in compliance with
-      the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE- 2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-  -->
-  <link href="../css/global.css" rel="stylesheet" type="text/css">
-  <link href="../css/solr.css" rel="stylesheet" type="text/css">
-  <title>Apache Lucene - {% block title %}{{ headers.title }}{% endblock %}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta name="Distribution" content="Global"/>
-  <meta name="Robots" content="index,follow"/>
-  <meta name="keywords"
-        content="apache, apache lucene, apache solr, solr, lucene
-        search, information retrieval, spell checking, faceting, inverted index, open source"/>
-  <link rel="shortcut icon" type="image/x-icon" href="../images/favicon.ico"/>
-  <script type="text/javascript" src="../scripts/prototype.js"></script>
-  <script type="text/javascript" src="../scripts/effects.js"></script>
-  <script type="text/javascript" src="../scripts/search.js"></script>
-  <script type="text/javascript" src="../scripts/slides.js"></script>
-  <script type="text/javascript" src="../scripts/jquery.js"></script>
-</head>
-{% endblock %}
-{% block logo %}
-  <a href="index.html"><img border="0" width="250" height="137" src="../images/solr.png" alt="Solr Logo"/></a>
-{% endblock %}
-{% block slides %}
-<div id="slides">
-      <div class="slideshow" id="mantleSlides">
-        <div id="slide1" >
-          <div class="callout">
-            Ultra-fast Lucene-based Search Server<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr offers Lucene's capabilities in an easy to use, fast search server
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Solr" src="../images/mantle-solr.png"/>
-          </div>
-        </div>
-        <div id="slide2" style="display:none">
-          <div class="callout">
-            Proven search capabilities<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            The Solr search server powers a wide range of applications such as Netflix, AOL, CNET, Zappos and many more
-          </div></div>
-          <div class="mantle">
-            <img alt="Solr Power" src="../images/mantle-power.png"/>
-          </div>
-        </div>
-        <div id="slide3" style="display:none">
-          <div class="callout">
-            Scalable
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr has been deployed successfully in both high query volume situations and
-            large collection sizes
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Mahout community" src="../images/mantle-scale.png"/>
-          </div>
-        </div>
-        <div id="slide4" style="display:none">
-          <div class="callout">
-            Apache 2.0 licensed
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr is distributed under a commercially friendly Apache Software license
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Software Foundation" src="../images/mantle-asf.png"/>
-          </div>
-        </div>
-      </div>
-      <div class="controls">
-        <a class="next" id="next" title="Next" href="#">Next</a>
-        <a class="previous" id="previous" title="Previous" href="#">Previous</a>
-        <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
-        <a class="stop" id="stop" title="Stop" href="#">Stop</a>
-      </div>
-    </div>
-{% endblock %}
-{% block nav %}
-<ul>
-  <li><a href="index.html">Solr</a></li>
-  <li><a href="downloads.html">Download</a></li>
-  <li><a href="documentation.html">Documentation</a></li>
-  <li><a href="quickstart.html">Tutorial</a></li>
-  <li><a href="https://issues.apache.org/jira/browse/SOLR">Bug Tracker</a></li>
-  <li><a href="mailing-lists.html">Discussion</a></li>
-  <li><a class="last" href="../">Lucene</a></li>
-</ul>
-{% endblock %}
+{% extends "solr.html" %}
+{#
+No news section
+#}
 {% block news %}
-  <div>{% filter markdown %}{% include "../content/lucene/solr/solrnews.mdtext" %}{% endfilter %}</div>
-{% endblock %}
-
-{% block sidebar %}
-    <div id="sidebar">
-      {% filter markdown %}{% include "solrnav.mdtext" %}{% endfilter %}
-      <div class="status">
-        <div id="svn">
-          <h1>Latest SVN</h1>
-          <div class="status-item">
-          {% for e in svn.list %}
-          <a class="svn" href="http://svn.apache.org/viewvc?revision={{ e.revision }};view=revision">r{{ e.revision }}</a>
-          {{ e.message|safe|truncatewords_html:20 }} ({{
-          e.projects|safe }}) &mdash;
-          <a href="http://people.apache.org/committer-index.html#{{ e.author }}">{{ e.author }}</a>
-        {% endfor %}</div></div>
-        <div id="jira">
-          <h1>Latest JIRA</h1>
-          <div class="status-item">{% for e in jira.list %}
-          <a class="bug" href="{{ e.url }}">{{ e.title|safe }}</a><br/>
-          {{ e.content|safe|truncatewords_html:20 }}
-        {% endfor %}</div></div>
-        <div id="dev-mail">
-          <h1>Latest Dev</h1>
-          <div class="status-item">{% for e in dev.list %}
-          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
-          <hr>
-          {% endfor %}</div>
-        </div>
-        <div id="solr-user-mail">
-          <h1>Latest Solr User</h1>
-          <div class="status-item">{% for e in solruser.list %}
-          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
-          <hr>
-          {% endfor %}</div>
-        </div>
-      </div>
-    </div>
 {% endblock %}
-{% block privacy %}<a href="../privacy.html">Privacy Policy</a>{% endblock %}
\ No newline at end of file

Modified: lucene/cms/trunk/templates/solr.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr.html?rev=1156239&r1=1156238&r2=1156239&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr.html (original)
+++ lucene/cms/trunk/templates/solr.html Wed Aug 10 15:50:35 2011
@@ -104,7 +104,7 @@
   <li><a href="documentation.html">Documentation</a></li>
   <li><a href="quickstart.html">Tutorial</a></li>
   <li><a href="https://issues.apache.org/jira/browse/SOLR">Bug Tracker</a></li>
-  <li><a href="mailing-lists.html">Discussion</a></li>
+  <li><a href="discussion.html">Discussion</a></li>
   <li><a class="last" href="../">Lucene</a></li>
 </ul>
 {% endblock %}