Merge branch '2.0.0' into features/lp/2.0-protobuf-additions

Author: coderoshi

data/downloads_defaults.yml

@@ -50,6 +50,10 @@ default:
           arch:
             amd64:
               name: "AMD 64"
+        "9.2":
+          arch:
+            amd64:
+              name: "AMD 64"
     osx:
       name: "Mac"
       icon: "mac.png"
@@ -109,6 +113,12 @@ default:
               name: "17 x86 64"
             src:
               name: "17 Source"
+        "19":
+          arch:
+            x86_64:
+              name: "19 x86 64"
+            src:
+              name: "19 Source"
     smartos:
       name: "SmartOS"
       icon: "smartos.png"

data/downloads_gen.yml

@@ -3103,6 +3103,169 @@ riak:
               file: riak-1.4.8.tar.gz
               static_file: http://s3.amazonaws.com/downloads.basho.com/riak/1.4/1.4.8/riak-1.4.8.tar.gz
               file_size: 13799400
+  2.0.0pre20:
+    debian:
+      versions:
+        '6':
+          arch:
+            amd64:
+              file: riak_2.0.0pre20-1_amd64.deb
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/debian/6/riak_2.0.0pre20-1_amd64.deb
+              file_size: 60021328
+              csum: riak_2.0.0pre20-1_amd64.deb.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/debian/6/riak_2.0.0pre20-1_amd64.deb.sha
+              csum_size: 94
+        '7':
+          arch:
+            amd64:
+              file: riak_2.0.0pre20-1_amd64.deb
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/debian/7/riak_2.0.0pre20-1_amd64.deb
+              file_size: 60031646
+              csum: riak_2.0.0pre20-1_amd64.deb.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/debian/7/riak_2.0.0pre20-1_amd64.deb.sha
+              csum_size: 94
+    fedora:
+      versions:
+        '19':
+          arch:
+            src:
+              file: riak-2.0.0pre20-1.fc19.src.rpm
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/fedora/19/riak-2.0.0pre20-1.fc19.src.rpm
+              file_size: 15997960
+              csum: riak-2.0.0pre20-1.fc19.src.rpm.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/fedora/19/riak-2.0.0pre20-1.fc19.src.rpm.sha
+              csum_size: 97
+            x86_64:
+              file: riak-2.0.0pre20-1.fc19.x86_64.rpm
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/fedora/19/riak-2.0.0pre20-1.fc19.x86_64.rpm
+              file_size: 58013752
+              csum: riak-2.0.0pre20-1.fc19.x86_64.rpm.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/fedora/19/riak-2.0.0pre20-1.fc19.x86_64.rpm.sha
+              csum_size: 100
+    freebsd:
+      versions:
+        '9.2':
+          arch:
+            amd64:
+              file: riak-2.0.0pre20-FreeBSD-amd64.tbz
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/freebsd/9.2/riak-2.0.0pre20-FreeBSD-amd64.tbz
+              file_size: 66726268
+              csum: riak-2.0.0pre20-FreeBSD-amd64.tbz.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/freebsd/9.2/riak-2.0.0pre20-FreeBSD-amd64.tbz.sha
+              csum_size: 100
+    osx:
+      versions:
+        '10.8':
+          arch:
+            x86_64:
+              file: riak-2.0.0pre20-OSX-x86_64.tar.gz
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/osx/10.8/riak-2.0.0pre20-OSX-x86_64.tar.gz
+              file_size: 60548411
+              csum: riak-2.0.0pre20-OSX-x86_64.tar.gz.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/osx/10.8/riak-2.0.0pre20-OSX-x86_64.tar.gz.sha
+              csum_size: 100
+    rhel:
+      versions:
+        '5':
+          arch:
+            x86_64:
+              file: riak-2.0.0pre20-1.el5.x86_64.rpm
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/5/riak-2.0.0pre20-1.el5.x86_64.rpm
+              file_size: 61353496
+              csum: riak-2.0.0pre20-1.el5.x86_64.rpm.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/5/riak-2.0.0pre20-1.el5.x86_64.rpm.sha
+              csum_size: 99
+            src:
+              file: riak-2.0.0pre20-1.src.rpm
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/5/riak-2.0.0pre20-1.src.rpm
+              file_size: 15994199
+              csum: riak-2.0.0pre20-1.src.rpm.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/5/riak-2.0.0pre20-1.src.rpm.sha
+              csum_size: 92
+        '6':
+          arch:
+            src:
+              file: riak-2.0.0pre20-1.el6.src.rpm
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/6/riak-2.0.0pre20-1.el6.src.rpm
+              file_size: 15964942
+              csum: riak-2.0.0pre20-1.el6.src.rpm.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/6/riak-2.0.0pre20-1.el6.src.rpm.sha
+              csum_size: 96
+            x86_64:
+              file: riak-2.0.0pre20-1.el6.x86_64.rpm
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/6/riak-2.0.0pre20-1.el6.x86_64.rpm
+              file_size: 58451748
+              csum: riak-2.0.0pre20-1.el6.x86_64.rpm.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/rhel/6/riak-2.0.0pre20-1.el6.x86_64.rpm.sha
+              csum_size: 99
+    smartos:
+      versions:
+        '1.6':
+          arch:
+            x86_64:
+              file: riak-2.0.0pre20-SmartOS-x86_64.tgz
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/smartos/1.6/riak-2.0.0pre20-SmartOS-x86_64.tgz
+              file_size: 67971769
+              csum: riak-2.0.0pre20-SmartOS-x86_64.tgz.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/smartos/1.6/riak-2.0.0pre20-SmartOS-x86_64.tgz.sha
+              csum_size: 101
+        '1.8':
+          arch:
+            x86_64:
+              file: riak-2.0.0pre20-SmartOS-x86_64.tgz
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/smartos/1.8/riak-2.0.0pre20-SmartOS-x86_64.tgz
+              file_size: 69469492
+              csum: riak-2.0.0pre20-SmartOS-x86_64.tgz.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/smartos/1.8/riak-2.0.0pre20-SmartOS-x86_64.tgz.sha
+              csum_size: 101
+        '13.1':
+          arch:
+            x86_64:
+              file: riak-2.0.0pre20-SmartOS-x86_64.tgz
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/smartos/13.1/riak-2.0.0pre20-SmartOS-x86_64.tgz
+              file_size: 69478916
+              csum: riak-2.0.0pre20-SmartOS-x86_64.tgz.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/smartos/13.1/riak-2.0.0pre20-SmartOS-x86_64.tgz.sha
+              csum_size: 101
+    solaris:
+      versions:
+        '10':
+          arch:
+            x86_64:
+              file: BASHOriak-2.0.0pre20-Solaris10-x86_64.pkg.gz
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/solaris/10/BASHOriak-2.0.0pre20-Solaris10-x86_64.pkg.gz
+              file_size: 66168203
+              csum: BASHOriak-2.0.0pre20-Solaris10-x86_64.pkg.gz.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/solaris/10/BASHOriak-2.0.0pre20-Solaris10-x86_64.pkg.gz.sha
+              csum_size: 111
+    ubuntu:
+      versions:
+        lucid:
+          arch:
+            amd64:
+              file: riak_2.0.0pre20-1_amd64.deb
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/ubuntu/lucid/riak_2.0.0pre20-1_amd64.deb
+              file_size: 60014286
+              csum: riak_2.0.0pre20-1_amd64.deb.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/ubuntu/lucid/riak_2.0.0pre20-1_amd64.deb.sha
+              csum_size: 94
+        precise:
+          arch:
+            amd64:
+              file: riak_2.0.0pre20-1_amd64.deb
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/ubuntu/precise/riak_2.0.0pre20-1_amd64.deb
+              file_size: 59980610
+              csum: riak_2.0.0pre20-1_amd64.deb.sha
+              static_csum: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/ubuntu/precise/riak_2.0.0pre20-1_amd64.deb.sha
+              csum_size: 94
+    source:
+      versions:
+        any:
+          arch:
+            src:
+              file: riak-2.0.0pre20.tar.gz
+              static_file: http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.0pre20/riak-2.0.0pre20.tar.gz
+              file_size: 15991573
 riak-cs:
   1.2.1: 
   1.3.0:
@@ -4406,6 +4569,7 @@ riak-cs:
               file: riak-cs-1.4.5.tar.gz
               static_file: http://s3.amazonaws.com/downloads.basho.com/riak-cs/1.4/1.4.5/riak-cs-1.4.5.tar.gz
               file_size: 4800819
+  2.0.0pre20: 
 stanchion:
   1.3.0:
     debian:

data/versions.yml

@@ -2,7 +2,7 @@ riakee:
   - ['1.2.0', '1.2.1']
   - ['1.3.0', '1.3.1', '1.3.2']
   - ['1.4.0', '1.4.1', '1.4.2', '1.4.6', '1.4.7', '1.4.8']
-  - ['2.0.0pre11']
+  - ['2.0.0pre20']
 riakcs:
   - ['1.2.0', '1.2.1']
   - ['1.3.0', '1.3.1']
@@ -16,7 +16,7 @@ riak:
   - ['1.2.0', '1.2.1']
   - ['1.3.0', '1.3.1', '1.3.2']
   - ['1.4.0', '1.4.1', '1.4.2', '1.4.6', '1.4.7', '1.4.8']
-  - ['2.0.0pre11']
+  - ['2.0.0pre20']
 riakcscontrol:
   - ['1.0.0', '1.0.1', '1.0.2']
 # describes the latest version per project

