From d2510391483000d3fae489fcdb35f4e7b575496e Mon Sep 17 00:00:00 2001
From: Sebastien Gilles <sebastien.gilles@inria.fr>
Date: Wed, 11 Mar 2020 18:20:52 +0100
Subject: [PATCH] Minor fixes in the latest notebook.

---
 0-introduction-to-C++.ipynb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/0-introduction-to-C++.ipynb b/0-introduction-to-C++.ipynb
index 061624f..2869241 100644
--- a/0-introduction-to-C++.ipynb
+++ b/0-introduction-to-C++.ipynb
@@ -8,7 +8,7 @@
     }
    },
    "source": [
-    "# [Getting started in C++](/) - [A brief introduction](./Introduction.ipynb)"
+    "# [Getting started in C++](/) - [A brief introduction](./0-introduction-to-C++.ipynb)"
    ]
   },
   {
@@ -18,7 +18,7 @@
    },
    "source": [
     "<h1>Table of Contents<span class=\"tocSkip\"></span></h1>\n",
-    "<div class=\"toc\"><ul class=\"toc-item\"><li><span><a href=\"#A-very-brief-historic\" data-toc-modified-id=\"A-very-brief-historic-1\">A very brief historic</a></span></li><li><span><a href=\"#Which-standard-will-be-tackled-in-this-lecture?\" data-toc-modified-id=\"Which-standard-will-be-tackled-in-this-lecture?-2\">Which standard will be tackled in this lecture?</a></span><ul class=\"toc-item\"><li><span><a href=\"#C++-11/14/17-rather-than-C++-98/03\" data-toc-modified-id=\"C++-11/14/17-rather-than-C++-98/03-2.1\">C++ 11/14/17 rather than C++ 98/03</a></span></li><li><span><a href=\"#But-which-one?-11,-14-or-20?\" data-toc-modified-id=\"But-which-one?-11,-14-or-20?-2.2\">But which one? 11, 14 or 20?</a></span></li><li><span><a href=\"#And-C++-20?\" data-toc-modified-id=\"And-C++-20?-2.3\">And C++ 20?</a></span></li></ul></li><li><span><a href=\"#A-multi-paradigm-language\" data-toc-modified-id=\"A-multi-paradigm-language-3\">A multi-paradigm language</a></span></li></ul></div>"
+    "<div class=\"toc\"><ul class=\"toc-item\"><li><span><a href=\"#A-very-brief-historic\" data-toc-modified-id=\"A-very-brief-historic-1\">A very brief historic</a></span></li><li><span><a href=\"#Which-standard-will-be-tackled-in-this-lecture?\" data-toc-modified-id=\"Which-standard-will-be-tackled-in-this-lecture?-2\">Which standard will be tackled in this lecture?</a></span><ul class=\"toc-item\"><li><span><a href=\"#C++-11/14/17-rather-than-C++-98/03\" data-toc-modified-id=\"C++-11/14/17-rather-than-C++-98/03-2.1\">C++ 11/14/17 rather than C++ 98/03</a></span></li><li><span><a href=\"#But-which-one-should-you-use?-11,-14-or-20?\" data-toc-modified-id=\"But-which-one-should-you-use?-11,-14-or-20?-2.2\">But which one should you use? 11, 14 or 20?</a></span></li><li><span><a href=\"#And-C++-20?\" data-toc-modified-id=\"And-C++-20?-2.3\">And C++ 20?</a></span></li></ul></li><li><span><a href=\"#A-multi-paradigm-language\" data-toc-modified-id=\"A-multi-paradigm-language-3\">A multi-paradigm language</a></span></li></ul></div>"
    ]
   },
   {
@@ -32,7 +32,7 @@
     "- A first (minor) update was issued in 2003 (and dubbed *C++ 03*)\n",
     "- The plan was to provide a major overhaul for the next version, which was called for a long time *C++ 0x*.\n",
     "- The schedule failed, as the next standard turned out to be *C++ 11*. It is a major update, with lots of new features and syntactic sugar introduced.\n",
-    "- The plan was now to publish a release every three years, alternating minor and major ones. It has proved more successful than for *C++ 0x*, except for the minor/major:\n",
+    "- The plan was now to publish a release every three years, alternating minor and major ones. The committee followed the planned schedule more successfully than for *C++ 0x*, except for the minor/major:\n",
     "    * *C++ 14* was a polishing of *C++ 11*, as intended.\n",
     "    * *C++ 17* introduced more new stuff than *C++ 14*, but not as many as initially intended.\n",
     "    * *C++ 20* should therefore be a major update, almost as groundbreaking as *C++ 11*.\n",
@@ -52,9 +52,9 @@
     "\n",
     "The new major standard is now widely supported by compilers, and introduces many features that are very useful. As it is much more pleasant to use, it would be a shame to restrict ourselves to the older versions of the standard.\n",
     "\n",
-    "However, you may have to tackle legacy code which is written in C++ 98/03, so we indicated as much as possible for each feature presented when it was actually introduced.\n",
+    "However, you may have to tackle legacy code which is written in C++ 98/03, so we indicated as much as possible for each recent feature presented when it was actually introduced (if not specified assume it was already present in C++ 98).\n",
     "\n",
-    "### But which one? 11, 14 or 20?\n",
+    "### But which one should you use? 11, 14 or 20?\n",
     "\n",
     "As indicated above, we tried to specify clearly in which standard specific features were introduced. Few guidelines:\n",
     "\n",
@@ -86,7 +86,7 @@
     "\n",
     "There are actually even more: functional programming for instance seems to be gaining traction at the moment and will be eased in C++ 20 standard (see \\cite{Cukic2018} for more about functional programming in C++).\n",
     "\n",
-    "This richness is not always perceived as a boon: there is a section in the [Wikipedia page](https://en.wikipedia.org/wiki/C%2B%2B#Criticism) dedicated to the criticisms addressed at C++ for by notorious developers (but also a defense by Brian Kernighan!)"
+    "This richness is not always perceived as a boon: there is a section in the [Wikipedia page](https://en.wikipedia.org/wiki/C%2B%2B#Criticism) dedicated to the criticisms addressed at C++ by notorious developers (but also a defense by Brian Kernighan!)"
    ]
   },
   {
-- 
GitLab