apex-site git commit: from 78a443ee05324e4f4247bde20345666ed705af55 [Forced Update!]

[th...@apache.org]

Repository: apex-site
Updated Branches:
  refs/heads/asf-site 722c99931 -> 78858fe9c (forced update)


from 78a443ee05324e4f4247bde20345666ed705af55


Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/78858fe9
Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/78858fe9
Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/78858fe9

Branch: refs/heads/asf-site
Commit: 78858fe9c35a2c055b4390f59834712cc33484dc
Parents: 69bc8f3
Author: Thomas Weise <th...@datatorrent.com>
Authored: Mon Sep 26 18:58:44 2016 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Mon Sep 26 19:05:01 2016 -0700

----------------------------------------------------------------------
 content/contributing.html                       |  2 +-
 .../docs/apex-3.4/license/highlight.js/LICENSE  | 24 --------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/apex-site/blob/78858fe9/content/contributing.html
----------------------------------------------------------------------
diff --git a/content/contributing.html b/content/contributing.html
index 71e1c0a..3009b2a 100644
--- a/content/contributing.html
+++ b/content/contributing.html
@@ -116,7 +116,7 @@
 </ol>
 <h3 id="java-development-environment">Java Development Environment</h3>
 <p>For prerequisites and setup instructions see: <a href="http://apex.apache.org/docs/apex/apex_development_setup/">http://apex.apache.org/docs/apex/apex_development_setup/</a></p>
-<p>Apache Apex follows coding style that is closest to K &amp; R style and uses <a href="http://checkstyle.sourceforge.net/">Checkstyle</a> tool to enforce these standards. Travis CI will fail for any pull request that introduces any style violations. The checkstyle configuration is <a href="https://github.com/apache/apex-core/blob/master/codestyle-config/src/main/resources/apex_checks.xml">here</a>.</p>
+<p>Apache Apex follows coding style that is closest to K &amp; R style and uses <a href="http://checkstyle.sourceforge.net/">Checkstyle</a> tool to enforce these standards. Apex checkstyle enforces no trailing whitespace. Travis CI will fail for any pull request that introduces any style violations. The checkstyle configuration is <a href="https://github.com/apache/apex-core/blob/master/codestyle-config/src/main/resources/apex_checks.xml">here</a>.</p>
 <p>To make it easier for the users to set up their development environment, settings for the following common IDEs are provided in the Apache Apex Core repository with instructions.</p>
 <ul>
 <li><a href="https://github.com/apache/apex-core/tree/master/misc/ide-templates/intellij">IntelliJ</a></li>

http://git-wip-us.apache.org/repos/asf/apex-site/blob/78858fe9/content/docs/apex-3.4/license/highlight.js/LICENSE
----------------------------------------------------------------------
diff --git a/content/docs/apex-3.4/license/highlight.js/LICENSE b/content/docs/apex-3.4/license/highlight.js/LICENSE
deleted file mode 100644
index 422deb7..0000000
--- a/content/docs/apex-3.4/license/highlight.js/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2006, Ivan Sagalaev
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of highlight.js nor the names of its contributors 
-      may be used to endorse or promote products derived from this software 
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.