You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bu...@apache.org on 2017/01/13 08:11:19 UTC

svn commit: r1004785 - in /websites/staging/lucene/trunk/content: ./ solr/community.html

Author: buildbot
Date: Fri Jan 13 08:11:19 2017
New Revision: 1004785

Log:
Staging update by buildbot for lucene

Modified:
    websites/staging/lucene/trunk/content/   (props changed)
    websites/staging/lucene/trunk/content/solr/community.html

Propchange: websites/staging/lucene/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan 13 08:11:19 2017
@@ -1 +1 @@
-1778482
+1778508

Modified: websites/staging/lucene/trunk/content/solr/community.html
==============================================================================
--- websites/staging/lucene/trunk/content/solr/community.html (original)
+++ websites/staging/lucene/trunk/content/solr/community.html Fri Jan 13 08:11:19 2017
@@ -222,14 +222,22 @@ Visit the <a href="http://www.apache.org
 here. There are also a number of external companies and professionals ready to help, see the user-maintained list at 
 <a href="https://wiki.apache.org/solr/Support">wiki.apache.org/solr/Support</a>.</p>
 <h4 id="about-versions">About versions<a class="headerlink" href="#about-versions" title="Permanent link">&para;</a></h4>
-<p>Apache Solr is under active development with frequent feature releases on the current major version (e.g. 6.x).
-The previous major version (e.g. 5.5) may still receive security- and bug fixes as point releases, thus taking the role 
+<p>Apache Solr is under active development with frequent feature releases on the current major version.
+The <strong>previous</strong> major version may still receive security- and bug fixes as point releases, thus taking the role 
 of the LTS (Long Term Support) version.
 Older versions are considered EOL (End Of Life) and will not be further
-updated. For this reason it may also be difficult to obtain community support for EOL versions.
-Large changes or changes that break compatibility with existing
-functionality are normally only included in the next major version (e.g. 7.0).
-For more about versions and upgrading Solr, see the 
+updated. For this reason it may also be difficult to obtain community support for EOL versions.</p>
+<p>Large changes or changes that break compatibility with existing
+functionality are normally only included in the <strong>next</strong> major version.</p>
+<table>
+<tr align=left><th>Version</th><th>Git branch</th><th>Description</th></tr>
+<tr align=left><td>1.0&rarr;5.4</td><td>...</td><td>Older versions, EOL</td></tr>
+<tr align=left><td>5.5.x</td><td>branch_5_5</td><td>Version in the previous major release for bugfixes only, LTS</td></tr>
+<tr align=left><td>6.x</td><td>branch_6x</td><td>Current major version for feature releases, STABLE</td></tr>
+<tr align=left><td>7.0</td><td>master</td><td>Next major version, yet to be released, UNSTABLE</td></tr>
+</table>
+
+<p>For more about versions and upgrading Solr, see the 
 <a href="https://cwiki.apache.org/confluence/display/solr/Upgrading+Solr">Reference Guide chapter “Upgrading Solr”</a>.</p>
 <h2 id="mailing-lists-irc">Mailing Lists &amp; IRC<a class="headerlink" href="#mailing-lists-irc" title="Permanent link">&para;</a></h2>
 <h4 id="solr-user-list-solr-userluceneapacheorg">Solr User List: solr-user@lucene.apache.org<a class="headerlink" href="#solr-user-list-solr-userluceneapacheorg" title="Permanent link">&para;</a></h4>