From 894a43b259a72a82f07649b0d93ab3c17c4d89c4 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Thu, 23 Feb 2017 15:43:45 +0100 Subject: [PATCH] SOLR-9450: The docs/ folder in the binary distribution now contains a single index.html file linking to the online documentation, reducing the size of the download --- solr/CHANGES.txt | 6 ++-- solr/README.txt | 2 +- solr/build.xml | 21 ++++++++++-- solr/common-build.xml | 18 +++++++++- solr/site/online-link.xsl | 69 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 109 insertions(+), 7 deletions(-) create mode 100644 solr/site/online-link.xsl diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index fc5bfe10956..9ece4f84700 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -246,6 +246,9 @@ Other Changes * SOLR-10020: Cannot reload a core if it fails initialization. (Mike Drob via Erick Erickson) +* SOLR-9450: The docs/ folder in the binary distribution now contains a single index.html file linking + to the online documentation, reducing the size of the download (janhoy, Shawn Heisey, Uwe Schindler) + ================== 6.4.2 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. @@ -697,7 +700,7 @@ Upgrade Notes New Features ---------------------- -* SOLR-5725: facet.method=enum can bypass exact counts calculation with facet.exists=true, it just returns 1 for +* SOLR-5725: facet.method=enum can bypass exact counts calculation with facet.exists=true, it just returns 1 for terms which exists in result docset. (Alexey Kozhemiakin, Sebastian Koziel, Radoslaw Zielinski via Mikhail Khludnev) * SOLR-9127: Excel workbook (.xlsx) response writer. use 'wt=xlsx' (Tony Moriarty, noble) @@ -974,7 +977,6 @@ Other Changes * SOLR-9371: Fix bin/solr calculations for start/stop wait time and RMI_PORT. (Shawn Heisey via Erick Erickson) - ================== 6.2.1 ================== Bug Fixes diff --git a/solr/README.txt b/solr/README.txt index 3e7a09ced2c..4ef5eac9fd6 100644 --- a/solr/README.txt +++ b/solr/README.txt @@ -118,7 +118,7 @@ dist/solr--XX.jar for more information). docs/index.html - The Apache Solr Javadoc API documentation and Tutorial + A link to the online version of Apache Solr Javadoc API documentation and Tutorial Instructions for Building Apache Solr from Source diff --git a/solr/build.xml b/solr/build.xml index b900aedfcdb..b1765851d5c 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -209,6 +209,21 @@ + + + + + + + + + + + + + + @@ -455,7 +470,7 @@ - + @@ -545,7 +560,7 @@ - + @@ -586,7 +601,7 @@ dist/solrj-lib/* dist/test-framework/**" excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar **/*.sha1" /> - diff --git a/solr/common-build.xml b/solr/common-build.xml index 8bf9db789f4..5e8976ca9ff 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -42,6 +42,7 @@ + @@ -339,7 +340,7 @@ + + + + diff --git a/solr/site/online-link.xsl b/solr/site/online-link.xsl new file mode 100644 index 00000000000..0f2fd189ad7 --- /dev/null +++ b/solr/site/online-link.xsl @@ -0,0 +1,69 @@ + + + + + + + + + + + <xsl:text>Apache Solr </xsl:text><xsl:value-of select="$version"/><xsl:text> Documentation</xsl:text> + + + + +
+ + Solr + +
+ TM +
+
+

+ Apache Solr + + TM + + + + Documentation +

+

+ + + Follow this link to view online documentation for Solr . + + + No online documentation available for custom builds or SNAPSHOT versions. Run ant documentation from src.tgz package to build docs locally. + + +

+ + +
+ +