From 8a50fd3d15e430a1347ef9da5988d3898ec65003 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Thu, 15 Oct 2015 15:19:14 +0000 Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1) 114354 jphuynh: ACE-4447: Added detailed description for Solr and Solr4 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/bitrock/alfresco-solr.xml | 3 ++- src/main/resources/bitrock/alfresco-solr4.xml | 3 ++- src/main/resources/bitrock/lang/alf-en.po | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/resources/bitrock/alfresco-solr.xml b/src/main/resources/bitrock/alfresco-solr.xml index 23933bfc4..9d9085fa0 100644 --- a/src/main/resources/bitrock/alfresco-solr.xml +++ b/src/main/resources/bitrock/alfresco-solr.xml @@ -1,6 +1,7 @@ alfrescosolr Solr1 + Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1. 1 0 1 @@ -55,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/bitrock/alfresco-solr4.xml b/src/main/resources/bitrock/alfresco-solr4.xml index b4085d8b9..25ad57e09 100644 --- a/src/main/resources/bitrock/alfresco-solr4.xml +++ b/src/main/resources/bitrock/alfresco-solr4.xml @@ -1,6 +1,7 @@ alfrescosolr4 Solr4 + Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1. 1 1 1 @@ -72,4 +73,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/bitrock/lang/alf-en.po b/src/main/resources/bitrock/lang/alf-en.po index aadec876d..61f0c924e 100755 --- a/src/main/resources/bitrock/lang/alf-en.po +++ b/src/main/resources/bitrock/lang/alf-en.po @@ -654,3 +654,6 @@ msgstr "Enter the location of your Alfresco repository." msgid "Repository location: " msgstr "Repository location: " + +msgid "Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1." +msgstr "Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1."