You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/11/21 21:34:28 UTC

svn commit: r1640996 [2/13] - in /storm/site: ./ publish/ publish/2012/08/02/ publish/2012/09/06/ publish/2013/01/11/ publish/2013/12/08/ publish/2014/04/10/ publish/2014/04/17/ publish/2014/04/19/ publish/2014/04/21/ publish/2014/04/22/ publish/2014/0...

Modified: storm/site/publish/2014/05/27/round1-results.html
URL: http://svn.apache.org/viewvc/storm/site/publish/2014/05/27/round1-results.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/2014/05/27/round1-results.html (original)
+++ storm/site/publish/2014/05/27/round1-results.html Fri Nov 21 20:34:26 2014
@@ -45,95 +45,93 @@
 </div>
 </div>
 <div id="content">
-<h1 id="logo-contest---round-1-results">Logo Contest - Round 1 Results</h1>
+<h1 id="toc_0">Logo Contest - Round 1 Results</h1>
 
 <p>Round one of the Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 46 votes from the greater Storm community.</p>
 
 <p>We would like to extend a very special thanks to all those who took the time and effort to create and submit a logo proposal. We would also like to thank everyone who voted.</p>
 
-<h2 id="results">Results</h2>
+<h2 id="toc_1">Results</h2>
+
 <p>The Storm PPMC and community votes were closely aligned, with the community vote resolving a PPMC tie for the 3rd finalist as shown in the result table below.</p>
 
 <p>The three finalists entering the final round are:</p>
 
 <ul>
-  <li><a href="/2014/04/23/logo-abartos.html">No. 6 - Alec Bartos</a></li>
-  <li><a href="/2014/04/29/logo-jlee1.html">No. 9 - Jennifer Lee</a></li>
-  <li><a href="/2014/04/29/logo-jlee2.html">No. 10 - Jennifer Lee</a></li>
+<li><a href="/2014/04/23/logo-abartos.html">No. 6 - Alec Bartos</a></li>
+<li><a href="/2014/04/29/logo-jlee1.html">No. 9 - Jennifer Lee</a></li>
+<li><a href="/2014/04/29/logo-jlee2.html">No. 10 - Jennifer Lee</a></li>
 </ul>
 
 <p>Congratulations Alec and Jennifer!</p>
 
 <p>Stay tuned for the final vote, which will be announced shortly.</p>
 
-<hr />
+<hr>
 
-<table>
-  <thead>
-    <tr>
-      <th style="text-align: left">Entry</th>
-      <th style="text-align: right">PPMC</th>
-      <th style="text-align: right">Community</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td style="text-align: left">1 - Patricia Forrest</td>
-      <td style="text-align: right">2</td>
-      <td style="text-align: right">23</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">2 - Samuel Quiñones</td>
-      <td style="text-align: right">3</td>
-      <td style="text-align: right">6</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">3- Shaan Shiv Suleman</td>
-      <td style="text-align: right">0</td>
-      <td style="text-align: right">7</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">4 - Richard Brownlie-Marshall</td>
-      <td style="text-align: right">0</td>
-      <td style="text-align: right">6</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">5 - Ziba Sayari</td>
-      <td style="text-align: right">0</td>
-      <td style="text-align: right">9</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">6 - Alec Bartos</td>
-      <td style="text-align: right">3</td>
-      <td style="text-align: right">32</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">7 - Calum Boustead</td>
-      <td style="text-align: right">0</td>
-      <td style="text-align: right">0</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">8 - Stefano Asili</td>
-      <td style="text-align: right">0</td>
-      <td style="text-align: right">2</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">9 - Jennifer Lee</td>
-      <td style="text-align: right">9</td>
-      <td style="text-align: right">63</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">10 - Jennifer Lee</td>
-      <td style="text-align: right">18</td>
-      <td style="text-align: right">64</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">11 - Jennifer Lee</td>
-      <td style="text-align: right">0</td>
-      <td style="text-align: right">18</td>
-    </tr>
-  </tbody>
-</table>
+<table><thead>
+<tr>
+<th align="left">Entry</th>
+<th align="right">PPMC</th>
+<th align="right">Community</th>
+</tr>
+</thead><tbody>
+<tr>
+<td align="left">1 - Patricia Forrest</td>
+<td align="right">2</td>
+<td align="right">23</td>
+</tr>
+<tr>
+<td align="left">2 - Samuel Quiñones</td>
+<td align="right">3</td>
+<td align="right">6</td>
+</tr>
+<tr>
+<td align="left">3- Shaan Shiv Suleman</td>
+<td align="right">0</td>
+<td align="right">7</td>
+</tr>
+<tr>
+<td align="left">4 - Richard Brownlie-Marshall</td>
+<td align="right">0</td>
+<td align="right">6</td>
+</tr>
+<tr>
+<td align="left">5 - Ziba Sayari</td>
+<td align="right">0</td>
+<td align="right">9</td>
+</tr>
+<tr>
+<td align="left">6 - Alec Bartos</td>
+<td align="right">3</td>
+<td align="right">32</td>
+</tr>
+<tr>
+<td align="left">7 - Calum Boustead</td>
+<td align="right">0</td>
+<td align="right">0</td>
+</tr>
+<tr>
+<td align="left">8 - Stefano Asili</td>
+<td align="right">0</td>
+<td align="right">2</td>
+</tr>
+<tr>
+<td align="left">9 - Jennifer Lee</td>
+<td align="right">9</td>
+<td align="right">63</td>
+</tr>
+<tr>
+<td align="left">10 - Jennifer Lee</td>
+<td align="right">18</td>
+<td align="right">64</td>
+</tr>
+<tr>
+<td align="left">11 - Jennifer Lee</td>
+<td align="right">0</td>
+<td align="right">18</td>
+</tr>
+</tbody></table>
 
 </div>
 

Modified: storm/site/publish/2014/06/17/contest-results.html
URL: http://svn.apache.org/viewvc/storm/site/publish/2014/06/17/contest-results.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/2014/06/17/contest-results.html (original)
+++ storm/site/publish/2014/06/17/contest-results.html Fri Nov 21 20:34:26 2014
@@ -45,47 +45,45 @@
 </div>
 </div>
 <div id="content">
-<h1 id="storm-logo-contest-results">Storm Logo Contest Results</h1>
+<h1 id="toc_0">Storm Logo Contest Results</h1>
 
 <p>The Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 55 votes from the greater Storm community. Thank you to everyone who participated by voting.</p>
 
-<h2 id="the-winner">The Winner</h2>
+<h2 id="toc_1">The Winner</h2>
+
 <p>Congratulations to Jennifer Lee, whose <a href="/2014/04/29/logo-jlee2.html">3rd entry</a> received the most points from both the PPMC as well as the Storm community. Final vote tallies are listed below.</p>
 
-<p><img src="/images/logocontest/storm_logo_winner.png" alt="Storm Logo" /></p>
+<p><img src="/images/logocontest/storm_logo_winner.png" alt="Storm Logo"></p>
 
 <p>The Apache Storm project management team will now begin the process of finalizing the logo and making it official.</p>
 
 <p>Congratulations Jennifer, and thanks again to everyone who participated!</p>
 
-<hr />
+<hr>
 
-<table>
-  <thead>
-    <tr>
-      <th style="text-align: left">Entry</th>
-      <th style="text-align: right">PPMC</th>
-      <th style="text-align: right">    Community</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td style="text-align: left"><a href="/2014/04/23/logo-abartos.html">6 - Alec Bartos</a></td>
-      <td style="text-align: right">2</td>
-      <td style="text-align: right">41</td>
-    </tr>
-    <tr>
-      <td style="text-align: left"><a href="/2014/04/29/logo-jlee1.html">9 - Jennifer Lee</a></td>
-      <td style="text-align: right">7</td>
-      <td style="text-align: right">111</td>
-    </tr>
-    <tr>
-      <td style="text-align: left"><a href="/2014/04/29/logo-jlee2.html">10 - Jennifer Lee</a></td>
-      <td style="text-align: right">26</td>
-      <td style="text-align: right">123</td>
-    </tr>
-  </tbody>
-</table>
+<table><thead>
+<tr>
+<th align="left">Entry</th>
+<th align="right">PPMC</th>
+<th align="right">&nbsp;&nbsp;&nbsp; Community</th>
+</tr>
+</thead><tbody>
+<tr>
+<td align="left"><a href="/2014/04/23/logo-abartos.html">6 - Alec Bartos</a></td>
+<td align="right">2</td>
+<td align="right">41</td>
+</tr>
+<tr>
+<td align="left"><a href="/2014/04/29/logo-jlee1.html">9 - Jennifer Lee</a></td>
+<td align="right">7</td>
+<td align="right">111</td>
+</tr>
+<tr>
+<td align="left"><a href="/2014/04/29/logo-jlee2.html">10 - Jennifer Lee</a></td>
+<td align="right">26</td>
+<td align="right">123</td>
+</tr>
+</tbody></table>
 
 </div>
 

Modified: storm/site/publish/2014/06/25/storm092-released.html
URL: http://svn.apache.org/viewvc/storm/site/publish/2014/06/25/storm092-released.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/2014/06/25/storm092-released.html (original)
+++ storm/site/publish/2014/06/25/storm092-released.html Fri Nov 21 20:34:26 2014
@@ -45,131 +45,134 @@
 </div>
 </div>
 <div id="content">
-<h1 id="storm-092-released">Storm 0.9.2 released</h1>
+<h1 id="toc_0">Storm 0.9.2 released</h1>
 
 <p class="meta">25 Jun 2014</p>
 
 <p>We are pleased to announce that Storm 0.9.2-incubating has been released and is available from <a href="/downloads.html">the downloads page</a>. This release includes many important fixes and improvements.</p>
 
-<h2 id="netty-transport-improvements">Netty Transport Improvements</h2>
-<p>Storm’s Netty-based transport has been overhauled to significantly improve performance through better utilization of thread, CPU, and network resources, particularly in cases where message sizes are small. Storm contributor Sean Zhong (<a href="https://github.com/clockfly">@clockfly</a>) deserves a great deal of credit not only for discovering, analyzing, documenting and fixing the root cause, but also for persevering through an extended review process and promptly addressing all concerns.</p>
+<h2 id="toc_1">Netty Transport Improvements</h2>
+
+<p>Storm&#39;s Netty-based transport has been overhauled to significantly improve performance through better utilization of thread, CPU, and network resources, particularly in cases where message sizes are small. Storm contributor Sean Zhong (<a href="https://github.com/clockfly">@clockfly</a>) deserves a great deal of credit not only for discovering, analyzing, documenting and fixing the root cause, but also for persevering through an extended review process and promptly addressing all concerns.</p>
 
 <p>Those interested in the technical details and evolution of this patch can find out more in the <a href="https://issues.apache.org/jira/browse/STORM-297">JIRA ticket for STORM-297</a>.</p>
 
