Return-Path: 
 <commits-return-51750-apmail-lucene-commits-archive=www.apache.org@lucene.apache.org>
X-Original-To: apmail-lucene-commits-archive@www.apache.org
Delivered-To: apmail-lucene-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4F30F17579
	for <apmail-lucene-commits-archive@www.apache.org>;
 Tue, 21 Oct 2014 13:27:49 +0000 (UTC)
Received: (qmail 40947 invoked by uid 500); 21 Oct 2014 13:27:49 -0000
Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:commits@lucene.apache.org>
List-Id: <commits.lucene.apache.org>
Reply-To: dev@lucene.apache.org
Delivered-To: mailing list commits@lucene.apache.org
Received: (qmail 40937 invoked by uid 99); 21 Oct 2014 13:27:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2014 13:27:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2014 13:27:47 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AD6BB23889BB;
	Tue, 21 Oct 2014 13:26:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1633373 - in /lucene/cms/branches/solr_6058:
 content/solr/features.mdtext templates/_solr-version.html
 templates/solr-index.html
Date: Tue, 21 Oct 2014 13:26:57 -0000
To: commits@lucene.apache.org
From: gsingers@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20141021132657.AD6BB23889BB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gsingers
Date: Tue Oct 21 13:26:57 2014
New Revision: 1633373

URL: http://svn.apache.org/r1633373
Log:
SOLR-6058: make it easier to change version on headers, start updating the features section

Added:
    lucene/cms/branches/solr_6058/templates/_solr-version.html
Modified:
    lucene/cms/branches/solr_6058/content/solr/features.mdtext
    lucene/cms/branches/solr_6058/templates/solr-index.html

Modified: lucene/cms/branches/solr_6058/content/solr/features.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/branches/solr_6058/content/solr/features.mdtext?rev=1633373&r1=1633372&r2=1633373&view=diff
==============================================================================
--- lucene/cms/branches/solr_6058/content/solr/features.mdtext (original)
+++ lucene/cms/branches/solr_6058/content/solr/features.mdtext Tue Oct 21 13:26:57 2014
@@ -3,15 +3,12 @@ Title: Features
 <section class="hero alternate">
   <div class="row">
     <div class="large-12 columns">
-      <div class="annotation">
-        Solr 4.9
-      </div>
       <h1>
         Solr Features
       </h1>
       <p>
         Solr is a standalone enterprise search server with a REST-like API. You put 
-        documents in it (called "indexing") via XML, JSON, CSV or binary over HTTP. You query it via HTTP GET and receive XML, JSON, CSV or binary results.
+        documents in it (called "indexing") via JSON, XML, CSV or binary over HTTP. You query it via HTTP GET and receive JSON, XML, CSV or binary results.
       </p>
       <div class="down-arrow"><a data-scroll href="#anchor-1"><i class="fa fa-angle-down fa-2x red"></i></a></div>
     </div>
@@ -26,7 +23,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_advanced_full-text_search.svg"/></div>
           <div class="content">
             <h3>Advanced Full-Text Search Capabilities</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Powered by Lucene, Solr enables powerful matching capabilities including phrases, wildcards, joins, grouping and much more across a any data type</p>
           </div>
         </div>
       </li>
@@ -35,7 +32,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_optimized_for_high_volume.svg"/></div>
           <div class="content">
             <h3>Optimized for High Volume Traffic</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr is proven at extremely large scales the world over</p>
           </div>
         </div>
       </li>
@@ -44,7 +41,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_standards_based_open_interfaces.svg"/></div>
           <div class="content">
             <h3>Standards Based Open Interfaces - XML, JSON and HTTP</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr uses the tools you use to make application building a snap</p>
           </div>
         </div>
       </li>
@@ -53,7 +50,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_comprehensive_html_admin.svg"/></div>
           <div class="content">
             <h3>Comprehensive HTML Administration Interfaces</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr ships with a built-in, responsive Admin interface to make it easy to control your Solr instances</p>
           </div>
         </div>
       </li>
