You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/06/08 20:33:09 UTC

[1/2] lucene-solr:branch_6_6: SOLR-10854: Add full Solr logo and use it for PDF title page; add "author" and pubdate metadata to title page

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6_6 15dc8c2db -> 63c29f9bd


SOLR-10854: Add full Solr logo and use it for PDF title page; add "author" and pubdate metadata to title page


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/46dc748c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/46dc748c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/46dc748c

Branch: refs/heads/branch_6_6
Commit: 46dc748cfe7e5277ac2a714d655d1689c2a72654
Parents: 15dc8c2
Author: Cassandra Targett <ct...@apache.org>
Authored: Thu Jun 8 15:29:09 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Jun 8 15:30:57 2017 -0500

----------------------------------------------------------------------
 .../src/images/Solr_Logo_on_white.png              | Bin 0 -> 47661 bytes
 solr/solr-ref-guide/src/pdf/SolrRefGuide-all.adoc  |   4 ++++
 .../src/pdf/themes/refguide-theme.yml              |   7 +++----
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46dc748c/solr/solr-ref-guide/src/images/Solr_Logo_on_white.png
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/images/Solr_Logo_on_white.png b/solr/solr-ref-guide/src/images/Solr_Logo_on_white.png
new file mode 100644
index 0000000..83a07ed
Binary files /dev/null and b/solr/solr-ref-guide/src/images/Solr_Logo_on_white.png differ

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46dc748c/solr/solr-ref-guide/src/pdf/SolrRefGuide-all.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/SolrRefGuide-all.adoc b/solr/solr-ref-guide/src/pdf/SolrRefGuide-all.adoc
index 38fa227..aa379f3 100644
--- a/solr/solr-ref-guide/src/pdf/SolrRefGuide-all.adoc
+++ b/solr/solr-ref-guide/src/pdf/SolrRefGuide-all.adoc
@@ -1,6 +1,10 @@
 = Apache Solr Reference Guide: For Solr {solr-docs-version}
 :toc:
 :toc-title: Table of Contents
+:toclevels: 2
+:author: Written by the Apache Lucene/Solr Project
+:email: https://lucene.apache.org/solr
+:revdate: Published {build-date}
 // 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46dc748c/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml b/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
index 843dfc3..0c10425 100644
--- a/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
+++ b/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
@@ -92,8 +92,8 @@ title_page:
   align: right
   logo:
     top: 10%
-    image: image:../../images/solr-sunOnly-small.png[pdfwidth=10%]
-    align: right
+    image: image:../../images/Solr_Logo_on_white.png[pdfwidth=50%]
+    align: left
   title:
     top: 55%
     font_size: $heading_h1_font_size
@@ -105,8 +105,7 @@ title_page:
     line_height: 1
   authors:
     margin_top: $base_font_size * 1.25
-    font_size: $base_font_size_large
-    font_color: '#181818'
+    font_size: $base_font_size
   revision:
     margin_top: $base_font_size * 1.25
 block:


[2/2] lucene-solr:branch_6_6: Ref Guide: remove docs for "concat" option not added until Solr 6.7

Posted by ct...@apache.org.
Ref Guide: remove docs for "concat" option not added until Solr 6.7


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/63c29f9b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/63c29f9b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/63c29f9b

Branch: refs/heads/branch_6_6
Commit: 63c29f9bd43989e73d9f8c5cec97cc89c8cd0203
Parents: 46dc748
Author: Cassandra Targett <ct...@apache.org>
Authored: Thu Jun 8 15:32:17 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Jun 8 15:32:17 2017 -0500

----------------------------------------------------------------------
 solr/solr-ref-guide/src/function-queries.adoc | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/63c29f9b/solr/solr-ref-guide/src/function-queries.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/function-queries.adoc b/solr/solr-ref-guide/src/function-queries.adoc
index 86a7d02..ced12e8 100644
--- a/solr/solr-ref-guide/src/function-queries.adoc
+++ b/solr/solr-ref-guide/src/function-queries.adoc
@@ -92,8 +92,6 @@ The table below summarizes the functions available for function queries.
 * `sort=childfield(field,$bjq) asc` refers to a separate parameter `bjq={!parent ..}..`;
 * `sort=childfield(field,{!parent of=...}...) desc` allows to inline block join parent query
 
-|concat(v,f..)|concatenates the given string fields, literals and other functions |`concat(name," ",$param,def(opt,"-"))`
-
 |"constant" |Specifies a floating point constant. |`1.5`
 
 |def |`def` is short for default. Returns the value of field "field", or if the field does not exist, returns the default value specified. and yields the first value where `exists()==true`.) |`def(rating,5):` This `def()` function returns the rating, or if no rating specified in the doc, returns 5 `def(myfield, 1.0):` equivalent to `if(exists(myfield),myfield,1.0)`