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/03/31 16:26:11 UTC
[1/2] lucene-solr:jira/solr-10290: SOLR-10290: Clean up
_config.yml.template: update description; remove unused settings;
move comments to above the thing they describe
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10290 8071d3f4a -> ec2cbb3ee
SOLR-10290: Clean up _config.yml.template: update description; remove unused settings; move comments to above the thing they describe
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5c29efc4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5c29efc4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5c29efc4
Branch: refs/heads/jira/solr-10290
Commit: 5c29efc41a0213908f1b0ebd6d40c09927f6832f
Parents: 8071d3f
Author: Cassandra Targett <ct...@apache.org>
Authored: Fri Mar 31 11:23:34 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Fri Mar 31 11:23:34 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/_config.yml.template | 64 +++++++----------------
1 file changed, 18 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5c29efc4/solr/solr-ref-guide/src/_config.yml.template
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template
index 8ce9704..c1e9271 100755
--- a/solr/solr-ref-guide/src/_config.yml.template
+++ b/solr/solr-ref-guide/src/_config.yml.template
@@ -5,66 +5,50 @@
#
#
#
-#
-
+# Gems that are included for building the site. jekyll-asciidoc allows Jekyll to use Asciidoctor for variables and settings
gems: [jekyll-asciidoc]
destination: ../html-site
-output: web
# this property is useful for conditional filtering of content that is separate from the PDF.
+output: web
-topnav_title: Solr Ref Guide
# this appears on the top navigation bar next to the home button
+topnav_title: Solr Ref Guide
-site_title: Apache Solr Reference Guide
# this appears in the html browser tab for the site title (seen mostly by search engines, not users)
+site_title: Apache Solr Reference Guide
-company_name: Apache Software Foundation
# this appears in the footer
+company_name: Apache Software Foundation
-github_editme_path:
-# if you're using Github, provide the basepath to the branch you've created for reviews, following the sample here. if not, leave this value blank.
-
-disqus_shortname:
-# if you're using disqus for comments, add the shortname here. if not, leave this value blank.
-host: 127.0.0.1
# the preview server used. Leave as is.
+host: 127.0.0.1
-port: 4015
# the port where the preview is rendered. You can leave this as is unless you have other Jekyll builds using this same port that might cause conflicts. in that case, use another port such as 4006.
+port: 4015
+# these are the files and directories that jekyll will exclude from the build
exclude:
- .idea/
- .gitignore
- pdf/
-# these are the files and directories that jekyll will exclude from the build
-
-# feedback_email: an_email@apache.org
-# used as a contact email for the Feedback link in the top navigation bar
+# if you uncomment the next line, the Feedback link gets removed
feedback_disable: true
-# if you uncomment the previous line, the Feedback link gets removed
+# used as a contact email for the Feedback link in the top navigation bar
+# feedback_email: an_email@apache.org
+
+# if you uncomment the next line, it changes the Feedback text
# feedback_text: "Need help?"
-# if you uncomment the previous line, it changes the Feedback text
+# if you uncomment the next line, it changes where the feedback link points to
# feedback_link: "http://helpy.io/"
-# if you uncomment the previous line, it changes where the feedback link points to
-
-highlighter: rouge
-# library used for syntax highlighting
-
-markdown: kramdown
-kramdown:
- input: GFM
- auto_ids: true
- hard_wrap: false
- syntax_highlighter: rouge
-# filter used to process markdown. note that kramdown differs from github-flavored markdown in some subtle ways
+# these are defaults used for the frontmatter for these file types
defaults:
-
scope:
@@ -72,9 +56,7 @@ defaults:
type: "pages"
values:
layout: "page"
- comments: true
search: true
- sidebar: home_sidebar
-
scope:
@@ -82,26 +64,16 @@ defaults:
type: "posts"
values:
layout: "post"
- comments: true
search: true
- sidebar: home_sidebar
-
-# these are defaults used for the frontmatter for these file types
-sidebars:
-- home_sidebar
-- mydoc_sidebar
-- product1_sidebar
-- product2_sidebar
-- other
-description: "Intended as a documentation theme based on Jekyll for technical writers documenting software and other technical products, this theme has all the elements you would need to handle multiple products with both multi-level sidebar navigation, tags, and other documentation features."
# the description is used in the feed.xml file
+description: "The Apache Solr Reference Guide is the official documentation for the Apache Solr project."
-# needed for sitemap.xml file only
+# needed for sitemap.xml and feed.xml files
url: https://home.apache.org/~ctargett/RefGuidePOC/jekyll-full
-# Asciidoc settings - disabled so we can use asciidoctor
+# Asciidoc settings - disabled so we can use asciidoctor instead
asciidoc: {}
# Custom Attributes for use in our templates & adoc files.
[2/2] lucene-solr:jira/solr-10290: SOLR-10290: Fix feed.xml in case
we want to have it in the online site; ensure URL is right everywhere
Posted by ct...@apache.org.
SOLR-10290: Fix feed.xml in case we want to have it in the online site; ensure URL is right everywhere
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ec2cbb3e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ec2cbb3e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ec2cbb3e
Branch: refs/heads/jira/solr-10290
Commit: ec2cbb3eee23d94619e7c9e7e2b45fb77da61394
Parents: 5c29efc
Author: Cassandra Targett <ct...@apache.org>
Authored: Fri Mar 31 11:24:52 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Fri Mar 31 11:24:52 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/_includes/head.html | 2 +-
solr/solr-ref-guide/src/feed.xml | 20 ++++++++------------
2 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ec2cbb3e/solr/solr-ref-guide/src/_includes/head.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/head.html b/solr/solr-ref-guide/src/_includes/head.html
index be42044..29e4ec6 100755
--- a/solr/solr-ref-guide/src/_includes/head.html
+++ b/solr/solr-ref-guide/src/_includes/head.html
@@ -30,4 +30,4 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
-<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "feed.xml" | prepend: site.url }}">
+<link rel="alternate" type="application/rss+xml" title="{{ site.site_title }}" href="{{ "/feed.xml" | prepend: site.url }}">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ec2cbb3e/solr/solr-ref-guide/src/feed.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/feed.xml b/solr/solr-ref-guide/src/feed.xml
index d8d6ac9..841db5d 100755
--- a/solr/solr-ref-guide/src/feed.xml
+++ b/solr/solr-ref-guide/src/feed.xml
@@ -6,25 +6,21 @@ layout: none
<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
- <title>{{ site.title | xml_escape }}</title>
+ <title>{{ site.site_title | xml_escape }}</title>
<description>{{ site.description | xml_escape }}</description>
- <link>{{ site.url }}/</link>
+ <link>{{ site.url }}</link>
<atom:link href="{{ "/feed.xml" | prepend: site.url }}" rel="self" type="application/rss+xml"/>
<pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
<lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
<generator>Jekyll v{{ jekyll.version }}</generator>
- {% for post in site.posts limit:10 %}
+ {% for page in site.pages limit:10 %}
<item>
- <title>{{ post.title | xml_escape }}</title>
- <description>{{ post.content | xml_escape }}</description>
- <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
- <link>{{ post.url | prepend: site.url }}</link>
- <guid isPermaLink="true">{{ post.url | prepend: site.url }}</guid>
- {% for tag in post.tags %}
- <category>{{ tag | xml_escape }}</category>
- {% endfor %}
+ <title>{{ page.title | xml_escape }}</title>
+ <description>{{ page.content | xml_escape }}</description>
+ <link>{{ page.url | prepend: site.url | }}</link>
+ <guid isPermaLink="true">{{ page.url | prepend: site.url }}</guid>
{% for tag in page.tags %}
- <category>{{ cat | xml_escape }}</category>
+ <category>{{ tag | xml_escape }}</category>
{% endfor %}
</item>
{% endfor %}