lib/sitemap_render_override.rb

@@ -309,7 +309,9 @@ def tabize_code!(data)
         else
           lang
         end
-        tabs_html += "<li class=\"#{active ? 'active' : ''}\"><a href=\"##{lang}#{block_suffix}\" data-code=\"#{lang}\" data-toggle=\"tab\">#{display_lang}</a></li>"
+        unless display_lang.blank?
+          tabs_html += "<li class=\"#{active ? 'active' : ''}\"><a href=\"##{lang}#{block_suffix}\" data-code=\"#{lang}\" data-toggle=\"tab\">#{display_lang}</a></li>"
+        end
         code_blocks += "<div class=\"tab-pane#{active ? ' active' : ''}\" id=\"#{lang}#{block_suffix}\">#{code}</div>"
         active = false
       end

source/css/common.css.scss

@@ -383,7 +383,6 @@ em {
 blockquote {
   @extend .serif-italic;
   @include allCorners();
-  @include boxShadow(inset 0 2px 3px lighten($orange, 25%));
   margin     : 2em 40px;
   background : lighten($orange, 30%);
   border     : 1px solid lighten($orange, 15%);
@@ -1322,10 +1321,6 @@ div[role="main"] {
       margin-top  : -78px;
     }
 
-    .CodeRay {
-      max-width : 100%;
-    }
-
     nav.tutorial {
       ul, h4 {
         max-width : 100%;
@@ -1635,6 +1630,12 @@ div[role=main] {
     @include corner(right, top);
     @include corner(right, bottom);
     @include corner(left, bottom);
+    border: 1px solid #ddd;
+  }
+
+  .nav-tabs > li.active > a {
+    border: 1px solid #ddd;
+    border-bottom: 0px;
   }
 
   .note {
@@ -1691,6 +1692,11 @@ div[role=main] {
     }
   }
 
+  div.tab-content {
+    max-width: 600px;
+    font-size: 85%;
+  }
+
   .code {
     //@include bgPattern('code-bg.jpg');
     //@include boxShadow(inset 0 1px 4px #aeb9b6);
@@ -1728,6 +1734,40 @@ div[role=main] {
       width : 70%;
     }
   }
+
+  table.riak-conf {
+    width: 799px;
+    max-width: 799px;
+    td:nth-of-type(1) {
+      overflow-wrap:break-word;
+      max-width: 300px;
+    }
+    td:nth-of-type(2) {
+      overflow-wrap:break-word;
+      max-width: 325px;
+    }
+    td:nth-of-type(3) {
+      overflow-wrap:break-word;
+      width: 100px;
+    }
+  }
+
+  table.schemausecase {
+    font-size:80%;
+    th {
+      color:#3a5752;
+      padding: 3px 5px;
+    }
+    td {
+      padding: 3px 5px;
+      a {
+        vertical-align: super;
+        font-size:80%;
+        color:$darkOrange;
+        padding-left:3px;
+      }
+    }
+  }
 }
 
 

source/images/plangs/The_C_Programming_Language_logo.png

@@ -18,8 +18,8 @@ en:
   next: Next
   toc_contents: Contents
   footer: "This work is licensed under a <a href=\"http://creativecommons.org/licenses/by/3.0/\" target=\"_blank\">Creative Commons Attribution 3.0 Unported License</a>"
-  banner_ad: "Technical Preview of Riak 2.0 is now available. <a class=\"register\" href=\"http://docs.basho.com/riak/2.0.0pre11/downloads/\">Download Here</a>"
-  banner_ad_mobile: "<a href=\"http://docs.basho.com/riak/2.0.0pre11/downloads/\">Download the Technical Preview of Riak 2.0</a>"
+  banner_ad: "Technical Preview of Riak 2.0 is now available. <a class=\"register\" href=\"http://docs.basho.com/riak/2.0.0pre20/downloads/\">Download Here</a>"
+  banner_ad_mobile: "<a href=\"http://docs.basho.com/riak/2.0.0pre20/downloads/\">Download the Technical Preview of Riak 2.0</a>"
   alert_version_title_older: "This documentation is for an older version of Riak"
   alert_version_title_unreleased: "This documentation is for an unreleased version of Riak"
   alert_version_link_text: "View the documentation for the latest version"