@@ -62,16 +59,16 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_server_statistics_exposed.svg"/></div>
           <div class="content">
             <h3>Server statistics exposed over JMX for monitoring</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Need more insight into your instances? Solr publishes loads of metric data via JMX</p>
           </div>
         </div>
       </li>
       <li>
         <div class="box">
-          <div class="img"><img src="/solr/assets/images/Solr_Icons_linearly_scalable,_auto_index.svg"/></div>
+          <div class="img"><img src="/solr/assets/images/Solr_Icons_highy_scalable.svg"/></div>
           <div class="content">
-            <h3>Linearly scalable, auto index replication, auto failover and recovery</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <h3>Highly Scalable and Fault Tolerant</h3>
+            <p>Built on the battle-tested Apache Zookeeper, Solr makes it easy to scale up and down.  Solr bakes in replication, distribution, rebalancing and fault tolerance out of the box.</p>
           </div>
         </div>
       </li>
@@ -79,8 +76,8 @@ Title: Features
         <div class="box">
           <div class="img"><img src="/solr/assets/images/Solr_Icons_flexible_and_adaptable.svg"/></div>
           <div class="content">
-            <h3>Flexible and Adaptable with XML configuration</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <h3>Flexible and Adaptable with easy configuration</h3>
+            <p>Solr's is designed to adapt to your needs all while simplifying configuration</p>
           </div>
         </div>
       </li>
@@ -89,7 +86,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_real-time.svg"/></div>
           <div class="content">
             <h3>Near Real-Time Indexing</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Want to see your updates now?  Solr takes advantage of Lucene's Near Real-Time Indexing capabilities to make sure you see your content when you want to see it</p>
           </div>
         </div>
       </li>
@@ -98,7 +95,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_extensible_plugin.svg"/></div>
           <div class="content">
             <h3>Extensible Plugin Architecture</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr publishes many well-defined extension points that make it easy to plugin both index and query time plugins.  Of course, since it is Apache-licensed open source, you can change any code you want!</p>
           </div>
         </div>
       </li>
@@ -130,8 +127,8 @@ Title: Features
         <div class="box">
           <div class="img"><img src="/solr/assets/images/Solr_Icons_a_real_data_schema.svg"/></div>
           <div class="content">
-            <h3>A Real Data Schema</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <h3>Schema when you want, schemaless when you don't</h3>
+            <p>Use Solr's data-driven schemaless mode when getting started and then lock it down when it's time for production.</p>
           </div>
         </div>
       </li>
@@ -140,7 +137,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_powerful_extensions.svg"/></div>
           <div class="content">
             <h3>Powerful Extensions</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr ships with optional plugins for indexing rich content (e.g. PDFs, Word), language detection, search results clustering and more</p>
           </div>
         </div>
       </li>
@@ -149,7 +146,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_faceted_search.svg"/></div>
           <div class="content">
             <h3>Faceted Search and Filtering</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Slice and dice your data as you see fit using a large array of faceting algorithms</p>
           </div>
         </div>
       </li>
@@ -158,7 +155,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_geospatial_search.svg"/></div>
           <div class="content">
             <h3>Geospatial Search with Support</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Enabling location-based search is simple with Solr's built-in support for spatial search</p>
           </div>
         </div>
       </li>
@@ -167,7 +164,8 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_advanced,_configurable_text.svg"/></div>
           <div class="content">
             <h3>Advanced Configurable Text Analysis</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr ships with support for most of the widely spoken languages in the world (English, Chinese, Japanese, German, French and many more) and many other analysis tools
+            designed to make indexing and querying your content as flexible as possible</p>
           </div>
         </div>
       </li>
@@ -176,7 +174,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_highly_configurable.svg"/></div>
           <div class="content">
             <h3>Highly Configurable and User Extensible Caching</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Fine-grained controls on Solr's built-in caches make it easy to optimize performance</p>
           </div>
         </div>
       </li>
@@ -185,7 +183,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_performance_optimizations.svg"/></div>
           <div class="content">
             <h3>Performance Optimizations</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr has been tuned to handle the world's largest sites</p>
           </div>
         </div>
       </li>
