From daeebd09fe048f200e1d3f210de585e1f044ea54 Mon Sep 17 00:00:00 2001
From: Richard Mortier <mort@cantab.net>
Date: Wed, 21 Sep 2011 17:05:40 +0100
Subject: [PATCH] [slides] fix a few typos/add a couple of clarifications

---
 slides/device_exercises.ml |  7 ++++---
 slides/device_model.ml     |  4 ++--
 slides/intro.ml            |  2 +-
 slides/miragep4.ml         | 25 +++++++++++++------------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/slides/device_exercises.ml b/slides/device_exercises.ml
index 5d2c925..1b911c2 100644
--- a/slides/device_exercises.ml
+++ b/slides/device_exercises.ml
@@ -56,7 +56,7 @@ let main () =
 { styles=[];
   content= <:html<
    <h3>Using Key-Value Stores (3)</h3>
-   <p>Now we need to link in our fake block device <tt>Filesystem_static</tt> to our Mirage application. The <tt>server.mir</tt> file lets you control the build:</p>
+   <p>Now we need to link our fake block device <tt>Filesystem_static</tt> into our Mirage application. The <tt>server.mir</tt> file lets you control the build:</p>
 <pre class="noprettyprint">
 $str:dl$ echo Server.main &gt; kv_crunch.mir
 $str:dl$ echo Filesystem_static &gt;&gt; kv_crunch.mir
@@ -104,7 +104,7 @@ $str:dl$ ./_build/unix-direct/kv_fs.bin -vbd myvbd:disk1.img \
 { styles=[];
   content= <:html<
    <h3>Standalone Xen</h3>
-   <p>With a RAMdisk (the first example), the Xen microkernel with storage is trivial.</p>
+   <p>With a RAMdisk (<tt>kv_crunch</tt>, the first example), the Xen microkernel with storage is trivial.</p>
 <pre class="noprettyprint">
 // Linux x86_64 only
 $str:dl$ mir-build xen/kv_crunch.xen
@@ -123,7 +123,8 @@ $str:dl$ cd mirage-tutorial/devices/fat
 $str:dl$ make
 </pre>
 
-<p>The command-line flag to map in a FAT image is <b><tt>-fat_kv_ro id:blkif_id</tt></b> just like the previous one.</p>
+<p>The command-line flag to map a FAT image is <br />
+<b><tt>-fat_kv_ro id:blkif_id</tt></b> just like the previous one.</p>
 <p>This is for advanced users, but see what you can do with it! MacOS has poor support for manipulating FAT volumes, so this will be easier on Linux.</p>
 
 >>
diff --git a/slides/device_model.ml b/slides/device_model.ml
index ec0d757..7e4108a 100644
--- a/slides/device_model.ml
+++ b/slides/device_model.ml
@@ -173,7 +173,7 @@ type blkif = &lt;
     <ul>
       <li>So far, we can sleep and output to the console and have low-level devices (via sockets or pages).</li>
       <li>We need a generic way to plug in I/O devices.</li>
-      <li>Would like to do so both <i>statically</i> at compile-time, and <i>dynamically</i> from the environment</li>
+      <li>Would like to do so both <i>statically</i> at compile-time, and <i>dynamically</i> from the environment.</li>
       <li>A case where <b>OCaml Objects</b> are very useful!</li>
     </ul>
   >>
@@ -185,7 +185,7 @@ type blkif = &lt;
     <h3>Providers</h3>
     <ul>
       <li>These are device managers that manage plugging and unplugging devices from the environment.</li>
-      <li>Each provider registers at application startup, and communicates with the $github "os/unix/devices.ml" "device manager"$
+      <li>Each provider registers at application startup, and communicates with the $github "lib/os/unix/devices.ml" "device manager"$
        via <tt><a href="http://ocsigen.org/lwt/api/Lwt_mvar">Lwt_mvar</a></tt> mailboxes).</li>
       <li>There are two provider types for this tutorial:</li>
       <ul>
diff --git a/slides/intro.ml b/slides/intro.ml
index 7dfc0aa..d1849af 100644
--- a/slides/intro.ml
+++ b/slides/intro.ml
@@ -34,7 +34,7 @@ let slides = [
      <li><b>Dr. Thomas Gazagnaire</b>,
        <div style="font-size: 80%">
        CTO, OCamlPro.<br />
-       www: <a href="http://thomas.gazagnaire.org/">http://gazagnaire.org</a>&nbsp; &nbsp; twitter: <a href="http://twitter.com/samoht">samoht</a>
+       www: <a href="http://gazagnaire.org/">http://gazagnaire.org</a>&nbsp; &nbsp; twitter: <a href="http://twitter.com/samoht">samoht</a>
        </div>
      </li>
     </ul>
diff --git a/slides/miragep4.ml b/slides/miragep4.ml
index 2307b80..3fd12a5 100644
--- a/slides/miragep4.ml
+++ b/slides/miragep4.ml
@@ -29,9 +29,9 @@ let slides = [
   content= <:html<
     <h3>Why Syntax Extensions?</h3>
     <ul>
-     <li>Very convenient way to perform code-generation</li>
-     <li>OCaml has a comprehensive grammar extension mechanism</li>
-     <li>But integrating and composing them can be difficult</li>
+     <li>Very convenient way to perform code-generation.</li>
+     <li>OCaml has a comprehensive grammar extension mechanism.</li>
+     <li>But integrating and composing syntax extensions can be difficult.</li>
     </ul>
     <p>Mirage features a bundle that is always available, so you never need to worry about them working together or being available.</p>
   >>
@@ -41,17 +41,17 @@ let slides = [
   content = <:html<
     <h3>Web Syntax Extension</h3>
     <ul>
-      <li>Web expressions are written natively in Mirage (where they are called quotations)
+      <li>Web expressions are written natively in Mirage (where they are called quotations):
       <pre>let x = $html$&#60;h1>Hello&#60;/h1>World!$cl$</pre></li>
 
-       <li>This expands to (<tt>make %.pp.ml</tt>)
+       <li>This expands to (<tt>make %.pp.ml</tt>):
        <pre>
 let x = List.flatten [
   [ `El ((("", "h1"), []), [ `Data "Hello" ]) ];
   [ `Data "World!" ]
 ]</pre></li>
       
-      <li>HTML and XML quotations are compiled to <tt>xmlm</tt> expressions by the pre-processor</li>
+      <li>HTML and XML quotations are compiled to <tt>xmlm</tt> expressions by the pre-processor.</li>
     </ul> >>
 };
 {
@@ -59,15 +59,16 @@ let x = List.flatten [
   content = <:html<
     <h3>Web Syntax extensions</h3>
     <ul>
-      <li>One can use template-like (anti-quotations) to parametrize quotations
-      <pre>let x title = $html$&#60;h1>$dl$title$dl$&#60;/h1>content$cl$</pre>
-      This expands to
+      <li>One can use template-like (anti-quotations) to parameterize quotations:
+      <pre>let x title = $html$&#60;h1>$dl$title$dl$&#60;/h1>content$cl$</pre></li>
+
+      <li>This expands to:
       <pre>
 let x title = List.flatten
   [ [ `El ((("", "h1"), []), title) ];
     [ `Data "content" ] ]</pre></li>
       
-      <li>Typed templates
+      <li>Typed templates:
       <pre>
 let f (i : int) = $html$This is an int : $dl$int:i$dl$!$cl$
 let f (s : string) = $html$This is a string : $dl$string:s$dl$!$cl$</pre></li>
@@ -79,10 +80,10 @@ let f (s : string) = $html$This is a string : $dl$string:s$dl$!$cl$</pre></li>
   content = <:html<
     <h3>Web Syntax extensions</h3>
     <ul>
-    <li>CSS quotations (with nested declarations)
+    <li>CSS quotations (with nested declarations):
     <pre>let y = $css$ h1 {background-color: blue; a { color: red; } } } $cl$</pre></li>
 
-    <li>This expands to
+    <li>This expands to:
 <pre>
 let y = Cow.Css.unroll (
   Cow.Css.Props [