features-on-develop-branch

Author: Jesse Seldess

_data/sidebar_doc.yml

@@ -310,5 +310,8 @@ entries:
         - title: beta-20160629
           url: /beta-20160629.html
 
-        - title: Older Versions
+        - title: Older Beta Versions
           url: /older-versions.html
+
+        - title: Features on Develop Branch
+          url: /develop-branch.html

_includes/develop.html

@@ -0,0 +1 @@
+{{site.data.alerts.callout_info}}This feature is available only when you <a href="install-cockroachdb.html">build a CockroachDB binary</a> from the code on our <code>develop</code> branch. For a list of other features available only when building from source, see <a href="develop-branch.html">Features on the Develop Branch</a>.{{site.data.alerts.end}}

develop-branch.md

@@ -0,0 +1,11 @@
+---
+title: New Features on Develop Branch
+toc: false
+---
+
+These features are available only when you <a href="install-cockroachdb.html">build a CockroachDB binary</a> from the code on our <code>develop</code> branch. They are not yet included in an official beta release.
+
+Feature | Merge Date
+--------|-----------
+xxx | xxx
+

install-cockroachdb.md

@@ -77,7 +77,7 @@ $(document).ready(function(){
 </div>
 
 <div id="macinstall">
-<p>There are four ways to install CockroachDB on Mac OS X. See <a href="{{site.data.strings.version}}.html">Release Notes</a> for what's new in the latest version.</p>
+<p>There are four ways to install CockroachDB on Mac OS X. See <a href="{{site.data.strings.version}}.html">Release Notes</a> for what's new in the latest version. </p>
 
 <div id="mac-installs" class="clearfix">
 <a href="#download-the-binary" class="install-button mac-button current" data-eventcategory="buttonClick-doc-install" data-eventaction="mac-binary">Download the <div class="c2a">Binary</div></a>
@@ -172,6 +172,7 @@ $(document).ready(function(){
 
 <div id="build-from-source" class="install-option" style="display: none;">
 <h2>Build from Source</h2>
+<div class="bs-callout bs-callout-info">Unlike the other install methods, building from source gets you access to the <a href="develop-branch.html">latest features</a> not yet included in an official beta release.</div>
 <ol>
   <li>
     <p>Install the following prerequisites, as necessary:</p>
@@ -200,9 +201,11 @@ $(document).ready(function(){
   <li>
     <p>Compile the CockroachDB binary:</p>
 
-    <div class="highlighter-rouge"><pre class="highlight"><code data-eventcategory="mac-source-step3"><span class="gp" data-eventcategory="mac-source-step3">$ </span><span class="nb">cd</span> <span class="nv">$GOPATH</span>/src/github.com/cockroachdb/cockroach<br><span class="gp" data-eventcategory="mac-source-step3">$ </span>git checkout {{site.data.strings.version}}<br><span class="gp">$ </span>make install</code></pre></div>
+    <div class="highlighter-rouge"><pre class="highlight"><code data-eventcategory="mac-source-step3"><span class="gp" data-eventcategory="mac-source-step3">$ </span><span class="nb">cd</span> <span class="nv">$GOPATH</span>/src/github.com/cockroachdb/cockroach<br><span class="gp">$ </span>make install</code></pre></div>
 
     <p>The first time you run <code class="highlighter-rouge">make install</code>, it can take awhile to download and install various dependencies.</p>
+
+    <div class="bs-callout bs-callout-success">This step builds a binary that includes features not yet in an official beta release. To build the latest beta version instead, run <code>git checkout {{site.data.strings.version}}</code> before <code>make install</code>.</div>
   </li>
   <li>
     <p>The <code class="highlighter-rouge">make install</code> command puts the binary in <code class="highlighter-rouge"><span class="nv">$GOPATH</span>/bin</code>. Add this directory to your <code class="highlighter-rouge">PATH</code>, if it isn't already there. This makes it easy to execute <a href="cockroach-commands.html">cockroach commands</a> from any shell.</p>
@@ -333,7 +336,7 @@ $(document).ready(function(){
 
 <div id="build-from-source-linux" class="install-option" style="display: none;">
 <h2>Build from Source</h2>
-
+<div class="bs-callout bs-callout-info">Unlike the other install methods, building from source gets you access to the <a href="develop-branch.html">latest features</a> not yet included in an official beta release.</div>
 <ol>
   <li>
     <p>Install the following prerequisites, as necessary:</p>
@@ -362,9 +365,11 @@ $(document).ready(function(){
   <li>
     <p>Compile the CockroachDB binary:</p>
 
-    <div class="highlighter-rouge"><pre class="highlight"><code data-eventcategory="linux-source-step3"><span class="gp" data-eventcategory="linux-source-step3">$ </span><span class="nb" data-eventcategory="linux-source-step3">cd</span> <span class="nv" data-eventcategory="linux-source-step3">$GOPATH</span>/src/github.com/cockroachdb/cockroach<br><span class="gp" data-eventcategory="linux-source-step3">$ </span>git checkout {{site.data.strings.version}}<br><span class="gp">$ </span>make install</code></pre></div>
+    <div class="highlighter-rouge"><pre class="highlight"><code data-eventcategory="linux-source-step3"><span class="gp" data-eventcategory="linux-source-step3">$ </span><span class="nb" data-eventcategory="linux-source-step3">cd</span> <span class="nv" data-eventcategory="linux-source-step3">$GOPATH</span>/src/github.com/cockroachdb/cockroach<br><span class="gp">$ </span>make install</code></pre></div>
 
     <p>The first time you run <code class="highlighter-rouge">make install</code>, it can take awhile to download and install various dependencies.</p>
+
+    <div class="bs-callout bs-callout-success">This step builds a binary that includes features not yet in an official beta release. To build the latest beta version instead, run <code>git checkout {{site.data.strings.version}}</code> before <code>make install</code>.</div>
   </li>
   <li>
     <p>The <code class="highlighter-rouge">make install</code> command puts the binary in <code class="highlighter-rouge"><span class="nv">$GOPATH</span>/bin</code>. Add this directory to your <code class="highlighter-rouge">PATH</code>, if it isn't already there. This makes it easy to execute <a href="cockroach-commands.html">cockroach commands</a> from any shell.</p>