-<p>Sean also discovered and fixed an <a href="https://issues.apache.org/jira/browse/STORM-342">elusive bug</a> in Storm’s usage of the Disruptor queue that could lead to out-of-order or lost messages. </p>
+<p>Sean also discovered and fixed an <a href="https://issues.apache.org/jira/browse/STORM-342">elusive bug</a> in Storm&#39;s usage of the Disruptor queue that could lead to out-of-order or lost messages. </p>
 
 <p>Many thanks to Sean for contributing these important fixes.</p>
 
-<h2 id="storm-ui-improvements">Storm UI Improvements</h2>
+<h2 id="toc_2">Storm UI Improvements</h2>
+
 <p>This release also includes a number of improvements to the Storm UI service. Contributor Sriharsha Chintalapani(<a href="https://github.com/harshach">@harshach</a>) added a REST API to the Storm UI service to expose metrics and operations in JSON format, and updated the UI to use that API.</p>
 
 <p>The new REST API will make it considerably easier for other services to consume availabe cluster and topology metrics for monitoring and visualization applications. Kyle Nusbaum (<a href="https://github.com/knusbaum">@knusbaum</a>) has already leveraged the REST API to create a topology visualization tool now included in Storm UI and illustrated in the screenshot below.</p>
 
-<p> </p>
+<p>&nbsp;</p>
 
-<p><img src="/images/ui_topology_viz.png" alt="Storm UI Topology Visualization" /></p>
+<p><img src="/images/ui_topology_viz.png" alt="Storm UI Topology Visualization"></p>
 
-<p> </p>
+<p>&nbsp;</p>
 
 <p>In the visualization, spout components are represented as blue, while bolts are colored between green and red depending on their associated capacity metric. The width of the lines between the components represent the flow of tuples relative to the other visible streams. </p>
 
-<h2 id="kafka-spout">Kafka Spout</h2>
-<p>This is the first Storm release to include official support for consuming data from Kafka 0.8.x. In the past, development of Kafka spouts for Storm had become somewhat fragmented and finding an implementation that worked with certain versions of Storm and Kafka proved burdensome for some developers. This is no longer the case, as the <code>storm-kafka</code> module is now part of the Storm project and associated artifacts are released to official channels (Maven Central) along with Storm’s other components.</p>
+<h2 id="toc_3">Kafka Spout</h2>
 
-<p>Thanks are due to GitHub user <a href="">@wurstmeister</a> for picking up Nathan Marz’ original Kafka 0.7.x implementation, updating it to work with Kafka 0.8.x, and contributing that work back to the Storm community.</p>
+<p>This is the first Storm release to include official support for consuming data from Kafka 0.8.x. In the past, development of Kafka spouts for Storm had become somewhat fragmented and finding an implementation that worked with certain versions of Storm and Kafka proved burdensome for some developers. This is no longer the case, as the <code>storm-kafka</code> module is now part of the Storm project and associated artifacts are released to official channels (Maven Central) along with Storm&#39;s other components.</p>
 
-<p>The <code>storm-kafka</code> module can be found in the <code>/external/</code> directory of the source tree and binary distributions. The <code>external</code> area has been set up to contain projects that while not required by Storm, are often used in conjunction with Storm to integrate with some other technology. Such projects also come with a maintenance committment from at least one Storm committer to ensure compatibility with Storm’s main codebase as it evolves.</p>
+<p>Thanks are due to GitHub user <a href="">@wurstmeister</a> for picking up Nathan Marz&#39; original Kafka 0.7.x implementation, updating it to work with Kafka 0.8.x, and contributing that work back to the Storm community.</p>
 
-<p>The <code>storm-kafka</code> dependency is available now from Maven Central at the following coordinates:</p>
+<p>The <code>storm-kafka</code> module can be found in the <code>/external/</code> directory of the source tree and binary distributions. The <code>external</code> area has been set up to contain projects that while not required by Storm, are often used in conjunction with Storm to integrate with some other technology. Such projects also come with a maintenance committment from at least one Storm committer to ensure compatibility with Storm&#39;s main codebase as it evolves.</p>
 
-<pre><code>groupId: org.apache.storm
+<p>The <code>storm-kafka</code> dependency is available now from Maven Central at the following coordinates:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">groupId: org.apache.storm
 artifactId: storm-kafka
 version: 0.9.2-incubating
-</code></pre>
-
+</code></pre></div>
 <p>Users, and Scala developers in particular, should note that the Kafka dependency is listed as <code>provided</code>. This allows users to choose a specific Scala version as described in the <a href="https://github.com/apache/incubator-storm/tree/v0.9.2-incubating/external/storm-kafka">project README</a>.</p>
 
-<h2 id="storm-starter-and-examples">Storm Starter and Examples</h2>
+<h2 id="toc_4">Storm Starter and Examples</h2>
 
-<p>Similar to the <code>external</code> section of the codebase, we have also added an <code>examples</code> directory and pulled in the <code>storm-starter</code> project to ensure it will be maintained in lock-step with Storm’s main codebase.</p>
+<p>Similar to the <code>external</code> section of the codebase, we have also added an <code>examples</code> directory and pulled in the <code>storm-starter</code> project to ensure it will be maintained in lock-step with Storm&#39;s main codebase.</p>
 
 <p>Thank you to Storm committer Michael G. Noll for his continued work in maintaining and improving the <code>storm-starter</code> project.</p>
 
-<h2 id="plugable-serialization-for-multilang">Plugable Serialization for Multilang</h2>
+<h2 id="toc_5">Plugable Serialization for Multilang</h2>
+
 <p>In previous versions of Storm, serialization of data to and from multilang components was limited to JSON, imposing somewhat of performance penalty. Thanks to a contribution from John Gilmore (<a href="https://github.com/jsgilmore">@jsgilmore</a>) the serialization mechanism is now plugable and enables the use of more performant serialization frameworks like protocol buffers in addition to JSON.</p>
 
-<h2 id="thanks">Thanks</h2>
-<p>Special thanks are due to all those who have contributed to Storm – whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
+<h2 id="toc_6">Thanks</h2>
+
+<p>Special thanks are due to all those who have contributed to Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
 
-<h2 id="changelog">Changelog</h2>
+<h2 id="toc_7">Changelog</h2>
 
 <ul>
