http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/141627ec/content/contribute/contribution-guide/index.html
----------------------------------------------------------------------
diff --git a/content/contribute/contribution-guide/index.html
b/content/contribute/contribution-guide/index.html
index a1b1aaa..8a1b810 100644
--- a/content/contribute/contribution-guide/index.html
+++ b/content/contribute/contribution-guide/index.html
@@ -161,7 +161,10 @@
<li><a href="#fork-the-repository-on-github"
id="markdown-toc-fork-the-repository-on-github">Fork the repository on
GitHub</a></li>
<li><a href="#clone-the-repository-locally"
id="markdown-toc-clone-the-repository-locally">Clone the repository
locally</a></li>
<li><a href="#optional-ide-setup"
id="markdown-toc-optional-ide-setup">[Optional] IDE Setup</a> <ul>
- <li><a href="#intellij"
id="markdown-toc-intellij">Intellij</a></li>
+ <li><a href="#intellij" id="markdown-toc-intellij">IntelliJ</a>
<ul>
+ <li><a href="#checkstyle"
id="markdown-toc-checkstyle">Checkstyle</a></li>
+ </ul>
+ </li>
<li><a href="#eclipse" id="markdown-toc-eclipse">Eclipse</a></li>
</ul>
</li>
@@ -296,9 +299,41 @@ $ cd incubator-beam
<p>Depending on your preferred development environment, you may need to
prepare it to develop Beam code.</p>
-<h5 id="intellij">Intellij</h5>
+<h5 id="intellij">IntelliJ</h5>
-<p><em>If you are an Intellij user, please contribute instructions! See <a
href="https://issues.apache.org/jira/browse/BEAM-835">BEAM-835</a>.</em></p>
+<p><em>This documentation is incomplete. If you are an Intellij user, please
contribute instructions!
+See <a
href="https://issues.apache.org/jira/browse/BEAM-835">BEAM-835</a>.</em></p>
+
+<h6 id="checkstyle">Checkstyle</h6>
+<p>IntelliJ supports checkstyle within the IDE using the Checkstyle-IDEA
plugin.</p>
+
+<ol>
+ <li>Install the âCheckstyle-IDEAâ plugin from the IntelliJ plugin
repository.</li>
+ <li>Configure the plugin by going to Settings -> Other Settings ->
Checkstyle.</li>
+ <li>Set the âScan Scopeâ to âOnly Java sources (including
tests)â.</li>
+ <li>In the âConfiguration Fileâ pane, add a new configuration using the
plus icon:
+ <ol>
+ <li>Set the âDescriptionâ to âBeamâ.</li>
+ <li>Select âUse a local Checkstyle fileâ, and point it to
+ âsdks/java/build-tools/src/main/resources/beam/checkstyle.xmlâ within
+ your repository.</li>
+ <li>Check the box for âStore relative to project locationâ, and click
+ âNextâ.</li>
+ <li>Configure the âcheckstyle.suppressions.fileâ property value to
+ âsuppressions.xmlâ, and click âNextâ, then âFinishâ.</li>
+ </ol>
+ </li>
+ <li>Select âBeamâ as the only active configuration file, and click
âApplyâ and
+âOKâ.</li>
+ <li>Checkstyle will now give warnings in the editor for any Checkstyle
+violations.</li>
+</ol>
+
+<p>You can also scan an entire module by opening the Checkstyle tools window
and
+clicking the âCheck Moduleâ button. The scan should report no errors.</p>
+
+<p>Note: Selecting âCheck Projectâ may report some errors from the
archetype
+modules as they are not configured for Checkstyle validation.</p>
<h5 id="eclipse">Eclipse</h5>