Docs: Update some more links

docs/language/learn-ql/ql-etudes/river-crossing.rst

@@ -17,7 +17,7 @@ A solution should be a set of instructions for how to ferry the items, such as "
 across the river, and come back with nothing. Then ferry the cabbage across, and come back with ..."
 
 There are lots of ways to approach this problem and implement it in QL. Before you start, make
-sure that you are familiar with how to define `classes <https://help.semmle.com/QL/ql-handbook/classes.html>`__
+sure that you are familiar with how to define `classes <https://help.semmle.com/QL/ql-handbook/types.html#classes>`__
 and `predicates <https://help.semmle.com/QL/ql-handbook/predicates.html>`__ in QL.
 The following walkthrough is just one of many possible implementations, so have a go at writing your
 own query too! To find more example queries, see the list :ref:`below <alternatives>`.

docs/language/learn-ql/writing-queries/query-help.rst

@@ -208,4 +208,4 @@ Further information
 ===================
 
 - To learn more about contributing to the standard QL queries and libraries, see our `Contributing guidelines <https://github.com/Semmle/ql/blob/master/CONTRIBUTING.md>`__ on GitHub. 
-- To learn more about writing custom queries, and how to format your QL for clarity and consistency, see `Writing QL queries <https://help.semmle.com/QL/learn-ql/ql/writing-queries/writing-queries.html>`__.
+- To learn more about writing custom queries, and how to format your QL for clarity and consistency, see `Writing QL queries <https://help.semmle.com/QL/learn-ql/writing-queries/writing-queries.html>`__.

docs/language/ql-handbook/expressions.rst

@@ -399,7 +399,7 @@ For example, you can use monotonic aggregates :ref:`recursively <recursion>`.
 You can't do this with normal aggregates.
 
 For more information and examples, see `Monotonic aggregates in QL 
-<https://help.semmle.com/QL/learn-ql/ql/advanced/monotonic-aggregates.html>`_.
+<https://help.semmle.com/QL/learn-ql/advanced/monotonic-aggregates.html>`_.
 
 .. TODO: Eventually replace this link with just the relevant examples.
    (Some of the content is a duplicate of the above discussion on aggregates.)

docs/language/ql-handbook/lexical-syntax.rst

@@ -19,7 +19,7 @@ All standard one-line and multiline comments, as described in the `QL language s
 compiler and are only visible in the source code.
 You can also write another kind of comment, namely **QLDoc comments**. These comments describe
 QL entities and are displayed as pop-up information in QL editors. For information about QLDoc
-comments, see the `QLDoc specification <https://help.semmle.com/QL/QLDocSpecification.html>`_.
+comments, see the `QLDoc specification <https://help.semmle.com/QL/ql-spec/qldoc.html>`_.
 
 The following example uses these three different kinds of comments::
 

docs/language/ql-handbook/name-resolution.rst

@@ -240,7 +240,7 @@ and the global namespaces. (You can think of global namespaces as the enclosing
 Let's see what the module, type, and predicate namespaces look like in a concrete example:
 
 For example, you could define a library module ``Villagers`` containing some of the classes and predicates that 
-were defined in the `QL detective tutorials <https://help.semmle.com/QL/learn-ql/ql/beginner/ql-tutorials.html>`_:
+were defined in the `QL detective tutorials <https://help.semmle.com/QL/learn-ql/beginner/ql-tutorials.html>`_:
     
 **Villagers.qll**
 

docs/language/ql-training/slide-snippets/info.rst

@@ -7,7 +7,7 @@ To try the examples in this presentation we recommend you download `QL for Eclip
 
 - If you are new to QL, try the QL language tutorials at `Learning QL <https://help.semmle.com/QL/learn-ql/>`__.
 - To learn more about the main features of QL, try looking at the `QL language handbook <https://help.semmle.com/QL/ql-handbook/>`__.
-- For further information about writing queries in QL, see `Writing QL queries <https://help.semmle.com/QL/learn-ql/ql/writing-queries/writing-queries.html>`__.
+- For further information about writing queries in QL, see `Writing QL queries <https://help.semmle.com/QL/learn-ql/writing-queries/writing-queries.html>`__.
 
 **QL queries**