@@ -194,7 +192,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_external_configuration.svg"/></div>
           <div class="content">
             <h3>External Configuration via XML</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr's configuration files make it easy to adjust and extend your setup without burying your configuration in code</p>
           </div>
         </div>
       </li>
@@ -203,7 +201,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_an_ajax_based.svg"/></div>
           <div class="content">
             <h3>An AJAX based administration interface</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>TODO: REPLACE WITH SOMETHING ELSE, AS THIS IS REPETITIVE</p>
           </div>
         </div>
       </li>
@@ -212,7 +210,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_monitorable_logging.svg"/></div>
           <div class="content">
             <h3>Monitorable Logging</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Easily ccess Solr's log files from the admin interface</p>
           </div>
         </div>
       </li>
@@ -221,7 +219,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_fast_near_real-time.svg"/></div>
           <div class="content">
             <h3>Fast Near Real-time</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>TODO: REPEAT OF ABOVE</p>
           </div>
         </div>
       </li>
@@ -230,7 +228,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_highy_scalable.svg"/></div>
           <div class="content">
             <h3>Highly Scalable</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>TODO: REPLACE</p>
           </div>
         </div>
       </li>
@@ -239,7 +237,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_json,_xml.svg"/></div>
           <div class="content">
             <h3>JSON, XML, CSV, delimited text</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>TODO: REPLACE</p>
           </div>
         </div>
       </li>
@@ -247,8 +245,8 @@ Title: Features
         <div class="box">
           <div class="img"><img src="/solr/assets/images/Solr_Icons_easy_ways_to_pull_in_data.svg"/></div>
           <div class="content">
-            <h3>Easy Ways to Pull Data</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <h3>Your Data, Your Way!</h3>
+            <p>JSON, CSV, XML and more are supported out of the box.</p>
           </div>
         </div>
       </li>
@@ -257,7 +255,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_rich_document.svg"/></div>
           <div class="content">
             <h3>Rich Document Parsing</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr ships with Apache Tika built-in, making it easy to index rich content such as Adobe PDF, Microsoft Word and more.</p>
           </div>
         </div>
       </li>
@@ -266,7 +264,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_apache_uima.svg"/></div>
           <div class="content">
             <h3>Apache UIMA</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Ready to enhance your content with advanced annotation engines?  Solr integrates into Apache UIMA, making it easy to leverage NLP and other tools as part of your application.</p>
           </div>
         </div>
       </li>
@@ -275,7 +273,7 @@ Title: Features
           <div class="img"><img src="/solr/assets/images/Solr_Icons_multiple_search_indices.svg"/></div>
           <div class="content">
             <h3>Multiple search indices</h3>
-            <p>BRIEF DESCRIPTION</p>
+            <p>Solr supports multi-tenant architectures, making it easy to isolate users and content.</p>
           </div>
         </div>
       </li>

Added: lucene/cms/branches/solr_6058/templates/_solr-version.html
URL: http://svn.apache.org/viewvc/lucene/cms/branches/solr_6058/templates/_solr-version.html?rev=1633373&view=auto
==============================================================================
--- lucene/cms/branches/solr_6058/templates/_solr-version.html (added)
+++ lucene/cms/branches/solr_6058/templates/_solr-version.html Tue Oct 21 13:26:57 2014
@@ -0,0 +1,2 @@
+<!-- Make sure to update this file with the latest version -->
+4.10
\ No newline at end of file

Modified: lucene/cms/branches/solr_6058/templates/solr-index.html
URL: http://svn.apache.org/viewvc/lucene/cms/branches/solr_6058/templates/solr-index.html?rev=1633373&r1=1633372&r2=1633373&view=diff
==============================================================================
--- lucene/cms/branches/solr_6058/templates/solr-index.html (original)
+++ lucene/cms/branches/solr_6058/templates/solr-index.html Tue Oct 21 13:26:57 2014
@@ -19,7 +19,7 @@
       <div class="row">
         <div class="large-10 large-offset-1 columns">
           <div class="annotation">
-            Apache Solr 4.10
+            Apache Solr {% include "_solr-version.html" %}
           </div>
           <h1>
             Solr is the popular, blazing-fast, open source enterprise search platform built on Apache Lucene.