From 52c29071a4ea59493206f5a6f00feefc22941e72 Mon Sep 17 00:00:00 2001
From: Andy Konwinski <andyk@berkeley.edu>
Date: Sun, 16 Sep 2012 15:28:52 -0700
Subject: - Add docs/api to .gitignore - Rework/expand the nav bar with more of
 the docs site - Removing parts of docs about EC2 and Mesos that differentiate
 between   running 0.5 and before     - Merged subheadings from
 running-on-amazon-ec2.html that are still relevant       (i.e., "Using a
 newer version of Spark" and "Accessing Data in S3") into      
 ec2-scripts.html and deleted running-on-amazon-ec2.html - Added some TODO
 comments to a few docs - Updated the blurb about AMP Camp - Renamed
 programming-guide to spark-programming-guide - Fixing typos/etc. in
 Standalone Spark doc

---
 docs/_layouts/global.html | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

(limited to 'docs/_layouts')

diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html
index 9393ad3cd0..677573db73 100755
--- a/docs/_layouts/global.html
+++ b/docs/_layouts/global.html
@@ -36,21 +36,51 @@
                     <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">Home</a></li>
-                        <li><a href="{{HOME_PATH}}programming-guide.html">Programming Guide</a></li>
-                        <li><a href="{{HOME_PATH}}api.html">API (Scaladoc)</a></li>
-                        <!--
+                        <li><a href="{{HOME_PATH}}index.html">Getting Started</a></li>
+
                         <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Versions ({{ page.spark-version }})<b class="caret"></b></a>
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Programming Guides<b class="caret"></b></a>
                             <ul class="dropdown-menu">
-                                <li><a href="#">Something else here</a></li>
+                                <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>
+                            </ul>
+                        </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}}spark-standalone.html">Standalone Mode</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="#">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>
                             </ul>
                         </li>
-                        -->
                     </ul>
                 </div>
             </div>
-- 
cgit v1.2.3