-  <li>STORM-352: [storm-kafka] PartitionManager does not save offsets to ZooKeeper</li>
-  <li>STORM-66: send taskid on initial handshake</li>
-  <li>STORM-342: Contention in Disruptor Queue which may cause out of order or lost messages</li>
-  <li>STORM-338: Move towards idiomatic Clojure style </li>
-  <li>STORM-335: add drpc test for removing timed out requests from queue</li>
-  <li>STORM-69: Storm UI Visualizations for Topologies</li>
-  <li>STORM-297: Performance scaling with CPU</li>
-  <li>STORM-244: DRPC timeout can return null instead of throwing an exception</li>
-  <li>STORM-63: remove timeout drpc request from its function’s request queue</li>
-  <li>STORM-313: Remove log-level-page from logviewer</li>
-  <li>STORM-205: Add REST API To Storm UI</li>
-  <li>STORM-326: tasks send duplicate metrics</li>
-  <li>STORM-331: Update the Kafka dependency of storm-kafka to 0.8.1.1</li>
-  <li>STORM-308: Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts</li>
-  <li>STORM-309: storm-starter Readme: windows documentation update</li>
-  <li>STORM-318: update storm-kafka to use apache curator-2.4.0</li>
-  <li>STORM-303: storm-kafka reliability improvements</li>
-  <li>STORM-233: Removed inline heartbeat to nimbus to avoid workers being killed when under heavy ZK load</li>
-  <li>STORM-267: fix package name of LoggingMetricsConsumer in storm.yaml.example</li>
-  <li>STORM-265: upgrade to clojure 1.5.1</li>
-  <li>STORM-232: ship JNI dependencies with the topology jar</li>
-  <li>STORM-295: Add storm configuration to define JAVA_HOME</li>
-  <li>STORM-138: Pluggable serialization for multilang</li>
-  <li>STORM-264: Removes references to the deprecated topology.optimize</li>
-  <li>STORM-245: implement Stream.localOrShuffle() for trident</li>
-  <li>STORM-317: Add SECURITY.md to release binaries</li>
-  <li>STORM-310: Change Twitter authentication</li>
-  <li>STORM-305: Create developer documentation</li>
-  <li>STORM-280: storm unit tests are failing on windows</li>
-  <li>STORM-298: Logback file does not include full path for metrics appender fileNamePattern</li>
-  <li>STORM-316: added validation to registermetrics to have timebucketSizeInSecs &gt;= 1</li>
-  <li>STORM-315: Added progress bar when submitting topology</li>
-  <li>STORM-214: Windows: storm.cmd does not properly handle multiple -c arguments</li>
-  <li>STORM-306: Add security documentation</li>
-  <li>STORM-302: Fix Indentation for pom.xml in storm-dist</li>
-  <li>STORM-235: Registering a null metric should blow up early</li>
-  <li>STORM-113: making thrift usage thread safe for local cluster</li>
-  <li>STORM-223: use safe parsing for reading YAML</li>
-  <li>STORM-238: LICENSE and NOTICE files are duplicated in storm-core jar</li>
-  <li>STORM-276: Add support for logviewer in storm.cmd.</li>
-  <li>STORM-286: Use URLEncoder#encode with the encoding specified.</li>
-  <li>STORM-296: Storm kafka unit tests are failing on windows</li>
-  <li>STORM-291: upgrade http-client to 4.3.3</li>
-  <li>STORM-252: Upgrade curator to latest version</li>
-  <li>STORM-294: Commas not escaped in command line</li>
-  <li>STORM-287: Fix the positioning of documentation strings in clojure code</li>
-  <li>STORM-290: Fix a log binding conflict caused by curator dependencies</li>
-  <li>STORM-289: Fix Trident DRPC memory leak</li>
-  <li>STORM-173: Treat command line “-c” option number config values as such</li>
-  <li>STORM-194: Support list of strings in *.worker.childopts, handle spaces</li>
-  <li>STORM-288: Fixes version spelling in pom.xml</li>
-  <li>STORM-208: Add storm-kafka as an external module</li>
-  <li>STORM-285: Fix storm-core shade plugin config</li>
-  <li>STORM-12: reduce thread usage of netty transport</li>
-  <li>STORM-281: fix and issue with config parsing that could lead to leaking file descriptors</li>
-  <li>STORM-196: When JVM_OPTS are set, storm jar fails to detect storm.jar from environment</li>
-  <li>STORM-260: Fix a potential race condition with simulated time in Storm’s unit tests</li>
-  <li>STORM-258: Update commons-io version to 2.4</li>
-  <li>STORM-270: don’t package .clj files in release jars.</li>
-  <li>STORM-273: Error while running storm topologies on Windows using “storm jar”</li>
-  <li>STROM-247: Replace links to github resources in storm script</li>
-  <li>STORM-263: Update Kryo version to 2.21+</li>
-  <li>STORM-187: Fix Netty error “java.lang.IllegalArgumentException: timeout value is negative”</li>
-  <li>STORM-186: fix float secs to millis long convertion</li>
-  <li>STORM-70: Upgrade to ZK-3.4.5 and curator-1.3.3</li>
-  <li>STORM-146: Unit test regression when storm is compiled with 3.4.5 zookeeper</li>
+<li>STORM-352: [storm-kafka] PartitionManager does not save offsets to ZooKeeper</li>
+<li>STORM-66: send taskid on initial handshake</li>
+<li>STORM-342: Contention in Disruptor Queue which may cause out of order or lost messages</li>
+<li>STORM-338: Move towards idiomatic Clojure style </li>
+<li>STORM-335: add drpc test for removing timed out requests from queue</li>
+<li>STORM-69: Storm UI Visualizations for Topologies</li>
+<li>STORM-297: Performance scaling with CPU</li>
+<li>STORM-244: DRPC timeout can return null instead of throwing an exception</li>
+<li>STORM-63: remove timeout drpc request from its function&#39;s request queue</li>
+<li>STORM-313: Remove log-level-page from logviewer</li>
+<li>STORM-205: Add REST API To Storm UI</li>
+<li>STORM-326: tasks send duplicate metrics</li>
+<li>STORM-331: Update the Kafka dependency of storm-kafka to 0.8.1.1</li>
+<li>STORM-308: Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts</li>
+<li>STORM-309: storm-starter Readme: windows documentation update</li>
+<li>STORM-318: update storm-kafka to use apache curator-2.4.0</li>
+<li>STORM-303: storm-kafka reliability improvements</li>
+<li>STORM-233: Removed inline heartbeat to nimbus to avoid workers being killed when under heavy ZK load</li>
+<li>STORM-267: fix package name of LoggingMetricsConsumer in storm.yaml.example</li>
+<li>STORM-265: upgrade to clojure 1.5.1</li>
+<li>STORM-232: ship JNI dependencies with the topology jar</li>
+<li>STORM-295: Add storm configuration to define JAVA_HOME</li>
+<li>STORM-138: Pluggable serialization for multilang</li>
+<li>STORM-264: Removes references to the deprecated topology.optimize</li>
+<li>STORM-245: implement Stream.localOrShuffle() for trident</li>
+<li>STORM-317: Add SECURITY.md to release binaries</li>
+<li>STORM-310: Change Twitter authentication</li>
+<li>STORM-305: Create developer documentation</li>
+<li>STORM-280: storm unit tests are failing on windows</li>
+<li>STORM-298: Logback file does not include full path for metrics appender fileNamePattern</li>
+<li>STORM-316: added validation to registermetrics to have timebucketSizeInSecs &gt;= 1</li>
+<li>STORM-315: Added progress bar when submitting topology</li>
+<li>STORM-214: Windows: storm.cmd does not properly handle multiple -c arguments</li>
+<li>STORM-306: Add security documentation</li>
+<li>STORM-302: Fix Indentation for pom.xml in storm-dist</li>
+<li>STORM-235: Registering a null metric should blow up early</li>
+<li>STORM-113: making thrift usage thread safe for local cluster</li>
+<li>STORM-223: use safe parsing for reading YAML</li>
+<li>STORM-238: LICENSE and NOTICE files are duplicated in storm-core jar</li>
+<li>STORM-276: Add support for logviewer in storm.cmd.</li>
+<li>STORM-286: Use URLEncoder#encode with the encoding specified.</li>
+<li>STORM-296: Storm kafka unit tests are failing on windows</li>
+<li>STORM-291: upgrade http-client to 4.3.3</li>
+<li>STORM-252: Upgrade curator to latest version</li>
+<li>STORM-294: Commas not escaped in command line</li>
+<li>STORM-287: Fix the positioning of documentation strings in clojure code</li>
+<li>STORM-290: Fix a log binding conflict caused by curator dependencies</li>
+<li>STORM-289: Fix Trident DRPC memory leak</li>
+<li>STORM-173: Treat command line &quot;-c&quot; option number config values as such</li>
+<li>STORM-194: Support list of strings in *.worker.childopts, handle spaces</li>
+<li>STORM-288: Fixes version spelling in pom.xml</li>
+<li>STORM-208: Add storm-kafka as an external module</li>
+<li>STORM-285: Fix storm-core shade plugin config</li>
+<li>STORM-12: reduce thread usage of netty transport</li>
+<li>STORM-281: fix and issue with config parsing that could lead to leaking file descriptors</li>
+<li>STORM-196: When JVM_OPTS are set, storm jar fails to detect storm.jar from environment</li>
+<li>STORM-260: Fix a potential race condition with simulated time in Storm&#39;s unit tests</li>
+<li>STORM-258: Update commons-io version to 2.4</li>
+<li>STORM-270: don&#39;t package .clj files in release jars.</li>
+<li>STORM-273: Error while running storm topologies on Windows using &quot;storm jar&quot;</li>
+<li>STROM-247: Replace links to github resources in storm script</li>
+<li>STORM-263: Update Kryo version to 2.21+</li>
+<li>STORM-187: Fix Netty error &quot;java.lang.IllegalArgumentException: timeout value is negative&quot;</li>
+<li>STORM-186: fix float secs to millis long convertion</li>
+<li>STORM-70: Upgrade to ZK-3.4.5 and curator-1.3.3</li>
+<li>STORM-146: Unit test regression when storm is compiled with 3.4.5 zookeeper</li>
 </ul>
 
 </div>

Modified: storm/site/publish/2014/10/20/storm093-release-candidate.html
URL: http://svn.apache.org/viewvc/storm/site/publish/2014/10/20/storm093-release-candidate.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/2014/10/20/storm093-release-candidate.html (original)
+++ storm/site/publish/2014/10/20/storm093-release-candidate.html Fri Nov 21 20:34:26 2014
@@ -45,7 +45,7 @@
 </div>
 </div>
 <div id="content">
-<h1 id="storm-093-release-candidate-1-available">Storm 0.9.3 release candidate 1 available</h1>
+<h1 id="toc_0">Storm 0.9.3 release candidate 1 available</h1>
 
 <p class="meta">20 Oct 2014</p>
 

Modified: storm/site/publish/about/deployment.html
URL: http://svn.apache.org/viewvc/storm/site/publish/about/deployment.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/about/deployment.html (original)
+++ storm/site/publish/about/deployment.html Fri Nov 21 20:34:26 2014
@@ -67,9 +67,9 @@
   </ul>
 </div>
 <div id="aboutcontent">
-<p>Storm clusters are easy to deploy, requiring a minimum of setup and configuration to get up and running. Storm’s out of the box configurations are suitable for production. Read more about how to deploy a Storm cluster <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.</p>
+<p>Storm clusters are easy to deploy, requiring a minimum of setup and configuration to get up and running. Storm&#39;s out of the box configurations are suitable for production. Read more about how to deploy a Storm cluster <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.</p>
 
-<p>If you’re on EC2, the <a href="https://github.com/nathanmarz/storm-deploy">storm-deploy</a> project can provision, configure, and install a Storm cluster from scratch at just the click of a button.</p>
+<p>If you&#39;re on EC2, the <a href="https://github.com/nathanmarz/storm-deploy">storm-deploy</a> project can provision, configure, and install a Storm cluster from scratch at just the click of a button.</p>
 
 <p>Additionally, Storm is easy to operate once deployed. Storm has been designed to be <a href="/about/fault-tolerant.html">extremely robust</a> – the cluster will just keep on running, month after month.</p>
 

Modified: storm/site/publish/about/fault-tolerant.html
URL: http://svn.apache.org/viewvc/storm/site/publish/about/fault-tolerant.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/about/fault-tolerant.html (original)
+++ storm/site/publish/about/fault-tolerant.html Fri Nov 21 20:34:26 2014
@@ -71,7 +71,7 @@
 
 <p>The Storm daemons, Nimbus and the Supervisors, are designed to be stateless and fail-fast. So if they die, they will restart like nothing happened. This means you can <em>kill -9</em> the Storm daemons without affecting the health of the cluster or your topologies.</p>
 
-<p>Read more about Storm’s fault-tolerance <a href="/documentation/Fault-tolerance.html">on the manual</a>.</p>
+<p>Read more about Storm&#39;s fault-tolerance <a href="/documentation/Fault-tolerance.html">on the manual</a>.</p>
 
 </div>
 </div>

Modified: storm/site/publish/about/free-and-open-source.html
URL: http://svn.apache.org/viewvc/storm/site/publish/about/free-and-open-source.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/about/free-and-open-source.html (original)
+++ storm/site/publish/about/free-and-open-source.html Fri Nov 21 20:34:26 2014
@@ -72,10 +72,10 @@
 <p>Storm has a large and growing ecosystem of libraries and tools to use in conjunction with Storm including everything from:</p>
 
 <ol>
