[ARVADOS] updated: f4cd9f0565c69e4cd919124dc7184a4fdecb3b31

[git at public.curoverse.com]

Summary of changes:
 docker/doc/Dockerfile    |    2 +-
 docker/doc/apache2_vhost |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  f4cd9f0565c69e4cd919124dc7184a4fdecb3b31 (commit)
       via  42f3da9a76a0cde60178cdeffdd6185050400a59 (commit)
      from  372d0c900866940713b9f3529cb4830c7ff0aa6a (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 f4cd9f0565c69e4cd919124dc7184a4fdecb3b31
Merge: 42f3da9 372d0c9
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Feb 11 17:14:25 2014 -0500

    Merge branch 'master' of git.clinicalfuture.com:arvados


commit 42f3da9a76a0cde60178cdeffdd6185050400a59
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Feb 11 17:10:01 2014 -0500

    Update docserver build process for zenweb (refs #1786)

diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 5ae4bb2..39c87a8 100644
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -13,7 +13,7 @@ ADD generated/doc.tar.gz /usr/src/arvados/
 # Build static site
 RUN /bin/sed -ri 's/^baseurl: .*$/baseurl: /' /usr/src/arvados/doc/_config.yml && \
     cd /usr/src/arvados/doc && \
-    LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" jekyll build
+    LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" rake
 
 # Configure Apache
 ADD apache2_vhost /etc/apache2/sites-available/doc
diff --git a/docker/doc/apache2_vhost b/docker/doc/apache2_vhost
index f3d4ff2..bf9c18b 100644
--- a/docker/doc/apache2_vhost
+++ b/docker/doc/apache2_vhost
@@ -6,7 +6,7 @@ ServerName doc.arvados.org
 
   ServerName doc.arvados.org
 
-  DocumentRoot /usr/src/arvados/doc/_site/
+  DocumentRoot /usr/src/arvados/doc/.site/
 
 </VirtualHost>
 

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


hooks/post-receive
--