Update license info on deploy scripts

3 files changed, 17 insertions, 26 deletions

diff --git a/bin/slaves.sh b/bin/slaves.sh
index d383e02545..030581e058 100755
--- a/bin/slaves.sh
+++ b/bin/slaves.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# This Spark deploy script is a modified version of the Apache Hadoop deploy
+# script, available under the Apache 2 license:
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
diff --git a/bin/spark-daemon.sh b/bin/spark-daemon.sh
index ae0b781291..0c584055c7 100755
--- a/bin/spark-daemon.sh
+++ b/bin/spark-daemon.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# This Spark deploy script is a modified version of the Apache Hadoop deploy
+# script, available under the Apache 2 license:
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html
index 677573db73..cf2f663fa5 100755
--- a/docs/_layouts/global.html
+++ b/docs/_layouts/global.html
@@ -36,49 +36,34 @@
                     <a class="brand" href="{{HOME_PATH}}index.html"></a>
                     <ul class="nav">
                         <!--TODO(andyk): Add class="active" attribute to li some how.-->
-                        <li><a href="{{HOME_PATH}}index.html">Getting Started</a></li>
+                        <li><a href="{{HOME_PATH}}index.html">Overview</a></li>
 
                         <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Programming Guides<b class="caret"></b></a>
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Programming Guide<b class="caret"></b></a>
                             <ul class="dropdown-menu">
-                                <li><a href="{{HOME_PATH}}java-programming-guide.html">Java Programming Guide</a></li>
-                                <li><a href="{{HOME_PATH}}scala-programming-guide.html">Scala Programming Guide</a></li>
-                                <li><a href="{{HOME_PATH}}bagel-programming-guide.html">Bagel Programming Guide</a></li>
+                                <li><a href="{{HOME_PATH}}scala-programming-guide.html">Scala</a></li>
+                                <li><a href="{{HOME_PATH}}java-programming-guide.html">Java</a></li>
                             </ul>
                         </li>
+                        
+                        <li><a href="api/core/index.html">API (Scaladoc)</a></li>
 
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Deploying<b class="caret"></b></a>
                             <ul class="dropdown-menu">
-                                <li><a href="{{HOME_PATH}}ec2-scripts.html">On Amazon EC2</a></li>
-                                <li><a href="{{HOME_PATH}}running-on-mesos.html">On Mesos</a></li>
-                                <li><a href="{{HOME_PATH}}running-on-yarn.html">On YARN</a></li>
+                                <li><a href="{{HOME_PATH}}ec2-scripts.html">Amazon EC2</a></li>
                                 <li><a href="{{HOME_PATH}}spark-standalone.html">Standalone Mode</a></li>
+                                <li><a href="{{HOME_PATH}}running-on-mesos.html">Mesos</a></li>
+                                <li><a href="{{HOME_PATH}}running-on-yarn.html">YARN</a></li>
                             </ul>
                         </li>
 
                         <li class="dropdown">
-                            <a href="{{HOME_PATH}}api.html" class="dropdown-toggle" data-toggle="dropdown">API (Scaladoc)<b class="caret"></b></a>
-                            <ul class="dropdown-menu">
-                                <!--<li><a href="#">Something else here</a></li>
-                                <li class="divider"></li>
-                                <li class="nav-header">Nav header</li>
-                                <li><a href="#">Separated link</a></li>
-                                <li><a href="#">One more separated link</a></li>-->
-                                <li><a href="api/core/index.html">Core</a></li>
-                                <li><a href="api/examples/index.html">Examples</a></li>
-                                <li><a href="api/repl/index.html">REPL</a></li>
-                                <li><a href="api/bagel/index.html">Bagel</a></li>
-                            </ul>
-                        </li>
-
-
-                        <li class="dropdown">
                             <a href="{{HOME_PATH}}api.html" class="dropdown-toggle" data-toggle="dropdown">More<b class="caret"></b></a>
                             <ul class="dropdown-menu">
                                 <li><a href="configuration.html">Configuration</a></li>
-                                <li><a href="spark-debugger.html">Debugger</a></li>
-                                <li><a href="contributing-to-spark.html">Contributing</a></li>
+                                <li><a href="bagel-programming-guide.html">Bagel (Pregel on Spark)</a></li>
+                                <li><a href="contributing-to-spark.html">Contributing to Spark</a></li>
                             </ul>
                         </li>
                     </ul>