Merge branch 'master' into 1786-replace-jekyll-with-zenweb

diff --git a/doc/Gemfile b/doc/Gemfile
index a9cccb48f8e0698c785024b38a23b06d3e4266b0..ad695f0859bcedf7b708f297ea0012933d666269 100644 (file)
--- a/doc/Gemfile
+++ b/doc/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'jekyll'
-gem 'RedCloth'
+gem 'zenweb'
+gem 'liquid'

diff --git a/doc/Gemfile.lock b/doc/Gemfile.lock
index 80a56193745d1eb5498d25842dcbd7b54a74d0fe..5de90b1c700c6fdcb0cce06473e81c9aba68f28e 100644 (file)
--- a/doc/Gemfile.lock
+++ b/doc/Gemfile.lock
@@ -1,49 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
-    colorator (0.1)
-    commander (4.1.5)
-      highline (~> 1.6.11)
-    fast-stemmer (1.0.2)
-    ffi (1.9.3)
-    highline (1.6.20)
-    jekyll (1.3.0)
-      classifier (~> 1.3)
-      colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.2)
-      listen (~> 1.3)
-      maruku (~> 0.6.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
-    liquid (2.5.4)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.5.4)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
-    safe_yaml (0.9.7)
-    syntax (1.0.0)
-    yajl-ruby (1.1.0)
+    coderay (1.1.0)
+    kramdown (1.3.1)
+    less (1.2.21)
+      mutter (>= 0.4.2)
+      treetop (>= 1.4.2)
+    liquid (2.6.1)
+    makerakeworkwell (1.0.3)
+      rake (>= 0.9.2, < 11)
+    mutter (0.5.3)
+    polyglot (0.3.3)
+    rake (10.1.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    zenweb (3.3.1)
+      coderay (~> 1.0)
+      kramdown (~> 1.0)
+      less (~> 1.2)
+      makerakeworkwell (~> 1.0)
+      rake (>= 0.9, < 11)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth
-  jekyll
+  liquid
+  zenweb

diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
deleted file mode 100644 (file)
index fe41f5c..0000000
--- a/doc/README_FOR_APP
+++ /dev/null
@@ -1,2 +0,0 @@
-Use this README file to introduce your application and point to useful places in the API for learning more.
-Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.

diff --git a/doc/Rakefile b/doc/Rakefile
new file mode 100644 (file)
index 0000000..65d2855
--- /dev/null
+++ b/doc/Rakefile
@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+
+require "rubygems"
+require "zenweb/tasks"
+load "zenweb-textile.rb"
+load "zenweb-liquid.rb"
+

diff --git a/doc/_config.yml b/doc/_config.yml
index 274ae9bcd7ad2ef846316a7e16772f6fcadf8b28..cd13810e95da2f5438847560a2bf35ffdab6915d 100644 (file)
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -1,5 +1,7 @@
+exclude: ["Rakefile", "tmp"]
 baseurl: /doc
 arvados_api_host: qr1hi.arvadosapi.com
+layout: default
 navbar:
   userguide:
     - Getting Started
@@ -11,4 +13,4 @@ navbar:
     - API Methods
     - Schema
   sdk:
-    - Python
\ No newline at end of file
+    - Python

diff --git a/doc/admin/cheat_sheet.textile b/doc/admin/cheat_sheet.textile
index 78841f434914a8212b0dcfcef5d5eb66bbcd1674..d817827693d30ddb699b4ef1c29612841c4c0717 100644 (file)
--- a/doc/admin/cheat_sheet.textile
+++ b/doc/admin/cheat_sheet.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: adminguide
 title: Cheat Sheet
 navorder: 1
----
+...
 
 h1. Cheat Sheet
 

diff --git a/doc/admin/index.md b/doc/admin/index.md
index 5c7541279df9c7d9f7eea9ca70fed261d11377ea..53e4e429a215c7d8448ce2f233bf07dd4ea3809f 100644 (file)
--- a/doc/admin/index.md
+++ b/doc/admin/index.md
@@ -3,7 +3,7 @@ layout: default
 navsection: adminguide
 title: Overview
 navorder: 0
----
+...
 
 {% include alert-stub.html %}
 

diff --git a/doc/api/authentication.textile b/doc/api/authentication.textile
index d02f834af00f7c0e790c20145d9d8ac45367c000..20dfcf7ddc919e0ad3e9a72e94165155ba7e5507 100644 (file)
--- a/doc/api/authentication.textile
+++ b/doc/api/authentication.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Concepts
 title: Authentication
 navorder: 2
----
+...
 
 h1. Authentication
 
@@ -37,4 +37,4 @@ A client obtains an access code by means of a standard Oauth 2.0 flow. The acces
 
 h3. Refresh the access code (optional)
 
-Access codes have a limited lifetime. A refresh token allows an application to request a new access token.
\ No newline at end of file
+Access codes have a limited lifetime. A refresh token allows an application to request a new access token.

diff --git a/doc/api/crunch-scripts.textile b/doc/api/crunch-scripts.textile
index 076a589ce8aead7588e38c641cec7e2d9097aa58..dcf004ee79eddb8255adfad3901fa03beffdeabf 100644 (file)
--- a/doc/api/crunch-scripts.textile
+++ b/doc/api/crunch-scripts.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Concepts
 title: Crunch scripts
 navorder: 5
----
+...
 
 h2. Crunch scripts
 

diff --git a/doc/api/index.textile b/doc/api/index.textile
index 11cf0ed6820de8a1affcb9dcee4ea43cb10bfbfd..64fe57bee5290d54887cb5b95e6a70c8c37311f6 100644 (file)
--- a/doc/api/index.textile
+++ b/doc/api/index.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 title: API Reference
 navorder: 0
----
+...
 
 h1. API Reference
 

diff --git a/doc/api/methods.textile b/doc/api/methods.textile
index fd11ddb277ec2e00a54d3aa9902f2adbae42e77a..c7ddbc3588b2c7038a63460f9c42f8fd4eeb2d45 100644 (file)
--- a/doc/api/methods.textile
+++ b/doc/api/methods.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Concepts
 title: REST methods
 navorder: 3
----
+...
 
 h1. REST Methods
 

diff --git a/doc/api/methods/api_client_authorizations.textile b/doc/api/methods/api_client_authorizations.textile
index 9564b4dab71c0b44df3f99e57caac0f398c1c4c4..c9f6d8294f1392d3e02b5112fe8e778ff3cb0fb5 100644 (file)
--- a/doc/api/methods/api_client_authorizations.textile
+++ b/doc/api/methods/api_client_authorizations.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "api_client_authorizations"
 navorder: 1
----
+...
 
 h1. api_client_authorizations
 

diff --git a/doc/api/methods/api_clients.textile b/doc/api/methods/api_clients.textile
index 9ca50f60edbe8061e19432c1e4b1a2ea718e1e42..2b014ad8c2d39e47d10d9d4e193c878b8e69b555 100644 (file)
--- a/doc/api/methods/api_clients.textile
+++ b/doc/api/methods/api_clients.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "api_clients"
 navorder: 2
----
+...
 
 h1. api_clients
 

diff --git a/doc/api/methods/authorized_keys.textile b/doc/api/methods/authorized_keys.textile
index 9107a698643495b335ffa8233fd8889c8d23e56f..e1c5892e54dcebc50cd51dbaa25601212fc7c781 100644 (file)
--- a/doc/api/methods/authorized_keys.textile
+++ b/doc/api/methods/authorized_keys.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "authorized_keys"
 navorder: 3
----
+...
 
 h1. authorized_keys
 

diff --git a/doc/api/methods/collections.textile b/doc/api/methods/collections.textile
index 49bc7e6794eeee740b7d7fb9d7e3ed4712b6afdf..100f86e6a5a20bf5c893a762fdb3138d78e6546f 100644 (file)
--- a/doc/api/methods/collections.textile
+++ b/doc/api/methods/collections.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "collections"
 navorder: 4
----
+...
 
 h1. collections
 

diff --git a/doc/api/methods/groups.textile b/doc/api/methods/groups.textile
index 8484834473bf21cfd7c6c1f5cdf1f1d9b524f877..8db062d8400ca08403cbcf347fad6693f90004c3 100644 (file)
--- a/doc/api/methods/groups.textile
+++ b/doc/api/methods/groups.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "groups"
 navorder: 5
----
+...
 
 h1. groups
 

diff --git a/doc/api/methods/humans.textile b/doc/api/methods/humans.textile
index 222008a8434a750716a52e407da8f0804b69ce2d..d395b14565b4ae2897eed1991ebfd6e4204da33a 100644 (file)
--- a/doc/api/methods/humans.textile
+++ b/doc/api/methods/humans.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "humans"
 navorder: 6
----
+...
 
 h1. humans
 

diff --git a/doc/api/methods/job_tasks.textile b/doc/api/methods/job_tasks.textile
index e6695e625d7781bbd468620d8ce5db08a8bf0a64..220cf26d0cfb2562ffc82ed828af678b42e4ad31 100644 (file)
--- a/doc/api/methods/job_tasks.textile
+++ b/doc/api/methods/job_tasks.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "job_tasks"
 navorder: 7
----
+...
 
 h1. job_tasks
 

diff --git a/doc/api/methods/jobs.textile b/doc/api/methods/jobs.textile
index 6d34952adec31a1149080cf1317da7481c1c0f86..81093873315b6ada363b9b640a7450b52f49f6e1 100644 (file)
--- a/doc/api/methods/jobs.textile
+++ b/doc/api/methods/jobs.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "jobs"
 navorder: 8
----
+...
 
 h1. jobs
 

diff --git a/doc/api/methods/keep_disks.textile b/doc/api/methods/keep_disks.textile
index 6239cf80093df1acba46781dd53af7a32ab35899..94eb420d4d8a6eb4b3bb84f9ec8a5a865d6d0351 100644 (file)
--- a/doc/api/methods/keep_disks.textile
+++ b/doc/api/methods/keep_disks.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "keep_disks"
 navorder: 9
----
+...
 
 h1. keep_disks
 

diff --git a/doc/api/methods/links.textile b/doc/api/methods/links.textile
index 1530956d9742f670c4064e8c8c8c30e0d1537bf5..f046783821fa5057d60b9fc37ae3da88ca17eb2e 100644 (file)
--- a/doc/api/methods/links.textile
+++ b/doc/api/methods/links.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "links"
 navorder: 10
----
+...
 
 h1. links
 

diff --git a/doc/api/methods/logs.textile b/doc/api/methods/logs.textile
index 4d8c2f411a0b1a741820663fdaffe1fc4c4b9057..600cc3ab3211f27b7993891e9b6ed6ed4f627ada 100644 (file)
--- a/doc/api/methods/logs.textile
+++ b/doc/api/methods/logs.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "logs"
 navorder: 11
----
+...
 
 h1. logs
 

diff --git a/doc/api/methods/nodes.textile b/doc/api/methods/nodes.textile
index 656c085f2b6c84c9b2ab460a8a746cb4d2bc69c4..9521d3f7383d6ebe3e4ea995796be8c29b1e1c63 100644 (file)
--- a/doc/api/methods/nodes.textile
+++ b/doc/api/methods/nodes.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "nodes"
 navorder: 12
----
+...
 
 h1. nodes
 

diff --git a/doc/api/methods/pipeline_instances.textile b/doc/api/methods/pipeline_instances.textile
index 32ebe84a2404269c6de3de8b7830155669d88aae..f50fe859fbe4d26d35caab9c2024e673edaa2bc3 100644 (file)
--- a/doc/api/methods/pipeline_instances.textile
+++ b/doc/api/methods/pipeline_instances.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "pipeline_instances"
 navorder: 13
----
+...
 
 h1. pipeline_instances
 

diff --git a/doc/api/methods/pipeline_templates.textile b/doc/api/methods/pipeline_templates.textile
index d6f5ce86f9df85c291de0d7647092d235269f336..fafd24071b90d6afdf8986fdd14ad8e66baa0bd6 100644 (file)
--- a/doc/api/methods/pipeline_templates.textile
+++ b/doc/api/methods/pipeline_templates.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "pipeline_templates"
 navorder: 14
----
+...
 
 h1. pipeline_templates
 

diff --git a/doc/api/methods/repositories.textile b/doc/api/methods/repositories.textile
index 41373610604159908aa3c7b4c137f519288276d0..3d4aedcf5c47af608302c7e0e16985a3d87d0a63 100644 (file)
--- a/doc/api/methods/repositories.textile
+++ b/doc/api/methods/repositories.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "repositories"
 navorder: 15
----
+...
 
 h1. repositories
 

diff --git a/doc/api/methods/specimens.textile b/doc/api/methods/specimens.textile
index cf499951b5ab61bdbd79788f0b3e20e1e10b7df9..4fa095e4d17aecfd9b1f7279a8b9519b6b9b101e 100644 (file)
--- a/doc/api/methods/specimens.textile
+++ b/doc/api/methods/specimens.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "specimens"
 navorder: 16
----
+...
 
 h1. specimens
 

diff --git a/doc/api/methods/traits.textile b/doc/api/methods/traits.textile
index 8a8ffcb6c785cc1aa7abdcf460e2a7d803b4d01f..28d567867f8542a517bfb23b0f81e61ff2ef0c1b 100644 (file)
--- a/doc/api/methods/traits.textile
+++ b/doc/api/methods/traits.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "traits"
 navorder: 17
----
+...
 
 h1. traits
 

diff --git a/doc/api/methods/users.textile b/doc/api/methods/users.textile
index c162133c85d16eff57aea2619a6ef040f11a4471..2ae5eee4a9de9e7dcc7b3129e05f55a726bc4370 100644 (file)
--- a/doc/api/methods/users.textile
+++ b/doc/api/methods/users.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "users"
 navorder: 18
----
+...
 
 h1. users
 

diff --git a/doc/api/methods/virtual_machines.textile b/doc/api/methods/virtual_machines.textile
index 36674910b376a14189dd67a4751edffcc274ebf9..a96fcb4becd5f5e8a7b844a09c407fed186b902e 100644 (file)
--- a/doc/api/methods/virtual_machines.textile
+++ b/doc/api/methods/virtual_machines.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: API Methods
 title: "virtual_machines"
 navorder: 19
----
+...
 
 h1. virtual_machines
 

diff --git a/doc/api/permission-model.textile b/doc/api/permission-model.textile
index 843ab2542ca0ac60a78a7319f61d041c02cd46bc..cc4c0d8d7b47b84e5306efadd4ba861ada0646ff 100644 (file)
--- a/doc/api/permission-model.textile
+++ b/doc/api/permission-model.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Concepts
 title: "Permission model"
 navorder: 6
----
+...
 
 h1. Permission model
 

diff --git a/doc/api/resources.textile b/doc/api/resources.textile
index 2783af695d907bd3eee2864a03b34db96060ddfc..8a54a142255a546160b9deaf1f2b9f7690be0454 100644 (file)
--- a/doc/api/resources.textile
+++ b/doc/api/resources.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Concepts
 title: Resources
 navorder: 4
----
+...
 
 h1. Resources
 

diff --git a/doc/api/schema/ApiClient.textile b/doc/api/schema/ApiClient.textile
index 3d835fb5be0feb9e03fb8ec7fa640ba49d67da0d..86f93450d63ea1ae288ccb5827bb412538b902d1 100644 (file)
--- a/doc/api/schema/ApiClient.textile
+++ b/doc/api/schema/ApiClient.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: ApiClient
 navorder: 2
----
+...
 
 h1. ApiClient
 

diff --git a/doc/api/schema/ApiClientAuthorization.textile b/doc/api/schema/ApiClientAuthorization.textile
index 289ff76008cba36f291e41a44b4b6c74d4421c46..d9ee87dbcdc7d5e12221f4b666805675088b3051 100644 (file)
--- a/doc/api/schema/ApiClientAuthorization.textile
+++ b/doc/api/schema/ApiClientAuthorization.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: ApiClientAuthorization
 navorder: 1
----
+...
 
 h1. ApiClientAuthorization
 

diff --git a/doc/api/schema/AuthorizedKey.textile b/doc/api/schema/AuthorizedKey.textile
index aec56ff7c4379b5bca425da1efed54971d794a91..c60ce7146ecf053da68dbe3ed103212902383b63 100644 (file)
--- a/doc/api/schema/AuthorizedKey.textile
+++ b/doc/api/schema/AuthorizedKey.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: AuthorizedKey
 navorder: 3
----
+...
 
 h1. AuthorizedKey
 

diff --git a/doc/api/schema/Collection.textile b/doc/api/schema/Collection.textile
index 485ab3c871b25c4b4db2ef5d65769fa9cdbf747e..fb39ff929d8ddd60224e365903e7f841af7df604 100644 (file)
--- a/doc/api/schema/Collection.textile
+++ b/doc/api/schema/Collection.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Collection
 navorder: 4
----
+...
 
 h1. Collection
 

diff --git a/doc/api/schema/Commit.textile b/doc/api/schema/Commit.textile
index 0a02d8ffabacdcc82a9ea206b793b4221d7cf64c..71791ebf1223e28ec208d9a4e0fdba29dbd9c617 100644 (file)
--- a/doc/api/schema/Commit.textile
+++ b/doc/api/schema/Commit.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Commit
 navorder: 6
----
+...
 
 h1. Commit
 

diff --git a/doc/api/schema/CommitAncestor.textile b/doc/api/schema/CommitAncestor.textile
index aac8698dac1d9babb54ef6fdba4a1e9c3a202631..e4788f8a68c71ff0f61993ed01511d59deb58541 100644 (file)
--- a/doc/api/schema/CommitAncestor.textile
+++ b/doc/api/schema/CommitAncestor.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: CommitAncestor
 navorder: 5
----
+...
 
 h1. CommitAncestor
 

diff --git a/doc/api/schema/Group.textile b/doc/api/schema/Group.textile
index 650cbb7903224ec564570910ddfe8b7dcb15f40e..4315d758f0fb5d03550d62c42689e094ceb6c073 100644 (file)
--- a/doc/api/schema/Group.textile
+++ b/doc/api/schema/Group.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Group
 navorder: 7
----
+...
 
 h1. Group
 

diff --git a/doc/api/schema/Human.textile b/doc/api/schema/Human.textile
index 596cb0d230cb5c0dfad6d26ac59c578d26620002..31766c9b60fc9bbfa2a240cad86dd2a0901106ef 100644 (file)
--- a/doc/api/schema/Human.textile
+++ b/doc/api/schema/Human.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Human
 navorder: 8
----
+...
 
 h1. Human
 

diff --git a/doc/api/schema/Job.textile b/doc/api/schema/Job.textile
index 17e7358640e6902fc16d5b878f88732d1c1a2f95..631c54942ebd9d486f1ea4fef45baae0e8e14a84 100644 (file)
--- a/doc/api/schema/Job.textile
+++ b/doc/api/schema/Job.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Job
 navorder: 9
----
+...
 
 h1. Job
 

diff --git a/doc/api/schema/JobTask.textile b/doc/api/schema/JobTask.textile
index 4efaa094b8b2076a247695442fe986573dad5b19..fbbc8efc84afdfc6199f9b4c9a76cb0cea106c0e 100644 (file)
--- a/doc/api/schema/JobTask.textile
+++ b/doc/api/schema/JobTask.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: JobTask
 navorder: 10
----
+...
 
 h1. JobTask
 

diff --git a/doc/api/schema/KeepDisk.textile b/doc/api/schema/KeepDisk.textile
index 152ea8dede8f0bf992fd800c969cee45ae6ebd11..d9f36abd34e5ac6e9eb88940e62b2fe8371f964f 100644 (file)
--- a/doc/api/schema/KeepDisk.textile
+++ b/doc/api/schema/KeepDisk.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: KeepDisk
 navorder: 11
----
+...
 
 h1. KeepDisk
 

diff --git a/doc/api/schema/Link.textile b/doc/api/schema/Link.textile
index 624bf53d9d657b0679137296ff26e07efe732a0d..952d6f04857ad2c58678771f8c32fffa173f0941 100644 (file)
--- a/doc/api/schema/Link.textile
+++ b/doc/api/schema/Link.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Link
 navorder: 12
----
+...
 
 h1. Link
 

diff --git a/doc/api/schema/Log.textile b/doc/api/schema/Log.textile
index 4ad810e285b458bdcf2dc6df58a91777e4ca842b..7c94d34a4b256c2422f17ea9ec383ce242858947 100644 (file)
--- a/doc/api/schema/Log.textile
+++ b/doc/api/schema/Log.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Log
 navorder: 14
----
+...
 
 h1. Log
 

diff --git a/doc/api/schema/Node.textile b/doc/api/schema/Node.textile
index 7a6e4efb42815c8fceb4154fb2742df65a65845e..ccdd3e571ae94e82fc3a5823478579e0328eb0de 100644 (file)
--- a/doc/api/schema/Node.textile
+++ b/doc/api/schema/Node.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Node
 navorder: 15
----
+...
 
 h1. Node
 

diff --git a/doc/api/schema/PipelineInstance.textile b/doc/api/schema/PipelineInstance.textile
index bdefce2aac9aad9f28a6add3719660d1e23b8f4c..4eeb98926e782e072f12425c6d16520c332b04b8 100644 (file)
--- a/doc/api/schema/PipelineInstance.textile
+++ b/doc/api/schema/PipelineInstance.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: PipelineInstance
 navorder: 16
----
+...
 
 h1. PipelineInstance
 

diff --git a/doc/api/schema/PipelineTemplate.textile b/doc/api/schema/PipelineTemplate.textile
index 8511a492602f2f10310b33de84f0e91d8808c6e6..c54ba5837cdc2800b072080f8fbde80feca05998 100644 (file)
--- a/doc/api/schema/PipelineTemplate.textile
+++ b/doc/api/schema/PipelineTemplate.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: PipelineTemplate
 navorder: 17
----
+...
 
 h1. PipelineTemplate
 

diff --git a/doc/api/schema/Repository.textile b/doc/api/schema/Repository.textile
index 084e66e915b7a9dec5e8c8ee708b0d4ca49d6b68..4989c69cb47b8309c784ac6d5f56ebe0885f2b71 100644 (file)
--- a/doc/api/schema/Repository.textile
+++ b/doc/api/schema/Repository.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Repository
 navorder: 18
----
+...
 
 h1. Repository
 

diff --git a/doc/api/schema/Specimen.textile b/doc/api/schema/Specimen.textile
index 875c0418103d4a011ba275269aa0cdb921959717..04afddc681a2767801a4cea32e674a86e23992a5 100644 (file)
--- a/doc/api/schema/Specimen.textile
+++ b/doc/api/schema/Specimen.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Specimen
 navorder: 19
----
+...
 
 h1. Specimen
 

diff --git a/doc/api/schema/Trait.textile b/doc/api/schema/Trait.textile
index 45087a54c9a88b6461db2d1728670caedc3cc829..d6829d359d9f66f14ae8e24ad33b063c8fc9a116 100644 (file)
--- a/doc/api/schema/Trait.textile
+++ b/doc/api/schema/Trait.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: Trait
 navorder: 20
----
+...
 
 h1. Trait
 

diff --git a/doc/api/schema/User.textile b/doc/api/schema/User.textile
index c7fadb34e698f0ad2d3443b1ed18545c1939b0a9..d141ec03b56c68c5843ae2be7721535033fae478 100644 (file)
--- a/doc/api/schema/User.textile
+++ b/doc/api/schema/User.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: User
 navorder: 21
----
+...
 
 h1. User
 

diff --git a/doc/api/schema/VirtualMachine.textile b/doc/api/schema/VirtualMachine.textile
index 49a23b03a12ec39aaf8951d4728bf296beabbb6f..0b5ccb80b5dd9280e19a395177c2245fe201a8fb 100644 (file)
--- a/doc/api/schema/VirtualMachine.textile
+++ b/doc/api/schema/VirtualMachine.textile
@@ -4,7 +4,7 @@ navsection: api
 navmenu: Schema
 title: VirtualMachine
 navorder: 22
----
+...
 
 h1. VirtualMachine
 

diff --git a/doc/index.html b/doc/index.html
index af280c0183ce91b1e0802ecd391d7081a17ab11b..9d5fb799603b864c4e424f563f1e82f4106477e9 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -2,7 +2,7 @@
 layout: default
 navsection: top
 title: Arvados | Documentation
----
+...
 
 <div class="frontpagehero">
   <div style="padding:100px 50px; margin-left:0px; margin-top:0px">

diff --git a/doc/install/client.textile b/doc/install/client.textile
index 2df30f9ef2e1083ab12e5f3f914354933eb1202f..7827a139650ca6b875d96f3bf4e1d077b6628450 100644 (file)
--- a/doc/install/client.textile
+++ b/doc/install/client.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Install client libraries
 navorder: 5
----
+...
 
 h1. Install client libraries
 

diff --git a/doc/install/create-standard-objects.textile b/doc/install/create-standard-objects.textile
index 9a79aa147581a66c8b219a6906b835dec3962fc1..857679ff64cc761153931c6e7bd39dfd04df4810 100644 (file)
--- a/doc/install/create-standard-objects.textile
+++ b/doc/install/create-standard-objects.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Create standard objects
 navorder: 4
----
+...
 
 h1. Create standard objects
 

diff --git a/doc/install/index.md b/doc/install/index.md
index 210c47ac88d964df96ad7669ebeb2093d5251f08..39b3d97c91411465e39f72a3d3fcc63bc5129ce0 100644 (file)
--- a/doc/install/index.md
+++ b/doc/install/index.md
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Overview
 navorder: 0
----
+...
 
 {% include alert-stub.html %}
 

diff --git a/doc/install/install-api-server.md b/doc/install/install-api-server.md
index dbae3dac8857ec1fc7d61022c661152b79aee92f..c959e1bdcf5c30fa23385add06da79298556b00b 100644 (file)
--- a/doc/install/install-api-server.md
+++ b/doc/install/install-api-server.md
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Install the API server
 navorder: 1
----
+...
 
 {% include alert-stub.html %}
 

diff --git a/doc/install/install-crunch-dispatch.textile b/doc/install/install-crunch-dispatch.textile
index 4c0209820f788361075dea6e2f59694633e37404..d6525aa2fa01872da391c60c0af878b6d44d7f87 100644 (file)
--- a/doc/install/install-crunch-dispatch.textile
+++ b/doc/install/install-crunch-dispatch.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Install the Crunch dispatcher
 navorder: 3
----
+...
 
 h1. Crunch setup
 

diff --git a/doc/install/install-workbench-app.md b/doc/install/install-workbench-app.md
index 6c63598c0288c34bc12ee37cc22b1253b70678cc..c598785379ffba05781373f6ec5f15c3ac57c80e 100644 (file)
--- a/doc/install/install-workbench-app.md
+++ b/doc/install/install-workbench-app.md
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Install the Arvados workbench application
 navorder: 2
----
+...
 
 {% include alert-stub.html %}
 

diff --git a/doc/sdk/index.textile b/doc/sdk/index.textile
index 4224b5967bcb29d78119a2721eeddfd7e9c8502a..ee001d987ed0f4afed230ed60ceec1be432c51d5 100644 (file)
--- a/doc/sdk/index.textile
+++ b/doc/sdk/index.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: sdk
 title: "SDK Reference"
 navorder: 0
----
+...
 
 h1. Arvados SDK Reference
 

diff --git a/doc/sdk/python/crunch-utility-libraries.textile b/doc/sdk/python/crunch-utility-libraries.textile
index 95a3780b7ab7db765933fb6ab968919816d1e62c..c0b54fa23cf55c0f034d0837ce6af62cab69d27a 100644 (file)
--- a/doc/sdk/python/crunch-utility-libraries.textile
+++ b/doc/sdk/python/crunch-utility-libraries.textile
@@ -4,7 +4,7 @@ navsection: sdk
 navmenu: Python
 title: "Crunch utility libraries"
 navorder: 20
----
+...
 
 h1. Crunch utility libraries
 

diff --git a/doc/sdk/python/python.textile b/doc/sdk/python/python.textile
index 4d6900b5d24aef2952cc63e8c2e8f4433c584282..4483cd9d726c406bb6d206c4fd1e725ce8544dda 100644 (file)
--- a/doc/sdk/python/python.textile
+++ b/doc/sdk/python/python.textile
@@ -5,6 +5,6 @@ navmenu: Python
 title: "PyDoc Reference"
 navorder: 30
 no_nav_left: true
----
+...
 
 notextile. <iframe src="arvados/" style="width:100%; height:100%; border:none" />

diff --git a/doc/sdk/python/sdk-python.textile b/doc/sdk/python/sdk-python.textile
index 81a61f094ff6298972aae703c27e240f40523482..2e9660ef73d62426d70bf27484b90d7160407a89 100644 (file)
--- a/doc/sdk/python/sdk-python.textile
+++ b/doc/sdk/python/sdk-python.textile
@@ -4,7 +4,7 @@ navsection: sdk
 navmenu: Python
 title: "Python SDK"
 navorder: 10
----
+...
 
 h1. Python SDK
 

diff --git a/doc/user/examples/crunch-examples.textile b/doc/user/examples/crunch-examples.textile
index 6fc9dc099a68510417028d49dca1220cff5820b4..b1ada1f548f9ba88fa262fe43a69603719cd76d1 100644 (file)
--- a/doc/user/examples/crunch-examples.textile
+++ b/doc/user/examples/crunch-examples.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Examples
 title: "Crunch examples"
 navorder: 30
----
+...
 
 h1. Crunch examples
 

diff --git a/doc/user/getting_started/check-environment.textile b/doc/user/getting_started/check-environment.textile
index 298f1886e3413af3672eaa61a2f97689e27d94ae..1516c7f44891d952fbc4845c0e735bd0687e2160 100644 (file)
--- a/doc/user/getting_started/check-environment.textile
+++ b/doc/user/getting_started/check-environment.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Getting Started
 title: "Checking your environment"
 navorder: 10
----
+...
 
 h1. Checking your environment
 

diff --git a/doc/user/getting_started/community.textile b/doc/user/getting_started/community.textile
index 9a2aeca4ec30c13c2b330df49e1e2eae184be5dc..7c630380ba5a1d38750d299c6c9dd596a7eb0d93 100644 (file)
--- a/doc/user/getting_started/community.textile
+++ b/doc/user/getting_started/community.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Getting Started
 title: Arvados Community and Getting Help
 navorder: 11
----
+...
 h1. Arvados Community and Getting Help
 
 

diff --git a/doc/user/getting_started/ssh-access.textile b/doc/user/getting_started/ssh-access.textile
index 1e9b0225d083aa7a66918e272b855085527b1995..7d1104002f6cb7dce29d0ccdc126c5865a2f490b 100644 (file)
--- a/doc/user/getting_started/ssh-access.textile
+++ b/doc/user/getting_started/ssh-access.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Getting Started
 title: Accessing an Arvados VM over ssh
 navorder: 2
----
+...
 
 h1. Accessing an Arvados Virtual Machine over ssh
 

diff --git a/doc/user/getting_started/workbench.textile b/doc/user/getting_started/workbench.textile
index cbe0e35ac7d34d28f6b49dba9885c904c20ab70e..2b72cd3ee6bf4c08566c3bd367e08014ad7578af 100644 (file)
--- a/doc/user/getting_started/workbench.textile
+++ b/doc/user/getting_started/workbench.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Getting Started
 title: Accessing Arvados Workbench
 navorder: 1
----
+...
 h1. Accessing Arvados Workbench
 
 Access the Arvados beta test instance available using this link:

diff --git a/doc/user/index.textile b/doc/user/index.textile
index 085f6becc6e77d2b9a391ae71f058e415451ae68..cc723f66944e38999663cbd34abe639524201f4f 100644 (file)
--- a/doc/user/index.textile
+++ b/doc/user/index.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 title: Welcome to Arvados!
 navorder: 0
----
+...
 
 h1. Welcome to Arvados!
 

diff --git a/doc/user/reference/api-tokens.textile b/doc/user/reference/api-tokens.textile
index 928ba265c2a7454a0edad907ae8f66d91ca72517..b3938f250490226cf047740dc2aaa418cd06b7cb 100644 (file)
--- a/doc/user/reference/api-tokens.textile
+++ b/doc/user/reference/api-tokens.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Reference
 title: "Getting an API token"
 navorder: 01
----
+...
 
 h1. Reference: Getting an API token
 

diff --git a/doc/user/reference/sdk-cli.textile b/doc/user/reference/sdk-cli.textile
index 058f1b399d854ffe98e2f7310c3a9c92372ed1ec..5a7753c24ee9710b04076b14d84b0ac5fc6efc2a 100644 (file)
--- a/doc/user/reference/sdk-cli.textile
+++ b/doc/user/reference/sdk-cli.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Reference
 title: "Command line interface"
 navorder: 22
----
+...
 
 h1. Reference: Command Line Interface
 

diff --git a/doc/user/tutorials/running-external-program.textile b/doc/user/tutorials/running-external-program.textile
index 21b8c6f8d90897f98280245f97985de4925a1cc3..34cb71ab757b67ae3f639168c702b1135645703e 100644 (file)
--- a/doc/user/tutorials/running-external-program.textile
+++ b/doc/user/tutorials/running-external-program.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Running external programs"
 navorder: 18
----
+...
 
 h1. Running external programs
 

diff --git a/doc/user/tutorials/tutorial-firstscript.textile b/doc/user/tutorials/tutorial-firstscript.textile
index 08e63747c562ec3e50a1aabffbc90cd9ce1f4657..5cb8c26cb110207df65c1683a4451ba6bc803f3b 100644 (file)
--- a/doc/user/tutorials/tutorial-firstscript.textile
+++ b/doc/user/tutorials/tutorial-firstscript.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Writing a Crunch script"
 navorder: 13
----
+...
 
 h1. Writing a Crunch script
 

diff --git a/doc/user/tutorials/tutorial-gatk-variantfiltration.textile b/doc/user/tutorials/tutorial-gatk-variantfiltration.textile
index 779761ab019286611d6c8b6147c82be7c058a5e3..17485653c77fb7691faad4f480ee1f6fb6672c62 100644 (file)
--- a/doc/user/tutorials/tutorial-gatk-variantfiltration.textile
+++ b/doc/user/tutorials/tutorial-gatk-variantfiltration.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Using GATK with Arvados"
 navorder: 16
----
+...
 
 h1. Using GATK with Arvados
 

diff --git a/doc/user/tutorials/tutorial-job-debug.textile b/doc/user/tutorials/tutorial-job-debug.textile
index 6be687c56f5d3f732995340a104726bec29c508d..570713b5614753a0fa9c434a3900c73155acdfe6 100644 (file)
--- a/doc/user/tutorials/tutorial-job-debug.textile
+++ b/doc/user/tutorials/tutorial-job-debug.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Debugging a Crunch script"
 navorder: 14
----
+...
 
 h1. Debugging a Crunch script
 

diff --git a/doc/user/tutorials/tutorial-job1.textile b/doc/user/tutorials/tutorial-job1.textile
index 53d2342d661c2a52c8f39a7abd03a8ec5b5f5a1d..be159db85f473e62d4cd32a06121e68f96cc421d 100644 (file)
--- a/doc/user/tutorials/tutorial-job1.textile
+++ b/doc/user/tutorials/tutorial-job1.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Running a Crunch job"
 navorder: 12
----
+...
 
 h1. Running a crunch job
 

diff --git a/doc/user/tutorials/tutorial-keep.textile b/doc/user/tutorials/tutorial-keep.textile
index 6683498e86d78f6450b9b9b305d4180bb25974fb..eb0f9690f5f69e5e217c6b6369465a1e0b838c4c 100644 (file)
--- a/doc/user/tutorials/tutorial-keep.textile
+++ b/doc/user/tutorials/tutorial-keep.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Storing and Retrieving data using Arvados Keep"
 navorder: 11
----
+...
 
 h1. Storing and Retrieving data using Arvados Keep
 

diff --git a/doc/user/tutorials/tutorial-new-pipeline.textile b/doc/user/tutorials/tutorial-new-pipeline.textile
index 101d6ac2616be0f6cb65964b4816b50d91d8db1e..ee92090de1e9be780262aee99190235219bf8716 100644 (file)
--- a/doc/user/tutorials/tutorial-new-pipeline.textile
+++ b/doc/user/tutorials/tutorial-new-pipeline.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Constructing a Crunch pipeline"
 navorder: 15
----
+...
 
 h1. Constructing a Crunch pipeline
 

diff --git a/doc/user/tutorials/tutorial-parallel.textile b/doc/user/tutorials/tutorial-parallel.textile
index 8a6118492db8e4d519a6e7f3a0c2f720b230117f..1cad88ce659e7a25e08fc5e91de0a609e64620fd 100644 (file)
--- a/doc/user/tutorials/tutorial-parallel.textile
+++ b/doc/user/tutorials/tutorial-parallel.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Parallel Crunch tasks"
 navorder: 15
----
+...
 
 h1. Parallel Crunch tasks
 

diff --git a/doc/user/tutorials/tutorial-trait-search.textile b/doc/user/tutorials/tutorial-trait-search.textile
index d7fe50b93b6667f4b9566f8c3cb5d5b244fc0b31..1fcbbc3a9d4f5c462dbae7be99aaa53ba7bcd332 100644 (file)
--- a/doc/user/tutorials/tutorial-trait-search.textile
+++ b/doc/user/tutorials/tutorial-trait-search.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Querying the Metadata Database"
 navorder: 16
----
+...
 
 h1. Querying the Metadata Database
 

diff --git a/doc/zenweb-liquid.rb b/doc/zenweb-liquid.rb
new file mode 100644 (file)
index 0000000..f301aa4
--- /dev/null
+++ b/doc/zenweb-liquid.rb
@@ -0,0 +1,22 @@
+require 'zenweb'
+
+module ZenwebLiquid
+  VERSION = '0.0.1'
+end
+
+module Zenweb
+  class Page
+    
+    ##
+    # Render a page's liquid and return the intermediate result
+    def render_liquid page, content, binding = TOPLEVEL_BINDING
+      require 'liquid'
+      
+      unless defined? @liquid_template then
+        @liquid_template = Liquid::Template.parse(content).render()
+      end
+      
+      @liquid_template.render(binding)
+    end
+  end
+end

diff --git a/doc/zenweb-textile.rb b/doc/zenweb-textile.rb
new file mode 100644 (file)
index 0000000..bdd7162
--- /dev/null
+++ b/doc/zenweb-textile.rb
@@ -0,0 +1,23 @@
+require 'zenweb'
+
+module ZenwebTextile
+  VERSION = '0.0.1'
+end
+
+module Zenweb
+  class Page
+    
+    ##
+    # Render a page's textile and return the resulting html
+    def render_textile page, content
+      textile body
+    end
+
+    ##
+    # Render textile in +content+ 
+    def textile content
+      require 'RedCloth'
+      @textile = RedCloth.new(content).to_html
+    end
+  end
+end