From 3ef60b7cdcf8826102ec42a77183645ab0cafcf7 Mon Sep 17 00:00:00 2001
From: brandjon <brandjon@google.com>
Date: Sun, 18 Mar 2018 06:26:11 -0700
Subject: Split off troubleshooting section into a FAQ page

Rewrite/add to the contents of this section.

Also updated the page titles / navbar entries of Skylark documentation to make them more uniform (title case, avoid redundancy).

RELNOTES: None
PiperOrigin-RevId: 189503729
---
 site/_layouts/documentation.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'site/_layouts')

diff --git a/site/_layouts/documentation.html b/site/_layouts/documentation.html
index 3726854c0d..63997743a8 100644
--- a/site/_layouts/documentation.html
+++ b/site/_layouts/documentation.html
@@ -62,7 +62,7 @@ nav: docs
                    <li><a href="/versions/{{ site.version }}/tutorial/android-app.html">Building an Android App</a></li>
                    <li><a href="/versions/{{ site.version }}/tutorial/ios-app.html">Building an iOS App</a></li>
                    <li><a href="/versions/{{ site.version }}/skylark/tutorial-sharing-variables.html">Sharing Variables</a></li>
-                   <li><a href="/versions/{{ site.version }}/skylark/tutorial-creating-a-macro.html">Creating Macros</a></li>
+                   <li><a href="/versions/{{ site.version }}/skylark/tutorial-creating-a-macro.html">Creating a Macro</a></li>
                  </ul>
               </li>
 
@@ -173,7 +173,7 @@ nav: docs
                     </ul></li>
                </ul></li>
 
-             <li><a href="/versions/{{ site.version }}/skylark/build-style.html">BUILD File Reference</a></li>
+             <li><a href="/versions/{{ site.version }}/skylark/build-style.html">BUILD Style Guide</a></li>
              <li><a href="/versions/{{ site.version }}/command-line-reference.html">Command Line Reference</a></li>
              <li><a href="/versions/{{ site.version }}/build-event-protocol.html">Build Event Protocol</a></li>
              <li><a href="/versions/{{ site.version }}/query.html">Bazel Query Language</a></li>
@@ -184,7 +184,7 @@ nav: docs
 
             <h3>Extending Bazel</h3>
            <ul class="sidebar-nav">
-              <li><a href="/versions/{{ site.version }}/skylark/concepts.html">Overview</a></li>
+              <li><a href="/versions/{{ site.version }}/skylark/concepts.html">Skylark Overview</a></li>
 
               <li>
                 <a class="sidebar-nav-heading" data-toggle="collapse"
@@ -198,6 +198,7 @@ nav: docs
                   <li><a href="/versions/{{ site.version }}/skylark/depsets.html">Depsets</a></li>
                   <li><a href="/versions/{{ site.version }}/skylark/aspects.html">Aspects</a></li>
                   <li><a href="/versions/{{ site.version }}/skylark/repository_rules.html">Repository Rules</a></li>
+                  <li><a href="/versions/{{ site.version }}/skylark/faq.html">FAQ</a></li>
                 </ul>
               </li>
 
@@ -208,7 +209,7 @@ nav: docs
                   Best Practices<span class="caret"></span>
                 </a>
                 <ul class="collapse sidebar-nav sidebar-submenu" id="skylark-practices">
-                  <li><a href="/versions/{{ site.version }}/skylark/bzl-style.html">Readability Guidelines</a></li>
+                  <li><a href="/versions/{{ site.version }}/skylark/bzl-style.html">.bzl Style Guide</a></li>
                   <li><a href="/versions/{{ site.version }}/skylark/backward-compatibility.html">Backward Compatibility</a></li>
                   <li><a href="https://skydoc.bazel.build" target="_blank">Documenting Rules</a></li>
                   <li><a href="/versions/{{ site.version }}/skylark/skylint.html">Linter</a></li>
@@ -219,7 +220,7 @@ nav: docs
 
               <li><a href="https://github.com/bazelbuild/examples/tree/master/rules">Examples</a></li>
               <li><a href="/versions/{{ site.version }}/skylark/lib/skylark-overview.html">API Reference</a></li>
-              <li><a href="/versions/{{ site.version }}/skylark/language.html">Skylark Language Reference</a></li>
+              <li><a href="/versions/{{ site.version }}/skylark/language.html">Skylark Language</a></li>
             </ul>
           </nav>
         </div>
-- 
cgit v1.2.3