-  <li><em>Spouts</em>: These spouts integrate with queueing systems such as JMS, Kafka, Redis pub/sub, and more.</li>
-  <li><em>storm-state</em>: storm-state makes it easy to manage large amounts of in-memory state in your computations in a reliable by using a distributed filesystem for persistence</li>
-  <li><em>Database integrations</em>: There are helper bolts for integrating with various databases, such as MongoDB, RDBMS’s, Cassandra, and more.</li>
-  <li>Other miscellaneous utilities</li>
+<li><em>Spouts</em>: These spouts integrate with queueing systems such as JMS, Kafka, Redis pub/sub, and more.</li>
+<li><em>storm-state</em>: storm-state makes it easy to manage large amounts of in-memory state in your computations in a reliable by using a distributed filesystem for persistence</li>
+<li><em>Database integrations</em>: There are helper bolts for integrating with various databases, such as MongoDB, RDBMS&#39;s, Cassandra, and more.</li>
+<li>Other miscellaneous utilities</li>
 </ol>
 
 <p>The <a href="/documentation/Home.html">Storm documentation</a> has links to notable Storm-related projects hosted outside of Apache.</p>

Modified: storm/site/publish/about/guarantees-data-processing.html
URL: http://svn.apache.org/viewvc/storm/site/publish/about/guarantees-data-processing.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/about/guarantees-data-processing.html (original)
+++ storm/site/publish/about/guarantees-data-processing.html Fri Nov 21 20:34:26 2014
@@ -67,12 +67,11 @@
   </ul>
 </div>
 <div id="aboutcontent">
-<p>Storm guarantees every tuple will be fully processed. One of Storm’s core mechanisms is the ability to track the lineage of a tuple as it makes its way through the topology in an extremely efficient way. Read more about how this works <a href="/documentation/Guaranteeing-message-processing.html">here</a>.</p>
+<p>Storm guarantees every tuple will be fully processed. One of Storm&#39;s core mechanisms is the ability to track the lineage of a tuple as it makes its way through the topology in an extremely efficient way. Read more about how this works <a href="/documentation/Guaranteeing-message-processing.html">here</a>.</p>
 
-<p>Storm’s basic abstractions provide an at-least-once processing guarantee, the same guarantee you get when using a queueing system. Messages are only replayed when there are failures.</p>
-
-<p>Using <a href="/documentation/Trident-tutorial.html">Trident</a>, a higher level abstraction over Storm’s basic abstractions, you can achieve exactly-once processing semantics.</p>
+<p>Storm&#39;s basic abstractions provide an at-least-once processing guarantee, the same guarantee you get when using a queueing system. Messages are only replayed when there are failures.</p>
 
+<p>Using <a href="/documentation/Trident-tutorial.html">Trident</a>, a higher level abstraction over Storm&#39;s basic abstractions, you can achieve exactly-once processing semantics.</p>
 
 </div>
 </div>

Modified: storm/site/publish/about/integrates.html
URL: http://svn.apache.org/viewvc/storm/site/publish/about/integrates.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/about/integrates.html (original)
+++ storm/site/publish/about/integrates.html Fri Nov 21 20:34:26 2014
@@ -67,14 +67,14 @@
   </ul>
 </div>
 <div id="aboutcontent">
-<p>Storm integrates with any queueing system and any database system. Storm’s <a href="/apidocs/backtype/storm/spout/ISpout.html">spout</a> abstraction makes it easy to integrate a new queuing system. Example queue integrations include:</p>
+<p>Storm integrates with any queueing system and any database system. Storm&#39;s <a href="/apidocs/backtype/storm/spout/ISpout.html">spout</a> abstraction makes it easy to integrate a new queuing system. Example queue integrations include:</p>
 
 <ol>
-  <li><a href="https://github.com/nathanmarz/storm-kestrel">Kestrel</a></li>
-  <li><a href="https://github.com/Xorlev/storm-amqp-spout">RabbitMQ / AMQP</a></li>
-  <li><a href="https://github.com/apache/incubator-storm/tree/master/external/storm-kafka">Kafka</a></li>
-  <li><a href="https://github.com/ptgoetz/storm-jms">JMS</a></li>
-  <li><a href="https://github.com/awslabs/kinesis-storm-spout">Amazon Kinesis</a></li>
+<li><a href="https://github.com/nathanmarz/storm-kestrel">Kestrel</a></li>
+<li><a href="https://github.com/Xorlev/storm-amqp-spout">RabbitMQ / AMQP</a></li>
+<li><a href="https://github.com/apache/incubator-storm/tree/master/external/storm-kafka">Kafka</a></li>
+<li><a href="https://github.com/ptgoetz/storm-jms">JMS</a></li>
+<li><a href="https://github.com/awslabs/kinesis-storm-spout">Amazon Kinesis</a></li>
 </ol>
 
 <p>Likewise, integrating Storm with database systems is easy. Simply open a connection to your database and read/write like you normally would. Storm will handle the parallelization, partitioning, and retrying on failures when necessary.</p>

Modified: storm/site/publish/about/scalable.html
URL: http://svn.apache.org/viewvc/storm/site/publish/about/scalable.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/about/scalable.html (original)
+++ storm/site/publish/about/scalable.html Fri Nov 21 20:34:26 2014
@@ -67,13 +67,13 @@
   </ul>
 </div>
 <div id="aboutcontent">
-<p>Storm topologies are inherently parallel and run across a cluster of machines. Different parts of the topology can be scaled individually by tweaking their parallelism. The “rebalance” command of the “storm” command line client can adjust the parallelism of running topologies on the fly. </p>
+<p>Storm topologies are inherently parallel and run across a cluster of machines. Different parts of the topology can be scaled individually by tweaking their parallelism. The &quot;rebalance&quot; command of the &quot;storm&quot; command line client can adjust the parallelism of running topologies on the fly. </p>
 
-<p>Storm’s inherent parallelism means it can process very high throughputs of messages with very low latency. Storm was benchmarked at processing <strong>one million 100 byte messages per second per node</strong> on hardware with the following specs:</p>
+<p>Storm&#39;s inherent parallelism means it can process very high throughputs of messages with very low latency. Storm was benchmarked at processing <strong>one million 100 byte messages per second per node</strong> on hardware with the following specs:</p>
 
 <ul>
-  <li><strong>Processor:</strong> 2x Intel E5645@2.4Ghz </li>
-  <li><strong>Memory:</strong> 24 GB</li>
+<li><strong>Processor:</strong> 2x Intel <a href="mailto:E5645@2.4Ghz">E5645@2.4Ghz</a> </li>
+<li><strong>Memory:</strong> 24 GB</li>
 </ul>
 
 </div>

Modified: storm/site/publish/about/simple-api.html
URL: http://svn.apache.org/viewvc/storm/site/publish/about/simple-api.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/about/simple-api.html (original)
+++ storm/site/publish/about/simple-api.html Fri Nov 21 20:34:26 2014
@@ -67,7 +67,7 @@
   </ul>
 </div>
 <div id="aboutcontent">
-<p>Storm has a simple and easy to use API. When programming on Storm, you manipulate and transform streams of tuples, and a tuple is a named list of values. Tuples can contain objects of any type; if you want to use a type Storm doesn’t know about it’s <a href="/documentation/Serialization.html">very easy</a> to register a serializer for that type.</p>
+<p>Storm has a simple and easy to use API. When programming on Storm, you manipulate and transform streams of tuples, and a tuple is a named list of values. Tuples can contain objects of any type; if you want to use a type Storm doesn&#39;t know about it&#39;s <a href="/documentation/Serialization.html">very easy</a> to register a serializer for that type.</p>
 
 <p>There are just three abstractions in Storm: spouts, bolts, and topologies. A <strong>spout</strong> is a source of streams in a computation. Typically a spout reads from a queueing broker such as Kestrel, RabbitMQ, or Kafka, but a spout can also generate its own stream or read from somewhere like the Twitter streaming API. Spout implementations already exist for most queueing systems.</p>
 
@@ -75,7 +75,7 @@
 
 <p>A <strong>topology</strong> is a network of spouts and bolts, with each edge in the network representing a bolt subscribing to the output stream of some other spout or bolt. A topology is an arbitrarily complex multi-stage stream computation. Topologies run indefinitely when deployed.</p>
 
-<p>Storm has a “local mode” where a Storm cluster is simulated in-process. This is useful for development and testing. The “storm” command line client is used when ready to submit a topology for execution on an actual cluster.</p>
+<p>Storm has a &quot;local mode&quot; where a Storm cluster is simulated in-process. This is useful for development and testing. The &quot;storm&quot; command line client is used when ready to submit a topology for execution on an actual cluster.</p>
 
 <p>The <a href="https://github.com/apache/incubator-storm/tree/master/examples/storm-starter">storm-starter</a> project contains example topologies for learning the basics of Storm. Learn more about how to use Storm by reading the <a href="/documentation/Tutorial.html">tutorial</a> and the <a href="/documentation/Home.html">documentation</a>.</p>
 

Modified: storm/site/publish/documentation/Acking-framework-implementation.html
URL: http://svn.apache.org/viewvc/storm/site/publish/documentation/Acking-framework-implementation.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/documentation/Acking-framework-implementation.html (original)
+++ storm/site/publish/documentation/Acking-framework-implementation.html Fri Nov 21 20:34:26 2014
@@ -65,44 +65,43 @@
   </ul>
 </div>
 <div id="aboutcontent">
-<p><a href="https://github.com/apache/incubator-storm/blob/46c3ba7/storm-core/src/clj/backtype/storm/daemon/acker.clj#L28">Storm’s acker</a> tracks completion of each tupletree with a checksum hash: each time a tuple is sent, its value is XORed into the checksum, and each time a tuple is acked its value is XORed in again. If all tuples have been successfully acked, the checksum will be zero (the odds that the checksum will be zero otherwise are vanishingly small).</p>
+<p><a href="https://github.com/apache/incubator-storm/blob/46c3ba7/storm-core/src/clj/backtype/storm/daemon/acker.clj#L28">Storm&#39;s acker</a> tracks completion of each tupletree with a checksum hash: each time a tuple is sent, its value is XORed into the checksum, and each time a tuple is acked its value is XORed in again. If all tuples have been successfully acked, the checksum will be zero (the odds that the checksum will be zero otherwise are vanishingly small).</p>
 
-<p>You can read a bit more about the <a href="Guaranteeing-message-processing.html#what-is-storms-reliability-api">reliability mechanism</a> elsewhere on the wiki – this explains the internal details.</p>
+<p>You can read a bit more about the <a href="Guaranteeing-message-processing.html#what-is-storms-reliability-api">reliability mechanism</a> elsewhere on the wiki -- this explains the internal details.</p>
 
