[ARVADOS] updated: 7722719387453c7ab5f9326536daa2655cad60c9

git at public.curoverse.com git at public.curoverse.com
Tue Mar 4 13:59:04 EST 2014


Summary of changes:
 doc/Rakefile    |    2 +-
 doc/_config.yml |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

       via  7722719387453c7ab5f9326536daa2655cad60c9 (commit)
       via  198d4c115e1958e1d9779e58548b8276cae244a8 (commit)
      from  9c3dd1f301b78d556b9d06c81a01c4b4446803ff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7722719387453c7ab5f9326536daa2655cad60c9
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 4 13:01:03 2014 -0500

    Document baseurl and change to a useful default.

diff --git a/doc/_config.yml b/doc/_config.yml
index 9a95734..9b80a96 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -1,5 +1,12 @@
+# baseurl is the location of the generated site from the browser's
+# perspective (e.g., http://doc.arvados.org or
+# file:///tmp/arvados/doc/.site). To make docs show up inside
+# workbench, use /doc here and add a symlink at
+# apps/workbench/public/doc pointing to ../../../doc/.site
+
+baseurl: /doc
+
 exclude: ["Rakefile", "tmp", "vendor"]
-baseurl: file:///home/tetron/work/arvados/doc/.site
 arvados_api_host: qr1hi.arvadosapi.com
 
 navbar:

commit 198d4c115e1958e1d9779e58548b8276cae244a8
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 4 12:31:54 2014 -0500

    Use require instead of rake_require. Fixes "Can't find
    zenweb/tasks".
    
    See
    https://github.com/seattlerb/zenweb/commit/4a28f3c8d766be7066658706d49b675d2a0f94ad

diff --git a/doc/Rakefile b/doc/Rakefile
index f2f3700..a10d54c 100644
--- a/doc/Rakefile
+++ b/doc/Rakefile
@@ -3,7 +3,7 @@
 require "rubygems"
 require "colorize"
 
-Rake.application.rake_require "zenweb/tasks"
+require "zenweb/tasks"
 load "zenweb-textile.rb"
 load "zenweb-liquid.rb"
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list