Merge pull request github#4768 from github/query-and-library-links

Update query and library links for new locations

Author: jf205

docs/codeql/_templates/layout.html

@@ -38,27 +38,19 @@
 {%- block content %}
 <header class="Header">
     <div class="Header-item--full">
-        <a href="{{ pathto(master_doc) }}" class="Header-link f2 d-flex flex-items-center">
+        <a href="https://codeql.github.com/docs" class="Header-link f2 d-flex flex-items-center">
             <!-- <%= octicon "mark-github", class: "mr-2", height: 32 %> -->
             <svg height="32" class="octicon octicon-mark-github mr-2" viewBox="0 0 16 16" version="1.1" width="32"
                 aria-hidden="true">
                 <path fill-rule="evenodd"
                     d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z">
                 </path>
             </svg>
-            <span class="hide-sm">{{ project }}</span>
+            <span class="hide-sm">CodeQL documentation</span>
         </a>
     </div>
     <div class="Header-item hide-sm hide-md">
-        <form class="search" action="{{ pathto('search') }}" method="get">
-            <input class="form-control input-dark" type="text" name="q" placeholder="Search" />
-            <input class="btn" type="submit" value="Search" />
-            <input type="hidden" name="check_keywords" value="yes" />
-            <input type="hidden" name="area" value="default" />
-        </form>
-        <script type="text/javascript">$('#searchbox').show(0);</script>
-
-        <div class="clearer"></div>
+        <script src="https://addsearch.com/js/?key=93b4d287e2fc079a4089412b669785d5&categories=!0xhelp.semmle.com,0xcodeql.github.com,1xdocs,1xcodeql-standard-libraries,1xcodeql-query-help"></script>
     </div>
     <div class="Header-item">
 
@@ -69,20 +61,30 @@
             </summary>
 
             <ul class="dropdown-menu dropdown-menu-se dropdown-menu-dark">
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/codeql-overview">CodeQL overview</a></li>
+                <li class="dropdown-divider" role="separator"></li>
                 <div class="dropdown-header">
-                    Help docs
+                    CodeQL tools
                 </div>
-                <li><a class="dropdown-item" href="https://help.semmle.com/QL/learn-ql/">Learn CodeQL</a></li>
-                <li><a class="dropdown-item" href="https://help.semmle.com/codeql/codeql-tools.html">CodeQL tools</a>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/codeql-for-visual-studio-code">CodeQL for VS Code</a>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/codeql-cli">CodeQL CLI</a>
                 </li>
                 <li class="dropdown-divider" role="separator"></li>
+                <div class="dropdown-header">
+                    CodeQL guides
+                </div>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/writing-codeql-queries">Writing CodeQL queries</a></li>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/codeql-language-guides">CodeQL language guides</a>
+                <li class="dropdown-divider" role="separator"></li>
                 <div class="dropdown-header">
                     Reference docs
                 </div>
-                <li><a class="dropdown-item" href="https://help.semmle.com/QL/ql-handbook/">QL language reference</a>
-                <li><a class="dropdown-item" href="https://help.semmle.com/QL/ql-libraries.html">CodeQL libraries</a>
-                <li><a class="dropdown-item" href="https://help.semmle.com/QL/ql-built-in-queries.html">CodeQL
-                        queries</a>
+                <li><a class="dropdown-item" href="https://codeql.github.com/docs/ql-language-reference/">QL language
+                        reference</a>
+                <li><a class="dropdown-item" href="https://codeql.github.com/codeql-standard-libraries">CodeQL
+                        standard-libraries</a>
+                <li><a class="dropdown-item" href="https://codeql.github.com/codeql-query-help">CodeQL
+                        query help</a>
                 <li class="dropdown-divider" role="separator"></li>
                 <div class="dropdown-header">
                     Source files

docs/codeql/codeql-cli/about-the-codeql-cli.rst

@@ -26,4 +26,4 @@ command line. To run a command, use::
    codeql [command] [subcommand]
 
 To view the reference documentation for a command, add the ``--help`` flag, or visit the 
-"`CodeQL CLI manual <../../codeql-cli-manual>`__."
+"`CodeQL CLI manual <../manual>`__."

docs/codeql/codeql-cli/analyzing-databases-with-the-codeql-cli.rst

@@ -49,7 +49,7 @@ You must specify:
   <sarif-file>`, and graph formats. For more information about CSV and SARIF,
   see `Results <#results>`__. To find out which other results formats are
   supported, see the `database analyze reference
-  <../codeql-cli-manual/database-analyze.html>`__.
+  <../manual/database-analyze>`__.
 
 - ``--output``: the output path of the results file generated during analysis.
 
@@ -70,7 +70,7 @@ You can also specify:
    <upgrading-codeql-databases>`."
 
 For full details of all the options you can use when analyzing databases, see