-<h3 id="acker-execute">acker <code>execute()</code></h3>
+<h3 id="toc_0">acker <code>execute()</code></h3>
 
-<p>The acker is actually a regular bolt, with its  <a href="https://github.com/apache/incubator-storm/blob/46c3ba7/storm-core/src/clj/backtype/storm/daemon/acker.clj#L36">execute method</a> defined withing <code>mk-acker-bolt</code>.  When a new tupletree is born, the spout sends the XORed edge-ids of each tuple recipient, which the acker records in its <code>pending</code> ledger. Every time an executor acks a tuple, the acker receives a partial checksum that is the XOR of the tuple’s own edge-id (clearing it from the ledger) and the edge-id of each downstream tuple the executor emitted (thus entering them into the ledger).</p>
+<p>The acker is actually a regular bolt, with its  <a href="https://github.com/apache/incubator-storm/blob/46c3ba7/storm-core/src/clj/backtype/storm/daemon/acker.clj#L36">execute method</a> defined withing <code>mk-acker-bolt</code>.  When a new tupletree is born, the spout sends the XORed edge-ids of each tuple recipient, which the acker records in its <code>pending</code> ledger. Every time an executor acks a tuple, the acker receives a partial checksum that is the XOR of the tuple&#39;s own edge-id (clearing it from the ledger) and the edge-id of each downstream tuple the executor emitted (thus entering them into the ledger).</p>
 
 <p>This is accomplished as follows.</p>
 
 <p>On a tick tuple, just advance pending tupletree checksums towards death and return. Otherwise, update or create the record for this tupletree:</p>
 
 <ul>
-  <li>on init: initialize with the given checksum value, and record the spout’s id for later.</li>
-  <li>on ack:  xor the partial checksum into the existing checksum value</li>
-  <li>on fail: just mark it as failed</li>
+<li>on init: initialize with the given checksum value, and record the spout&#39;s id for later.</li>
+<li>on ack:  xor the partial checksum into the existing checksum value</li>
+<li>on fail: just mark it as failed</li>
 </ul>
 
 <p>Next, <a href="https://github.com/apache/incubator-storm/blob/46c3ba7/storm-core/src/clj/backtype/storm/daemon/acker.clj#L50">put the record</a>),  into the RotatingMap (thus resetting is countdown to expiry) and take action:</p>
 
 <ul>
-  <li>if the total checksum is zero, the tupletree is complete: remove it from the pending collection and notify the spout of success</li>
-  <li>if the tupletree has failed, it is also complete:   remove it from the pending collection and notify the spout of failure</li>
+<li>if the total checksum is zero, the tupletree is complete: remove it from the pending collection and notify the spout of success</li>
+<li>if the tupletree has failed, it is also complete:   remove it from the pending collection and notify the spout of failure</li>
 </ul>
 
 <p>Finally, pass on an ack of our own.</p>
 
-<h3 id="pending-tuples-and-the-rotatingmap">Pending tuples and the <code>RotatingMap</code></h3>
+<h3 id="toc_1">Pending tuples and the <code>RotatingMap</code></h3>
 
 <p>The acker stores pending tuples in a <a href="https://github.com/apache/incubator-storm/blob/master/storm-core/src/jvm/backtype/storm/utils/RotatingMap.java#L19"><code>RotatingMap</code></a>, a simple device used in several places within Storm to efficiently time-expire a process.</p>
 
 <p>The RotatingMap behaves as a HashMap, and offers the same O(1) access guarantees.</p>
 
-<p>Internally, it holds several HashMaps (‘buckets’) of its own, each holding a cohort of records that will expire at the same time.  Let’s call the longest-lived bucket death row, and the most recent the nursery. Whenever a value is <code>.put()</code> to the RotatingMap, it is relocated to the nursery – and removed from any other bucket it might have been in (effectively resetting its death clock).</p>
+<p>Internally, it holds several HashMaps (&#39;buckets&#39;) of its own, each holding a cohort of records that will expire at the same time.  Let&#39;s call the longest-lived bucket death row, and the most recent the nursery. Whenever a value is <code>.put()</code> to the RotatingMap, it is relocated to the nursery -- and removed from any other bucket it might have been in (effectively resetting its death clock).</p>
 
 <p>Whenever its owner calls <code>.rotate()</code>, the RotatingMap advances each cohort one step further towards expiration. (Typically, Storm objects call rotate on every receipt of a system tick stream tuple.) If there are any key-value pairs in the former death row bucket, the RotatingMap invokes a callback (given in the constructor) for each key-value pair, letting its owner take appropriate action (eg, failing a tuple.</p>
 
-
 </div>
 </div>
 <div id="clear"></div></div>

Modified: storm/site/publish/documentation/Clojure-DSL.html
URL: http://svn.apache.org/viewvc/storm/site/publish/documentation/Clojure-DSL.html?rev=1640996&r1=1640995&r2=1640996&view=diff
==============================================================================
--- storm/site/publish/documentation/Clojure-DSL.html (original)
+++ storm/site/publish/documentation/Clojure-DSL.html Fri Nov 21 20:34:26 2014
@@ -65,163 +65,139 @@
   </ul>
 </div>
 <div id="aboutcontent">
-<p>Storm comes with a Clojure DSL for defining spouts, bolts, and topologies. The Clojure DSL has access to everything the Java API exposes, so if you’re a Clojure user you can code Storm topologies without touching Java at all. The Clojure DSL is defined in the source in the <a href="https://github.com/apache/incubator-storm/blob/0.5.3/src/clj/backtype/storm/clojure.clj">backtype.storm.clojure</a> namespace.</p>
+<p>Storm comes with a Clojure DSL for defining spouts, bolts, and topologies. The Clojure DSL has access to everything the Java API exposes, so if you&#39;re a Clojure user you can code Storm topologies without touching Java at all. The Clojure DSL is defined in the source in the <a href="https://github.com/apache/incubator-storm/blob/0.5.3/src/clj/backtype/storm/clojure.clj">backtype.storm.clojure</a> namespace.</p>
 
 <p>This page outlines all the pieces of the Clojure DSL, including:</p>
 
 <ol>
-  <li>Defining topologies</li>
-  <li><code>defbolt</code></li>
-  <li><code>defspout</code></li>
-  <li>Running topologies in local mode or on a cluster</li>
-  <li>Testing topologies</li>
+<li>Defining topologies</li>
+<li><code>defbolt</code></li>
+<li><code>defspout</code></li>
+<li>Running topologies in local mode or on a cluster</li>
+<li>Testing topologies</li>
 </ol>
 
-<h3 id="defining-topologies">Defining topologies</h3>
+<h3 id="toc_0">Defining topologies</h3>
 
-<p>To define a topology, use the <code>topology</code> function. <code>topology</code> takes in two arguments: a map of “spout specs” and a map of “bolt specs”. Each spout and bolt spec wires the code for the component into the topology by specifying things like inputs and parallelism.</p>
-
-<p>Let’s take a look at an example topology definition <a href="https://github.com/nathanmarz/storm-starter/blob/master/src/clj/storm/starter/clj/word_count.clj">from the storm-starter project</a>:</p>
-
-<p><code>clojure
-(topology
- {"1" (spout-spec sentence-spout)
-  "2" (spout-spec (sentence-spout-parameterized
-                   ["the cat jumped over the door"
-                    "greetings from a faraway land"])
-                   :p 2)}
- {"3" (bolt-spec {"1" :shuffle "2" :shuffle}
-                 split-sentence
-                 :p 5)
-  "4" (bolt-spec {"3" ["word"]}
-                 word-count
-                 :p 6)})
-</code></p>
+<p>To define a topology, use the <code>topology</code> function. <code>topology</code> takes in two arguments: a map of &quot;spout specs&quot; and a map of &quot;bolt specs&quot;. Each spout and bolt spec wires the code for the component into the topology by specifying things like inputs and parallelism.</p>
 
+<p>Let&#39;s take a look at an example topology definition <a href="https://github.com/nathanmarz/storm-starter/blob/master/src/clj/storm/starter/clj/word_count.clj">from the storm-starter project</a>:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">topology</span>
+ <span class="p">{</span><span class="s">&quot;1&quot;</span> <span class="p">(</span><span class="nf">spout-spec</span> <span class="nv">sentence-spout</span><span class="p">)</span>
+  <span class="s">&quot;2&quot;</span> <span class="p">(</span><span class="nf">spout-spec</span> <span class="p">(</span><span class="nf">sentence-spout-parameterized</span>
+                   <span class="p">[</span><span class="s">&quot;the cat jumped over the door&quot;</span>
+                    <span class="s">&quot;greetings from a faraway land&quot;</span><span class="p">])</span>
+                   <span class="ss">:p</span> <span class="mi">2</span><span class="p">)}</span>
+ <span class="p">{</span><span class="s">&quot;3&quot;</span> <span class="p">(</span><span class="nf">bolt-spec</span> <span class="p">{</span><span class="s">&quot;1&quot;</span> <span class="ss">:shuffle</span> <span class="s">&quot;2&quot;</span> <span class="ss">:shuffle</span><span class="p">}</span>
+                 <span class="nv">split-sentence</span>
+                 <span class="ss">:p</span> <span class="mi">5</span><span class="p">)</span>
+  <span class="s">&quot;4&quot;</span> <span class="p">(</span><span class="nf">bolt-spec</span> <span class="p">{</span><span class="s">&quot;3&quot;</span> <span class="p">[</span><span class="s">&quot;word&quot;</span><span class="p">]}</span>
+                 <span class="nv">word-count</span>
+                 <span class="ss">:p</span> <span class="mi">6</span><span class="p">)})</span>
+</code></pre></div>
 <p>The maps of spout and bolt specs are maps from the component id to the corresponding spec. The component ids must be unique across the maps. Just like defining topologies in Java, component ids are used when declaring inputs for bolts in the topology.</p>
 
-<h4 id="spout-spec">spout-spec</h4>
+<h4 id="toc_1">spout-spec</h4>
 
 <p><code>spout-spec</code> takes as arguments the spout implementation (an object that implements <a href="/apidocs/backtype/storm/topology/IRichSpout.html">IRichSpout</a>) and optional keyword arguments. The only option that exists currently is the <code>:p</code> option, which specifies the parallelism for the spout. If you omit <code>:p</code>, the spout will execute as a single task.</p>
 
-<h4 id="bolt-spec">bolt-spec</h4>
+<h4 id="toc_2">bolt-spec</h4>
 
 <p><code>bolt-spec</code> takes as arguments the input declaration for the bolt, the bolt implementation (an object that implements <a href="/apidocs/backtype/storm/topology/IRichBolt.html">IRichBolt</a>), and optional keyword arguments.</p>
 
 <p>The input declaration is a map from stream ids to stream groupings. A stream id can have one of two forms:</p>
 
 <ol>
-  <li><code>[==component id== ==stream id==]</code>: Subscribes to a specific stream on a component</li>
-  <li><code>==component id==</code>: Subscribes to the default stream on a component</li>
+<li><code>[==component id== ==stream id==]</code>: Subscribes to a specific stream on a component</li>
+<li><code>==component id==</code>: Subscribes to the default stream on a component</li>
 </ol>
 
 <p>A stream grouping can be one of the following:</p>
 
 <ol>
-  <li><code>:shuffle</code>: subscribes with a shuffle grouping</li>
-  <li>Vector of field names, like <code>["id" "name"]</code>: subscribes with a fields grouping on the specified fields</li>
-  <li><code>:global</code>: subscribes with a global grouping</li>
-  <li><code>:all</code>: subscribes with an all grouping</li>
-  <li><code>:direct</code>: subscribes with a direct grouping</li>
+<li><code>:shuffle</code>: subscribes with a shuffle grouping</li>
+<li>Vector of field names, like <code>[&quot;id&quot; &quot;name&quot;]</code>: subscribes with a fields grouping on the specified fields</li>
+<li><code>:global</code>: subscribes with a global grouping</li>
+<li><code>:all</code>: subscribes with an all grouping</li>
+<li><code>:direct</code>: subscribes with a direct grouping</li>
 </ol>
 
-<p>See <a href="Concepts.html">Concepts</a> for more info on stream groupings. Here’s an example input declaration showcasing the various ways to declare inputs:</p>
-
-<p><code>clojure
-{["2" "1"] :shuffle
- "3" ["field1" "field2"]
- ["4" "2"] :global}
-</code></p>
-
-<p>This input declaration subscribes to three streams total. It subscribes to stream “1” on component “2” with a shuffle grouping, subscribes to the default stream on component “3” with a fields grouping on the fields “field1” and “field2”, and subscribes to stream “2” on component “4” with a global grouping.</p>
+<p>See <a href="Concepts.html">Concepts</a> for more info on stream groupings. Here&#39;s an example input declaration showcasing the various ways to declare inputs:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">{[</span><span class="s">&quot;2&quot;</span> <span class="s">&quot;1&quot;</span><span class="p">]</span> <span class="ss">:shuffle</span>
+ <span class="s">&quot;3&quot;</span> <span class="p">[</span><span class="s">&quot;field1&quot;</span> <span class="s">&quot;field2&quot;</span><span class="p">]</span>
+ <span class="p">[</span><span class="s">&quot;4&quot;</span> <span class="s">&quot;2&quot;</span><span class="p">]</span> <span class="ss">:global</span><span class="p">}</span>
+</code></pre></div>
+<p>This input declaration subscribes to three streams total. It subscribes to stream &quot;1&quot; on component &quot;2&quot; with a shuffle grouping, subscribes to the default stream on component &quot;3&quot; with a fields grouping on the fields &quot;field1&quot; and &quot;field2&quot;, and subscribes to stream &quot;2&quot; on component &quot;4&quot; with a global grouping.</p>
 
 <p>Like <code>spout-spec</code>, the only current supported keyword argument for <code>bolt-spec</code> is <code>:p</code> which specifies the parallelism for the bolt.</p>
 
