Merge branch 'master' of github.com:scala/scala-lang

Author: namin

_includes/navbar.html

@@ -2,13 +2,13 @@
     <li>
         <div class="dropdown">
             <a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#"
-               href="{{ site.baseurl }}/learn/">
-                Learn
+               href="{{ site.baseurl }}/documentation/">
+                Documentation
                 <b class="caret"></b>
             </a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                <li><a href="{{ site.baseurl }}/learn/">Learning Scala</a>
-                <li><a href="{{ site.baseurl }}/learn/books.html">Books</a></li>
+                <li><a href="{{ site.baseurl }}/documentation/">Learning Scala</a>
+                <li><a href="{{ site.baseurl }}/documentation/books.html">Books</a></li>
                 <li class="dropdown-submenu">
                     <a tabindex="-1" href="#">API</a>
                     <ul class="dropdown-menu">
@@ -23,23 +23,18 @@
     </li>
     <li>
         <div class="dropdown">
-            <a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{{ site.baseurl }}/download/">
+            <a href="{{ site.baseurl }}/download/">
                 Download
-                <b class="caret"></b>
             </a>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                <li><a href="{{ site.baseurl }}/download/">Releases</a></li>
-                <li><a href="{{ site.baseurl }}/download/changelog.html">Changelog</a></li>
-                <li><a href="{{ site.baseurl }}/download/getting-started.html">Getting Started</a></li>
-                <li><a href="{{ site.baseurl }}/download/license.html">License</a></li>
-            </ul>
         </div>
+    </li>
     <li>
         <div class="dropdown">
             <a href="{{ site.baseurl }}/community/">
                 Community
             </a>
         </div>
+    </li>
     <li>
         <div class="dropdown">
             <a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#"

learn/books.md renamed to documentation/books.md

@@ -5,7 +5,7 @@ title: Learn
 
 # Learning Scala
 
-The best way to learn Scala depends on what you know already and the way you prefer to learn things. There is a variety of resources available including [books]({{ site.baseurl }}/learn/books.html), tutorials, training courses, presentations, and of course the Scala compiler for practice. Many people find a good combination is to have one of the Scala books at hand and to start right away trying the examples with the Scala Compiler. On the other hand, you may want to get started with a Scala [training course](#training) or using the material available online.
+The best way to learn Scala depends on what you know already and the way you prefer to learn things. There is a variety of resources available including [books]({{ site.baseurl }}/documentation/books.html), tutorials, training courses, presentations, and of course the Scala compiler for practice. Many people find a good combination is to have one of the Scala books at hand and to start right away trying the examples with the Scala Compiler. On the other hand, you may want to get started with a Scala [training course](#training) or using the material available online.
 
 As your knowledge of Scala grows, you will find there is more advanced material and a very friendly [Scala community]({{ site.baseurl }}/community/) at hand to help you. They all share a passion for Scala and welcome newcomers warmly. Many have written helpful material for programmers new to Scala, will respond to emails asking for help or are sharing neat new techniques, advanced concepts or tools in one of several Scala forums or personal blogs.