-the `database analyze reference documentation <../codeql-cli-manual/database-analyze.html>`__.
+the `database analyze reference documentation <../manual/database-analyze>`__.
 
 .. _database-analyze-examples:
 

docs/codeql/codeql-cli/codeql-cli-reference.rst

@@ -28,4 +28,4 @@ CodeQL CLI manual
 -----------------
 
 To view detailed information about each CodeQL CLI command,
-including its usage and options, add the ``--help`` flag or visit the "`CodeQL CLI manual <../codeql-cli-manual>`__."
+including its usage and options, add the ``--help`` flag or visit the "`CodeQL CLI manual <../manual>`__."

docs/codeql/codeql-cli/creating-codeql-databases.rst

@@ -50,7 +50,7 @@ the language you want to analyze:
   detect the build system automatically, using a built-in autobuilder. 
 
 For full details of all the options you can use when creating databases,
-see the `database create reference documentation <../codeql-cli-manual/database-create.html>`__.  
+see the `database create reference documentation <../manual/database-create>`__.  
 
 Progress and results
 --------------------

docs/codeql/codeql-cli/creating-codeql-query-suites.rst

@@ -234,7 +234,7 @@ instruction::
    - description: <name-of-query-suite>
 
 This value is displayed when you run `codeql resolve queries
-<../codeql-cli-manual/resolve-queries.html>`__, if the suite is added to a "well-known"
+<../manual/resolve-queries>`__, if the suite is added to a "well-known"
 directory. For more information, see "`Specifying well-known query suites
 <#specifying-well-known-query-suites>`__." 
 

docs/codeql/codeql-cli/exit-codes.rst

@@ -16,7 +16,7 @@ Success, normal termination.
 
 The command successfully determined that the answer to your question is "no".
 
-This exit code is only used by a few commands, such as `codeql test run <../codeql-cli-manual/test-run.html>`__, `codeql database check <../codeql-cli-manual/dataset-check.html>`__, `codeql query format <../codeql-cli-manual/query-format.html>`__,and `codeql resolve extractor <../codeql-cli-manual/resolve-extractor.html>`__.
+This exit code is only used by a few commands, such as `codeql test run <../manual/test-run>`__, `codeql database check <../manual/dataset-check>`__, `codeql query format <../manual/query-format>`__,and `codeql resolve extractor <../manual/resolve-extractor>`__.
 For more details, see the documentation for those commands.
 
 2
@@ -37,7 +37,7 @@ In this case, the launcher can't start the Java code for the CodeQL CLI at all.
 32
 ---
 
-The extractor didn't find any code to analyze when running `codeql database create <../codeql-cli-manual/database-create.html>`__ or `codeql database finalize <../codeql-cli-manual/database-finalize.html>`__.
+The extractor didn't find any code to analyze when running `codeql database create <../manual/database-create>`__ or `codeql database finalize <../manual/database-finalize>`__.
 
 33
 ---

docs/codeql/codeql-cli/getting-started-with-the-codeql-cli.rst

@@ -184,7 +184,7 @@ executable in a couple of ways:
   can run the executable as just ``codeql``. 
 
 At this point, you can execute CodeQL commands. For a full list of the CodeQL
-CLI commands, see the "`CodeQL CLI manual <../../codeql-cli-manual>`__."
+CLI commands, see the "`CodeQL CLI manual <../manual>`__."
 
 .. pull-quote:: Note
 

docs/codeql/codeql-cli/index.rst

@@ -10,7 +10,7 @@ CodeQL CLI
 
 - :ref:`CodeQL CLI reference <codeql-cli-reference>`: Learn more about the files you can use when running CodeQL processes and the results format and exit codes that CodeQL generates.
 
-- `CodeQL CLI manual <../codeql-cli-manual>`__: Detailed information about all the commands available with the CodeQL CLI.
+- `CodeQL CLI manual <manual>`__: Detailed information about all the commands available with the CodeQL CLI.
 
 .. toctree::
    :titlesonly:

docs/codeql/codeql-cli/sarif-output.rst

@@ -11,7 +11,7 @@ considered "optional". This document details the output produced when using the
 format type ``sarifv2.1.0``, which corresponds to the SARIF v2.1.0.csd1
 specification.
 For more information on selecting a file format for your analysis results, see
-the `database analyze reference <../codeql-cli-manual/database-analyze.html>`__.
+the `database analyze reference <../manual/database-analyze>`__.
 
 SARIF specification and schema
 ------------------------------