From 25eb1d0cc9d30b847465ed5f8080ae890938f291 Mon Sep 17 00:00:00 2001
From: Felicity Chapman <felicity@semmle.com>
Date: Sat, 9 Nov 2019 13:44:55 +0000
Subject: [PATCH] Update for CodeQL term change and port nav changes

---
 docs/language/global-sphinx-files/_templates/layout.html | 8 ++++----
 docs/language/support/conf.py                            | 2 +-
 docs/language/support/framework-support.rst              | 2 +-
 docs/language/support/index.rst                          | 4 ++--
 docs/language/support/language-support.rst               | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/language/global-sphinx-files/_templates/layout.html b/docs/language/global-sphinx-files/_templates/layout.html
index d5a714aa5e1..1d5baa659d6 100644
--- a/docs/language/global-sphinx-files/_templates/layout.html
+++ b/docs/language/global-sphinx-files/_templates/layout.html
@@ -59,9 +59,9 @@
             </div>
             <div class="linkcontainer">
                 <div class="linkbar">
-                    <a href="https://help.semmle.com/QL/learn-ql/" target="_blank">Learn QL</a>
-                    <a href="https://help.semmle.com/QL/learn-ql/ql-training.html" target="_blank">QL for variant analysis</a>
-                    <a href="https://help.semmle.com/QL/ql-tools.html" target="_blank">QL tools</a>
+                    <a href="https://help.semmle.com/QL/learn-ql/" target="_blank">Learn CodeQL</a>
+                    <a href="https://help.semmle.com/QL/learn-ql/ql-training.html" target="_blank">Variant analysis</a>
+                    <a href="https://help.semmle.com/QL/ql-tools.html" target="_blank">Tools</a>
                     <a href="https://help.semmle.com/QL/ql-explore-queries.html" target="_blank">Queries</a>
                     <a href="https://help.semmle.com/QL/ql-reference-topics.html" target="_blank">Reference</a>
                     <a href="https://blog.semmle.com" target="_blank">Blog</a>
@@ -77,7 +77,7 @@
 <div class="wrapper">
     
     <div class="navBox" >
-         <p>Start writing QL in the <a href="https://lgtm.com/query">Query console</a> on <a href="https://lgtm.com">LGTM.com</a>.</p>
+         <p>Start writing queries in the <a href="https://lgtm.com/query">Query console</a> on <a href="https://lgtm.com">LGTM.com</a>.</p>
              
          <div id="searchbox" style="display: none" role="search">
                 <h3>Quick search</h3>
diff --git a/docs/language/support/conf.py b/docs/language/support/conf.py
index 2e4bbf46d64..30d7b1a3028 100644
--- a/docs/language/support/conf.py
+++ b/docs/language/support/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# QL and LGTM support info build configuration file, created 
+# CodeQL and LGTM support info build configuration file, created 
 # on Tuesday 19th February.
 #
 # This file is execfile()d with the current directory set to its
diff --git a/docs/language/support/framework-support.rst b/docs/language/support/framework-support.rst
index dc1995f9345..3e3cb8557af 100644
--- a/docs/language/support/framework-support.rst
+++ b/docs/language/support/framework-support.rst
@@ -1,7 +1,7 @@
 Frameworks and libraries
 ########################
 
-The QL libraries and queries in version |version| have been explicitly checked against the libraries and frameworks listed below.
+The libraries and queries in version |version| have been explicitly checked against the libraries and frameworks listed below.
 
 .. pull-quote::
 
diff --git a/docs/language/support/index.rst b/docs/language/support/index.rst
index 5fee43da196..6236b4c1543 100644
--- a/docs/language/support/index.rst
+++ b/docs/language/support/index.rst
@@ -1,7 +1,7 @@
 Supported languages and frameworks
 ##################################
 
-These pages describe the languages and frameworks supported in the latest enterprise release of QL and LGTM. 
+These pages describe the languages and frameworks supported in the latest enterprise release of CodeQL and LGTM. (CodeQL was previously known as QL.) 
 Users of `LGTM.com <https://lgtm.com/>`_ may find that additional features are supported because it's updated more frequently.
 
 For details see:
@@ -11,4 +11,4 @@ For details see:
   language-support.rst
   framework-support.rst
 
-For details of the QL libraries, see `QL standard libraries <https://help.semmle.com/QL/ql-libraries.html>`_.
\ No newline at end of file
+For details of the CodeQL libraries, see `CodeQL standard libraries <https://help.semmle.com/QL/ql-libraries.html>`_.
\ No newline at end of file
diff --git a/docs/language/support/language-support.rst b/docs/language/support/language-support.rst
index 9fa1e60e05d..d4b1b95ba2e 100644
--- a/docs/language/support/language-support.rst
+++ b/docs/language/support/language-support.rst
@@ -1,7 +1,8 @@
 Languages and compilers
 #######################
 
-QL and LGTM version |version| support analysis of the following languages compiled by the following compilers.
+CodeQL and LGTM version |version| support analysis of the following languages compiled by the following compilers.
+(CodeQL was previously known as QL.)
 
 Note that where there are several versions or dialects of a language, the supported variants are listed.
 If your code requires a particular version of a compiler, check that this version is included below.