Rebuild the site following merge of PR apache#50

content/beam/capability/2016/04/03/presentation-materials.html

@@ -175,7 +175,7 @@ <h1 class="post-title" itemprop="name headline">Apache Beam Presentation Materia
   </li>
 </ul>
 
-<p>As Apache Beam grows, so will this repository of presentation materials. We are excited to add new materials as the Apache Beam ecosystem grows with new runners, SDKs, and so on. If you are interested in contributing content or have a request, please see the <a href="/learn/presentation-materials/">Apache Beam presentation materials</a> page or email the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#098;&#101;&#097;&#109;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><code class="highlighter-rouge">user@beam.incubator.apache.org</code></a> mailing list with your ideas or questions.</p>
+<p>As Apache Beam grows, so will this repository of presentation materials. We are excited to add new materials as the Apache Beam ecosystem grows with new runners, SDKs, and so on. If you are interested in contributing content or have a request, please see the <a href="/learn/presentation-materials/">Apache Beam presentation materials</a> page or email the <a href="mailto:user@beam.incubator.apache.org"><code class="highlighter-rouge">user@beam.incubator.apache.org</code></a> mailing list with your ideas or questions.</p>
 
   </div>
 

content/contribute/contribution-guide/index.html

@@ -224,7 +224,7 @@ <h1 id="apache-beam-contribution-guide">Apache Beam Contribution Guide</h1>
 <h2 id="engage">Engage</h2>
 
 <h3 id="mailing-lists">Mailing list(s)</h3>
-<p>We discuss design and implementation issues on dev@beam.incubator.apache.org mailing list, which is archived <a href="https://lists.apache.org/list.html?dev@beam.apache.org">here</a>. Join by emailing <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#098;&#101;&#097;&#109;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><code class="highlighter-rouge">dev-subscribe@beam.incubator.apache.org</code></a>.</p>
+<p>We discuss design and implementation issues on dev@beam.incubator.apache.org mailing list, which is archived <a href="https://lists.apache.org/list.html?dev@beam.apache.org">here</a>. Join by emailing <a href="mailto:dev-subscribe@beam.incubator.apache.org"><code class="highlighter-rouge">dev-subscribe@beam.incubator.apache.org</code></a>.</p>
 
 <p>If interested, you can also join the other <a href="http://beam.incubator.apache.org/use/mailing-lists/">mailing lists</a> too.</p>
 
@@ -517,20 +517,11 @@ <h3 id="website">Website</h3>
 
 <p>The Beam website is in the <a href="https://github.com/apache/incubator-beam-site">Beam Site GitHub mirror</a> repository in the <code class="highlighter-rouge">asf-site</code> branch (<em>not</em> <code class="highlighter-rouge">master</code>).</p>
 
-<p>The repository contains:</p>
-
-<ol>
-  <li><code class="highlighter-rouge">_&lt;directory&gt;</code>: the infrastructure for building, testing, and styling the website</li>
-  <li><code class="highlighter-rouge">_posts</code>: blog post entries</li>
-  <li><code class="highlighter-rouge">use/</code>, <code class="highlighter-rouge">learn/</code>, and <code class="highlighter-rouge">contribute/</code>: markdown files containing the bulk of the content</li>
-  <li><code class="highlighter-rouge">content/</code>: html generated from the markdown by jekyll (which is what is actually hosted on the website)</li>
-</ol>
-
 <p>Issues are tracked in the <a href="https://issues.apache.org/jira/browse/BEAM/component/12328906">website</a> component in JIRA.</p>
 
 <h4 id="one-time-setup-2">One-time Setup</h4>
 
-<p>The website uses <a href="http://jekyllrb.com">Jekyll</a>, a ruby-based development framework. The <a href="https://github.com/apache/incubator-beam-site/blob/asf-site/README.md">README file</a> in the website repository has more information on how to set up the required dependencies for your development environment.</p>
+<p>The <a href="https://github.com/apache/incubator-beam-site/blob/asf-site/README.md">README file</a> in the website repository has more information on how to set up the required dependencies for your development environment.</p>
 
 <p>The general guidelines for cloning a repository can be adjusted to use the <code class="highlighter-rouge">asf-site</code> branch of <code class="highlighter-rouge">incubator-beam-site</code>:</p>
 
@@ -546,15 +537,15 @@ <h4 id="working-on-your-change">Working on your change</h4>
 
 <p>While you are working on your pull request, you can test and develop live by running the following command in the root folder of the website:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ jekyll serve
+<div class="highlighter-rouge"><pre class="highlight"><code>$ bundle exec jekyll serve
 </code></pre>
 </div>
 
 <p>Jekyll will start a webserver on port 4000. As you make changes to the content, Jekyll will rebuild it automatically.</p>
 
 <p>In addition, you can run the tests to valid your links using:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ rake test
+<div class="highlighter-rouge"><pre class="highlight"><code>$ bundle exec rake test
 </code></pre>
 </div>
 

content/css/main.css

@@ -26,8 +26,7 @@ body {
  */
 h1, h2, h3, h4, h5, h6,
 p, blockquote, pre,
-ul, ol, dl, figure,
-.highlight {
+ul, ol, dl, figure {
   margin-bottom: 15px; }
 
 /**
@@ -326,8 +325,7 @@ pre {
     color: #998;
     font-style: italic; }
   .highlight .err {
-    color: #a61717;
-    background-color: #e3d2d2; }
+    color: #a61717; }
   .highlight .k {
     font-weight: bold; }
   .highlight .o {