-<h4 id="shell-bolt-spec">shell-bolt-spec</h4>
+<h4 id="toc_3">shell-bolt-spec</h4>
 
 <p><code>shell-bolt-spec</code> is used for defining bolts that are implemented in a non-JVM language. It takes as arguments the input declaration, the command line program to run, the name of the file implementing the bolt, an output specification, and then the same keyword arguments that <code>bolt-spec</code> accepts.</p>
 
-<p>Here’s an example <code>shell-bolt-spec</code>:</p>
-
-<p><code>clojure
-(shell-bolt-spec {"1" :shuffle "2" ["id"]}
-                 "python"
-                 "mybolt.py"
-                 ["outfield1" "outfield2"]
-                 :p 25)
-</code></p>
-
+<p>Here&#39;s an example <code>shell-bolt-spec</code>:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">shell-bolt-spec</span> <span class="p">{</span><span class="s">&quot;1&quot;</span> <span class="ss">:shuffle</span> <span class="s">&quot;2&quot;</span> <span class="p">[</span><span class="s">&quot;id&quot;</span><span class="p">]}</span>
+                 <span class="s">&quot;python&quot;</span>
+                 <span class="s">&quot;mybolt.py&quot;</span>
+                 <span class="p">[</span><span class="s">&quot;outfield1&quot;</span> <span class="s">&quot;outfield2&quot;</span><span class="p">]</span>
+                 <span class="ss">:p</span> <span class="mi">25</span><span class="p">)</span>
+</code></pre></div>
 <p>The syntax of output declarations is described in more detail in the <code>defbolt</code> section below. See <a href="Using-non-JVM-languages-with-Storm.html">Using non JVM languages with Storm</a> for more details on how multilang works within Storm.</p>
 
-<h3 id="defbolt">defbolt</h3>
+<h3 id="toc_4">defbolt</h3>
 
-<p><code>defbolt</code> is used for defining bolts in Clojure. Bolts have the constraint that they must be serializable, and this is why you can’t just reify <code>IRichBolt</code> to implement a bolt (closures aren’t serializable). <code>defbolt</code> works around this restriction and provides a nicer syntax for defining bolts than just implementing a Java interface.</p>
+<p><code>defbolt</code> is used for defining bolts in Clojure. Bolts have the constraint that they must be serializable, and this is why you can&#39;t just reify <code>IRichBolt</code> to implement a bolt (closures aren&#39;t serializable). <code>defbolt</code> works around this restriction and provides a nicer syntax for defining bolts than just implementing a Java interface.</p>
 
-<p>At its fullest expressiveness, <code>defbolt</code> supports parameterized bolts and maintaining state in a closure around the bolt implementation. It also provides shortcuts for defining bolts that don’t need this extra functionality. The signature for <code>defbolt</code> looks like the following:</p>
+<p>At its fullest expressiveness, <code>defbolt</code> supports parameterized bolts and maintaining state in a closure around the bolt implementation. It also provides shortcuts for defining bolts that don&#39;t need this extra functionality. The signature for <code>defbolt</code> looks like the following:</p>
 
-<p>(defbolt <em>name</em> <em>output-declaration</em> *<em>option-map</em> &amp; <em>impl</em>)</p>
+<p>(defbolt <em>name</em> <em>output-declaration</em> *_option-map_ &amp; <em>impl</em>)</p>
 
 <p>Omitting the option map is equivalent to having an option map of <code>{:prepare false}</code>.</p>
 
-<h4 id="simple-bolts">Simple bolts</h4>
-
-<p>Let’s start with the simplest form of <code>defbolt</code>. Here’s an example bolt that splits a tuple containing a sentence into a tuple for each word:</p>
+<h4 id="toc_5">Simple bolts</h4>
 
-<p><code>clojure
-(defbolt split-sentence ["word"] [tuple collector]
-  (let [words (.split (.getString tuple 0) " ")]
-    (doseq [w words]
-      (emit-bolt! collector [w] :anchor tuple))
-    (ack! collector tuple)
-    ))
-</code></p>
-
-<p>Since the option map is omitted, this is a non-prepared bolt. The DSL simply expects an implementation for the <code>execute</code> method of <code>IRichBolt</code>. The implementation takes two parameters, the tuple and the <code>OutputCollector</code>, and is followed by the body of the <code>execute</code> function. The DSL automatically type-hints the parameters for you so you don’t need to worry about reflection if you use Java interop.</p>
+<p>Let&#39;s start with the simplest form of <code>defbolt</code>. Here&#39;s an example bolt that splits a tuple containing a sentence into a tuple for each word:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">defbolt</span> <span class="nv">split-sentence</span> <span class="p">[</span><span class="s">&quot;word&quot;</span><span class="p">]</span> <span class="p">[</span><span class="nv">tuple</span> <span class="nv">collector</span><span class="p">]</span>
+  <span class="p">(</span><span class="k">let </span><span class="p">[</span><span class="nv">words</span> <span class="p">(</span><span class="nf">.split</span> <span class="p">(</span><span class="nf">.getString</span> <span class="nv">tuple</span> <span class="mi">0</span><span class="p">)</span> <span class="s">&quot; &quot;</span><span class="p">)]</span>
+    <span class="p">(</span><span class="nb">doseq </span><span class="p">[</span><span class="nv">w</span> <span class="nv">words</span><span class="p">]</span>
+      <span class="p">(</span><span class="nf">emit-bolt!</span> <span class="nv">collector</span> <span class="p">[</span><span class="nv">w</span><span class="p">]</span> <span class="ss">:anchor</span> <span class="nv">tuple</span><span class="p">))</span>
+    <span class="p">(</span><span class="nf">ack!</span> <span class="nv">collector</span> <span class="nv">tuple</span><span class="p">)</span>
+    <span class="p">))</span>
+</code></pre></div>
+<p>Since the option map is omitted, this is a non-prepared bolt. The DSL simply expects an implementation for the <code>execute</code> method of <code>IRichBolt</code>. The implementation takes two parameters, the tuple and the <code>OutputCollector</code>, and is followed by the body of the <code>execute</code> function. The DSL automatically type-hints the parameters for you so you don&#39;t need to worry about reflection if you use Java interop.</p>
 
 <p>This implementation binds <code>split-sentence</code> to an actual <code>IRichBolt</code> object that you can use in topologies, like so:</p>
