docs: some more slide fixes

Author: james

docs/language/ql-training-rst/cpp/program-representation-cpp.rst

@@ -6,9 +6,7 @@ Program representation in QL for C/C++
 
    Semmle :sup:`TM`
 
-.. Include information slides here
-
-.. include:: ../slide-snippets/info.rst
+.. rst-class:: agenda
 
 Agenda
 ======

docs/language/ql-training-rst/java/intro-ql-java.rst

@@ -6,22 +6,21 @@ Introduction to variant analysis for Java
 
    Semmle :sup:`TM`
 
-.. Include information slides here
+.. rst-class:: setup
 
-.. include:: ../slide-snippets/info.rst
+Setup
+=====
 
-.. Include details of project to analyze here
+For this example you should download:
 
-QL snapshot
-===========
+- `QL for Eclipse <https://help.semmle.com/ql-for-eclipse/Content/WebHelp/install-plugin-free.html>`__
+- `Apache Struts snapshot <https://downloads.lgtm.com/snapshots/java/apache/struts/apache-struts-7fd1622-CVE-2018-11776.zip>`__
 
-For the examples in this presentation, we will be analyzing `Apache Struts <https://github.com/apache/struts>`__.
-
-We recommend you download `this historic snapshot <https://downloads.lgtm.com/snapshots/java/apache/struts/apache-struts-7fd1622-CVE-2018-11776.zip>`__ to analyze in QL for Eclipse.
+.. note::
 
-Alternatively, you can query the project in `the query console <https://lgtm.com/query/project:1878521151/lang:java//>`__ on LGTM.com.
+   For this example, we will be analyzing `Apache Struts <https://github.com/apache/struts>`__.
 
-.. note::
+   You can also query the project in `the query console <https://lgtm.com/query/project:1878521151/lang:java/>`__ on LGTM.com.
 
    Note that results generated in the query console are likely to differ to those generated in the QL plugin as LGTM.com analyzes the most recent revisions of each project that has been added–the snapshot available to download above is based on an historical version of the code base.
 

docs/language/ql-training-rst/slide-snippets/intro-ql-general.rst

@@ -45,12 +45,6 @@ Zoom in on the code...
   However, there’s no sanity checking, and a developer might call it with an array that’s too short, holding direction information for only one of the thrusters. 
   The function will then read past the end of the array, and unpredictable results occur.
 
-.. rst-class:: background2
-
-How it all works
-================
-
-
 Write a query...
 ================
 
@@ -87,18 +81,18 @@ Find all instances!
 
 - All were fixed with a mid-flight patch.
 
-.. container:: image-box
-
-   .. image:: ../_static-training/curiosity2.png
-    
+- For more detail on the collaboration between Semmle and NASA, see our case study: `Semmle at NASA: Landing Curiosity safely on Mars <https://semmle.com/case-studies/semmle-nasa-landing-curiosity-safely-mars>`__.
 
 .. note::
 
   The JPL team ran the query across the full Curiosity control software–it identified the original problem, and more than 30 other variants, of which three were in the critical Entry, Descent, and Landing module. 
 
   The team addressed all issues, and patched the firmware remotely. Not long after, the Curiosity Rover landed safely on Mars.
-  
-  For more detail on the collaboration between Semmle and NASA, see our case study: `Semmle at NASA: Landing Curiosity safely on Mars <https://semmle.com/case-studies/semmle-nasa-landing-curiosity-safely-mars>`__.
+
+.. rst-class:: background2
+
+How it all works
+================
 
 Analysis overview
 =================