geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmil...@apache.org
Subject [63/66] [abbrv] geode git commit: GEODE-2031 Edit nanoc for file extensions
Date Mon, 16 Jan 2017 23:48:22 GMT
GEODE-2031 Edit nanoc for file extensions


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b169e54f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b169e54f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b169e54f

Branch: refs/heads/develop
Commit: b169e54ff6a20eb5f6a7d613c97338ad22ff3e03
Parents: a005923
Author: joeymcallister <jmcallister@pivotal.io>
Authored: Tue Jan 10 16:44:12 2017 -0800
Committer: Karen Miller <kmiller@pivotal.io>
Committed: Mon Jan 16 15:47:01 2017 -0800

----------------------------------------------------------------------
 geode-book/config.yml                      | 4 ----
 geode-site/website/Rules                   | 7 +++++++
 geode-site/website/content/docs/index.html | 2 +-
 geode-site/website/nanoc.yaml              | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/b169e54f/geode-book/config.yml
----------------------------------------------------------------------
diff --git a/geode-book/config.yml b/geode-book/config.yml
index 741f8b4..7cb4116 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -24,10 +24,6 @@ sections:
   directory: docs/guide/11
   subnav_template: geode-subnav
 
-archive_menu:
-  - v1.1
-  - v1.0: index-10.html
-
 template_variables:
   support_url: http://geode.apache.org/community
   product_url: http://geode.apache.org/

http://git-wip-us.apache.org/repos/asf/geode/blob/b169e54f/geode-site/website/Rules
----------------------------------------------------------------------
diff --git a/geode-site/website/Rules b/geode-site/website/Rules
index 11492dd..5c89ad9 100644
--- a/geode-site/website/Rules
+++ b/geode-site/website/Rules
@@ -59,6 +59,13 @@ compile '/**/*' do
   end
 end
 
+route '/**/*.html' do
+  if item.identifier =~ '/index.*'
+    '/index.html'
+  else
+    item.identifier.without_ext + '.html'
+  end
+end
 
 
 layout '/**/*', :erb

http://git-wip-us.apache.org/repos/asf/geode/blob/b169e54f/geode-site/website/content/docs/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/docs/index.html b/geode-site/website/content/docs/index.html
index ab37c5a..e192ba1 100644
--- a/geode-site/website/content/docs/index.html
+++ b/geode-site/website/content/docs/index.html
@@ -31,7 +31,7 @@ under the License. -->
     <div class="container">
 	<div class="row">
 	    <div class="col-md-4">
-	    		<h3><a href="guide/11/about_geode.html" style="color: #1275ff;">Apache
Geode User Documentation</a></h3>
+	    		<h3><a href="guide/10/about_geode.html" style="color: #1275ff;">Apache
Geode User Documentation</a></h3>
 	    		<p>Installation Instructions, User Manual, other product docs</p>
 	    </div>
 	    <div class="col-md-4">

http://git-wip-us.apache.org/repos/asf/geode/blob/b169e54f/geode-site/website/nanoc.yaml
----------------------------------------------------------------------
diff --git a/geode-site/website/nanoc.yaml b/geode-site/website/nanoc.yaml
index 5fcc351..38963cc 100644
--- a/geode-site/website/nanoc.yaml
+++ b/geode-site/website/nanoc.yaml
@@ -34,7 +34,7 @@ index_filenames: [ 'index.html' ]
 # Whether or not to generate a diff of the compiled content when compiling a
 # site. The diff will contain the differences between the compiled content
 # before and after the last site compilation.
-enable_output_diff: true
+enable_output_diff: false
 
 prune:
   # Whether to automatically remove files not managed by nanoc from the output
@@ -85,7 +85,7 @@ watcher:
   # because recompiling the site will cause these directories to change, which
   # will cause the site to be recompiled, which will cause these directories
   # to change, which will cause the site to be recompiled again, and so on.
-  dirs_to_watch: [ 'content', 'layouts', 'lib' ]
+  dirs_to_watch: [ 'content/', 'layouts/', 'lib/' ]
 
   # A list of single files to watch for changes. As mentioned above, don’t put
   # any files from the “output/” or “tmp/” directories in here.


Mime
View raw message