-
-<p><code>clojure
-(bolt-spec {"1" :shuffle}
-           split-sentence
-           :p 5)
-</code></p>
-
-<h4 id="parameterized-bolts">Parameterized bolts</h4>
-
-<p>Many times you want to parameterize your bolts with other arguments. For example, let’s say you wanted to have a bolt that appends a suffix to every input string it receives, and you want that suffix to be set at runtime. You do this with <code>defbolt</code> by including a <code>:params</code> option in the option map, like so:</p>
-
-<p><code>clojure
-(defbolt suffix-appender ["word"] {:params [suffix]}
-  [tuple collector]
-  (emit-bolt! collector [(str (.getString tuple 0) suffix)] :anchor tuple)
-  )
-</code></p>
-
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">bolt-spec</span> <span class="p">{</span><span class="s">&quot;1&quot;</span> <span class="ss">:shuffle</span><span class="p">}</span>
+           <span class="nv">split-sentence</span>
+           <span class="ss">:p</span> <span class="mi">5</span><span class="p">)</span>
+</code></pre></div>
+<h4 id="toc_6">Parameterized bolts</h4>
+
+<p>Many times you want to parameterize your bolts with other arguments. For example, let&#39;s say you wanted to have a bolt that appends a suffix to every input string it receives, and you want that suffix to be set at runtime. You do this with <code>defbolt</code> by including a <code>:params</code> option in the option map, like so:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">defbolt</span> <span class="nv">suffix-appender</span> <span class="p">[</span><span class="s">&quot;word&quot;</span><span class="p">]</span> <span class="p">{</span><span class="ss">:params</span> <span class="p">[</span><span class="nv">suffix</span><span class="p">]}</span>
+  <span class="p">[</span><span class="nv">tuple</span> <span class="nv">collector</span><span class="p">]</span>
+  <span class="p">(</span><span class="nf">emit-bolt!</span> <span class="nv">collector</span> <span class="p">[(</span><span class="nb">str </span><span class="p">(</span><span class="nf">.getString</span> <span class="nv">tuple</span> <span class="mi">0</span><span class="p">)</span> <span class="nv">suffix</span><span class="p">)]</span> <span class="ss">:anchor</span> <span class="nv">tuple</span><span class="p">)</span>
+  <span class="p">)</span>
+</code></pre></div>
 <p>Unlike the previous example, <code>suffix-appender</code> will be bound to a function that returns an <code>IRichBolt</code> rather than be an <code>IRichBolt</code> object directly. This is caused by specifying <code>:params</code> in its option map. So to use <code>suffix-appender</code> in a topology, you would do something like:</p>
-
-<p><code>clojure
-(bolt-spec {"1" :shuffle}
-           (suffix-appender "-suffix")
-           :p 10)
-</code></p>
-
-<h4 id="prepared-bolts">Prepared bolts</h4>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">bolt-spec</span> <span class="p">{</span><span class="s">&quot;1&quot;</span> <span class="ss">:shuffle</span><span class="p">}</span>
+           <span class="p">(</span><span class="nf">suffix-appender</span> <span class="s">&quot;-suffix&quot;</span><span class="p">)</span>
+           <span class="ss">:p</span> <span class="mi">10</span><span class="p">)</span>
+</code></pre></div>
+<h4 id="toc_7">Prepared bolts</h4>
 
 <p>To do more complex bolts, such as ones that do joins and streaming aggregations, the bolt needs to store state. You can do this by creating a prepared bolt which is specified by including <code>{:prepare true}</code> in the option map. Consider, for example, this bolt that implements word counting:</p>
-
-<p><code>clojure
-(defbolt word-count ["word" "count"] {:prepare true}
-  [conf context collector]
-  (let [counts (atom {})]
-    (bolt
-     (execute [tuple]
-       (let [word (.getString tuple 0)]
-         (swap! counts (partial merge-with +) {word 1})
-         (emit-bolt! collector [word (@counts word)] :anchor tuple)
-         (ack! collector tuple)
-         )))))
-</code></p>
-
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">defbolt</span> <span class="nv">word-count</span> <span class="p">[</span><span class="s">&quot;word&quot;</span> <span class="s">&quot;count&quot;</span><span class="p">]</span> <span class="p">{</span><span class="ss">:prepare</span> <span class="nv">true</span><span class="p">}</span>
+  <span class="p">[</span><span class="nv">conf</span> <span class="nv">context</span> <span class="nv">collector</span><span class="p">]</span>
+  <span class="p">(</span><span class="k">let </span><span class="p">[</span><span class="nv">counts</span> <span class="p">(</span><span class="nf">atom</span> <span class="p">{})]</span>
+    <span class="p">(</span><span class="nf">bolt</span>
+     <span class="p">(</span><span class="nf">execute</span> <span class="p">[</span><span class="nv">tuple</span><span class="p">]</span>
+       <span class="p">(</span><span class="k">let </span><span class="p">[</span><span class="nv">word</span> <span class="p">(</span><span class="nf">.getString</span> <span class="nv">tuple</span> <span class="mi">0</span><span class="p">)]</span>
+         <span class="p">(</span><span class="nf">swap!</span> <span class="nv">counts</span> <span class="p">(</span><span class="nb">partial merge-with </span><span class="nv">+</span><span class="p">)</span> <span class="p">{</span><span class="nv">word</span> <span class="mi">1</span><span class="p">})</span>
+         <span class="p">(</span><span class="nf">emit-bolt!</span> <span class="nv">collector</span> <span class="p">[</span><span class="nv">word</span> <span class="p">(</span><span class="o">@</span><span class="nv">counts</span> <span class="nv">word</span><span class="p">)]</span> <span class="ss">:anchor</span> <span class="nv">tuple</span><span class="p">)</span>
+         <span class="p">(</span><span class="nf">ack!</span> <span class="nv">collector</span> <span class="nv">tuple</span><span class="p">)</span>
+         <span class="p">)))))</span>
+</code></pre></div>
 <p>The implementation for a prepared bolt is a function that takes as input the topology config, <code>TopologyContext</code>, and <code>OutputCollector</code>, and returns an implementation of the <code>IBolt</code> interface. This design allows you to have a closure around the implementation of <code>execute</code> and <code>cleanup</code>. </p>
 
 <p>In this example, the word counts are stored in the closure in a map called <code>counts</code>. The <code>bolt</code> macro is used to create the <code>IBolt</code> implementation. The <code>bolt</code> macro is a more concise way to implement the interface than reifying, and it automatically type-hints all of the method parameters. This bolt implements the execute method which updates the count in the map and emits the new word count.</p>
@@ -230,109 +206,92 @@
 
 <p>Prepared bolts can be parameterized just like simple bolts.</p>
 
-<h4 id="output-declarations">Output declarations</h4>
+<h4 id="toc_8">Output declarations</h4>
 
 <p>The Clojure DSL has a concise syntax for declaring the outputs of a bolt. The most general way to declare the outputs is as a map from stream id a stream spec. For example:</p>
-
-<p><code>clojure
-{"1" ["field1" "field2"]
- "2" (direct-stream ["f1" "f2" "f3"])
- "3" ["f1"]}
-</code></p>
-
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">{</span><span class="s">&quot;1&quot;</span> <span class="p">[</span><span class="s">&quot;field1&quot;</span> <span class="s">&quot;field2&quot;</span><span class="p">]</span>
+ <span class="s">&quot;2&quot;</span> <span class="p">(</span><span class="nf">direct-stream</span> <span class="p">[</span><span class="s">&quot;f1&quot;</span> <span class="s">&quot;f2&quot;</span> <span class="s">&quot;f3&quot;</span><span class="p">])</span>
+ <span class="s">&quot;3&quot;</span> <span class="p">[</span><span class="s">&quot;f1&quot;</span><span class="p">]}</span>
+</code></pre></div>
 <p>The stream id is a string, while the stream spec is either a vector of fields or a vector of fields wrapped by <code>direct-stream</code>. <code>direct stream</code> marks the stream as a direct stream (See <a href="Concepts.html">Concepts</a> and <a href="">Direct groupings</a> for more details on direct streams).</p>
 
 <p>If the bolt only has one output stream, you can define the default stream of the bolt by using a vector instead of a map for the output declaration. For example:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">[</span><span class="s">&quot;word&quot;</span> <span class="s">&quot;count&quot;</span><span class="p">]</span>
+</code></pre></div>
+<p>This declares the output of the bolt as the fields [&quot;word&quot; &quot;count&quot;] on the default stream id.</p>
 
-<p><code>clojure
-["word" "count"]
-</code>
-This declares the output of the bolt as the fields [“word” “count”] on the default stream id.</p>
-
-<h4 id="emitting-acking-and-failing">Emitting, acking, and failing</h4>
+<h4 id="toc_9">Emitting, acking, and failing</h4>
 
 <p>Rather than use the Java methods on <code>OutputCollector</code> directly, the DSL provides a nicer set of functions for using <code>OutputCollector</code>: <code>emit-bolt!</code>, <code>emit-direct-bolt!</code>, <code>ack!</code>, and <code>fail!</code>.</p>
 
 <ol>
-  <li><code>emit-bolt!</code>: takes as parameters the <code>OutputCollector</code>, the values to emit (a Clojure sequence), and keyword arguments for <code>:anchor</code> and <code>:stream</code>. <code>:anchor</code> can be a single tuple or a list of tuples, and <code>:stream</code> is the id of the stream to emit to. Omitting the keyword arguments emits an unanchored tuple to the default stream.</li>
-  <li><code>emit-direct-bolt!</code>: takes as parameters the <code>OutputCollector</code>, the task id to send the tuple to, the values to emit, and keyword arguments for <code>:anchor</code> and <code>:stream</code>. This function can only emit to streams declared as direct streams.</li>
-  <li><code>ack!</code>: takes as parameters the <code>OutputCollector</code> and the tuple to ack.</li>
-  <li><code>fail!</code>: takes as parameters the <code>OutputCollector</code> and the tuple to fail.</li>
+<li><code>emit-bolt!</code>: takes as parameters the <code>OutputCollector</code>, the values to emit (a Clojure sequence), and keyword arguments for <code>:anchor</code> and <code>:stream</code>. <code>:anchor</code> can be a single tuple or a list of tuples, and <code>:stream</code> is the id of the stream to emit to. Omitting the keyword arguments emits an unanchored tuple to the default stream.</li>
+<li><code>emit-direct-bolt!</code>: takes as parameters the <code>OutputCollector</code>, the task id to send the tuple to, the values to emit, and keyword arguments for <code>:anchor</code> and <code>:stream</code>. This function can only emit to streams declared as direct streams.</li>
+<li><code>ack!</code>: takes as parameters the <code>OutputCollector</code> and the tuple to ack.</li>
+<li><code>fail!</code>: takes as parameters the <code>OutputCollector</code> and the tuple to fail.</li>
 </ol>
 
 <p>See <a href="Guaranteeing-message-processing.html">Guaranteeing message processing</a> for more info on acking and anchoring.</p>
 
-<h3 id="defspout">defspout</h3>
+<h3 id="toc_10">defspout</h3>
 
-<p><code>defspout</code> is used for defining spouts in Clojure. Like bolts, spouts must be serializable so you can’t just reify <code>IRichSpout</code> to do spout implementations in Clojure. <code>defspout</code> works around this restriction and provides a nicer syntax for defining spouts than just implementing a Java interface.</p>
+<p><code>defspout</code> is used for defining spouts in Clojure. Like bolts, spouts must be serializable so you can&#39;t just reify <code>IRichSpout</code> to do spout implementations in Clojure. <code>defspout</code> works around this restriction and provides a nicer syntax for defining spouts than just implementing a Java interface.</p>
 
 <p>The signature for <code>defspout</code> looks like the following:</p>
 
-<p>(defspout <em>name</em> <em>output-declaration</em> *<em>option-map</em> &amp; <em>impl</em>)</p>
+<p>(defspout <em>name</em> <em>output-declaration</em> *_option-map_ &amp; <em>impl</em>)</p>
 
 <p>If you leave out the option map, it defaults to {:prepare true}. The output declaration for <code>defspout</code> has the same syntax as <code>defbolt</code>.</p>
 
-<p>Here’s an example <code>defspout</code> implementation from <a href="https://github.com/nathanmarz/storm-starter/blob/master/src/clj/storm/starter/clj/word_count.clj">storm-starter</a>:</p>
-
-<p><code>clojure
-(defspout sentence-spout ["sentence"]
-  [conf context collector]
-  (let [sentences ["a little brown dog"
-                   "the man petted the dog"
-                   "four score and seven years ago"
-                   "an apple a day keeps the doctor away"]]
-    (spout
-     (nextTuple []
-       (Thread/sleep 100)
-       (emit-spout! collector [(rand-nth sentences)])         
-       )
-     (ack [id]
-        ;; You only need to define this method for reliable spouts
-        ;; (such as one that reads off of a queue like Kestrel)
-        ;; This is an unreliable spout, so it does nothing here
-        ))))
-</code></p>
-
+<p>Here&#39;s an example <code>defspout</code> implementation from <a href="https://github.com/nathanmarz/storm-starter/blob/master/src/clj/storm/starter/clj/word_count.clj">storm-starter</a>:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">defspout</span> <span class="nv">sentence-spout</span> <span class="p">[</span><span class="s">&quot;sentence&quot;</span><span class="p">]</span>
+  <span class="p">[</span><span class="nv">conf</span> <span class="nv">context</span> <span class="nv">collector</span><span class="p">]</span>
+  <span class="p">(</span><span class="k">let </span><span class="p">[</span><span class="nv">sentences</span> <span class="p">[</span><span class="s">&quot;a little brown dog&quot;</span>
+                   <span class="s">&quot;the man petted the dog&quot;</span>
+                   <span class="s">&quot;four score and seven years ago&quot;</span>
+                   <span class="s">&quot;an apple a day keeps the doctor away&quot;</span><span class="p">]]</span>
+    <span class="p">(</span><span class="nf">spout</span>
+     <span class="p">(</span><span class="nf">nextTuple</span> <span class="p">[]</span>
+       <span class="p">(</span><span class="nf">Thread/sleep</span> <span class="mi">100</span><span class="p">)</span>
+       <span class="p">(</span><span class="nf">emit-spout!</span> <span class="nv">collector</span> <span class="p">[(</span><span class="nf">rand-nth</span> <span class="nv">sentences</span><span class="p">)])</span>         
+       <span class="p">)</span>
+     <span class="p">(</span><span class="nf">ack</span> <span class="p">[</span><span class="nv">id</span><span class="p">]</span>
+        <span class="c1">;; You only need to define this method for reliable spouts</span>
+        <span class="c1">;; (such as one that reads off of a queue like Kestrel)</span>
+        <span class="c1">;; This is an unreliable spout, so it does nothing here</span>
+        <span class="p">))))</span>
+</code></pre></div>
 <p>The implementation takes in as input the topology config, <code>TopologyContext</code>, and <code>SpoutOutputCollector</code>. The implementation returns an <code>ISpout</code> object. Here, the <code>nextTuple</code> function emits a random sentence from <code>sentences</code>. </p>
 
-<p>This spout isn’t reliable, so the <code>ack</code> and <code>fail</code> methods will never be called. A reliable spout will add a message id when emitting tuples, and then <code>ack</code> or <code>fail</code> will be called when the tuple is completed or failed respectively. See <a href="Guaranteeing-message-processing.html">Guaranteeing message processing</a> for more info on how reliability works within Storm.</p>
+<p>This spout isn&#39;t reliable, so the <code>ack</code> and <code>fail</code> methods will never be called. A reliable spout will add a message id when emitting tuples, and then <code>ack</code> or <code>fail</code> will be called when the tuple is completed or failed respectively. See <a href="Guaranteeing-message-processing.html">Guaranteeing message processing</a> for more info on how reliability works within Storm.</p>
 
 <p><code>emit-spout!</code> takes in as parameters the <code>SpoutOutputCollector</code> and the new tuple to be emitted, and accepts as keyword arguments <code>:stream</code> and <code>:id</code>. <code>:stream</code> specifies the stream to emit to, and <code>:id</code> specifies a message id for the tuple (used in the <code>ack</code> and <code>fail</code> callbacks). Omitting these arguments emits an unanchored tuple to the default output stream.</p>
 
 <p>There is also a <code>emit-direct-spout!</code> function that emits a tuple to a direct stream and takes an additional argument as the second parameter of the task id to send the tuple to.</p>
 
 <p>Spouts can be parameterized just like bolts, in which case the symbol is bound to a function returning <code>IRichSpout</code> instead of the <code>IRichSpout</code> itself. You can also declare an unprepared spout which only defines the <code>nextTuple</code> method. Here is an example of an unprepared spout that emits random sentences parameterized at runtime:</p>
-
-<p><code>clojure
-(defspout sentence-spout-parameterized ["word"] {:params [sentences] :prepare false}
-  [collector]
-  (Thread/sleep 500)
-  (emit-spout! collector [(rand-nth sentences)]))
-</code></p>
-
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">defspout</span> <span class="nv">sentence-spout-parameterized</span> <span class="p">[</span><span class="s">&quot;word&quot;</span><span class="p">]</span> <span class="p">{</span><span class="ss">:params</span> <span class="p">[</span><span class="nv">sentences</span><span class="p">]</span> <span class="ss">:prepare</span> <span class="nv">false</span><span class="p">}</span>
+  <span class="p">[</span><span class="nv">collector</span><span class="p">]</span>
+  <span class="p">(</span><span class="nf">Thread/sleep</span> <span class="mi">500</span><span class="p">)</span>
+  <span class="p">(</span><span class="nf">emit-spout!</span> <span class="nv">collector</span> <span class="p">[(</span><span class="nf">rand-nth</span> <span class="nv">sentences</span><span class="p">)]))</span>
+</code></pre></div>
 <p>The following example illustrates how to use this spout in a <code>spout-spec</code>:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">(</span><span class="nf">spout-spec</span> <span class="p">(</span><span class="nf">sentence-spout-parameterized</span>
+                   <span class="p">[</span><span class="s">&quot;the cat jumped over the door&quot;</span>
+                    <span class="s">&quot;greetings from a faraway land&quot;</span><span class="p">])</span>
+            <span class="ss">:p</span> <span class="mi">2</span><span class="p">)</span>
+</code></pre></div>
+<h3 id="toc_11">Running topologies in local mode or on a cluster</h3>
+
+<p>That&#39;s all there is to the Clojure DSL. To submit topologies in remote mode or local mode, just use the <code>StormSubmitter</code> or <code>LocalCluster</code> classes just like you would from Java.</p>
+
+<p>To create topology configs, it&#39;s easiest to use the <code>backtype.storm.config</code> namespace which defines constants for all of the possible configs. The constants are the same as the static constants in the <code>Config</code> class, except with dashes instead of underscores. For example, here&#39;s a topology config that sets the number of workers to 15 and configures the topology in debug mode:</p>
+<div class="highlight"><pre><code class="clojure language-clojure" data-lang="clojure"><span class="p">{</span><span class="nv">TOPOLOGY-DEBUG</span> <span class="nv">true</span>
+ <span class="nv">TOPOLOGY-WORKERS</span> <span class="mi">15</span><span class="p">}</span>
+</code></pre></div>
+<h3 id="toc_12">Testing topologies</h3>
 
-<p><code>clojure
-(spout-spec (sentence-spout-parameterized
-                   ["the cat jumped over the door"
-                    "greetings from a faraway land"])
-            :p 2)
-</code></p>
-
-<h3 id="running-topologies-in-local-mode-or-on-a-cluster">Running topologies in local mode or on a cluster</h3>
-
-<p>That’s all there is to the Clojure DSL. To submit topologies in remote mode or local mode, just use the <code>StormSubmitter</code> or <code>LocalCluster</code> classes just like you would from Java.</p>
-
-<p>To create topology configs, it’s easiest to use the <code>backtype.storm.config</code> namespace which defines constants for all of the possible configs. The constants are the same as the static constants in the <code>Config</code> class, except with dashes instead of underscores. For example, here’s a topology config that sets the number of workers to 15 and configures the topology in debug mode:</p>
-
-<p><code>clojure
-{TOPOLOGY-DEBUG true
- TOPOLOGY-WORKERS 15}
-</code></p>
-
-<h3 id="testing-topologies">Testing topologies</h3>
-
-<p><a href="http://www.pixelmachine.org/2011/12/17/Testing-Storm-Topologies.html">This blog post</a> and its <a href="http://www.pixelmachine.org/2011/12/21/Testing-Storm-Topologies-Part-2.html">follow-up</a> give a good overview of Storm’s powerful built-in facilities for testing topologies in Clojure.</p>
+<p><a href="http://www.pixelmachine.org/2011/12/17/Testing-Storm-Topologies.html">This blog post</a> and its <a href="http://www.pixelmachine.org/2011/12/21/Testing-Storm-Topologies-Part-2.html">follow-up</a> give a good overview of Storm&#39;s powerful built-in facilities for testing topologies in Clojure.</p>
 
 </div>
 </div>