diff --git a/examples/drag-and-drop-image-vector.html b/examples/drag-and-drop-image-vector.html
index f813a0e88c..69f58dca6f 100644
--- a/examples/drag-and-drop-image-vector.html
+++ b/examples/drag-and-drop-image-vector.html
@@ -32,7 +32,7 @@
 
         <div class="span4">
           <h4 id="title">Drag-and-Drop image vector example</h4>
-          <p id="shortdesc">Example of using the drag-and-drop interaction with a <code>ol.source.ImageVector</code>. Drag and drop GPX, GeoJSON, IGC, KML, or TopoJSON files on to the map. Each file is rendered to an image on the client.</p>
+          <p id="shortdesc">Example of using the drag-and-drop interaction with a ol.source.ImageVector. Drag and drop GPX, GeoJSON, IGC, KML, or TopoJSON files on to the map. Each file is rendered to an image on the client.</p>
           <div id="docs">
             <p>See the <a href="drag-and-drop-image-vector.js" target="_blank">drag-and-drop-image-vector.js source</a> to see how this is done.</p>
           </div>
diff --git a/examples/draw-features.html b/examples/draw-features.html
index 8a7014c428..52ffcc498c 100644
--- a/examples/draw-features.html
+++ b/examples/draw-features.html
@@ -32,7 +32,7 @@
 
         <div class="span12">
           <h4 id="title">Draw features example</h4>
-          <p id="shortdesc">Example of using the <code>ol.interaction.Draw</code> interaction.</p>
+          <p id="shortdesc">Example of using the ol.interaction.Draw interaction.</p>
           <form class="form-inline">
             <label>Geometry type &nbsp;</label>
               <select id="type">
diff --git a/examples/igc.html b/examples/igc.html
index 5fd0925a10..1aea0fe484 100644
--- a/examples/igc.html
+++ b/examples/igc.html
@@ -32,8 +32,9 @@
 
         <div class="span4">
           <h4 id="title">IGC example</h4>
-          <p id="shortdesc">Example of tracks recorded from multiple paraglider flights on the same day, read from an IGC file. The five tracks contain a total of 49,707 unique coordinates. Zoom in to see more detail. The background layer is from <a href="http://www.opencyclemap.org/">OpenCycleMap</a>.</p>
+          <p id="shortdesc">Example of tracks recorded from multiple paraglider flights on the same day, read from an IGC file.</p>
           <div id="docs">
+            <p>The five tracks contain a total of 49,707 unique coordinates. Zoom in to see more detail. The background layer is from <a href="http://www.opencyclemap.org/">OpenCycleMap</a>.</p>
             <p>See the <a href="igc.js" target="_blank">igc.js source</a> to see how this is done.</p>
           </div>
           <input id="time" type="range" value="0" steps="1"></input>
diff --git a/examples/localized-openstreetmap.html b/examples/localized-openstreetmap.html
index cdcc3b8f3a..9cbaa26f10 100644
--- a/examples/localized-openstreetmap.html
+++ b/examples/localized-openstreetmap.html
@@ -32,8 +32,9 @@
 
         <div class="span12">
           <h4 id="title">Localized OpenStreetMap example</h4>
-          <p id="shortdesc">Example of a localized OpenStreetMap map with a custom tile server and a custom attribution. The base layer is <a href="http://www.opencyclemap.org/">OpenCycleMap</a> with an overlay from <a href="http://www.openseamap.org/">OpenSeaMap</a>. The OpenSeaMap tile server does not support <a href="http://enable-cors.org/">CORS</a> headers.</p>
+          <p id="shortdesc">Example of a localized OpenStreetMap map with a custom tile server and a custom attribution.</p>
           <div id="docs">
+            <p>The base layer is <a href="http://www.opencyclemap.org/">OpenCycleMap</a> with an overlay from <a href="http://www.openseamap.org/">OpenSeaMap</a>. The OpenSeaMap tile server does not support <a href="http://enable-cors.org/">CORS</a> headers.</p>
             <p>See the <a href="localized-openstreetmap.js" target="_blank">localized-openstreetmap.js source</a> to see how this is done.</p>
           </div>
           <div id="tags">cors, localized-openstreetmap, openseamap, openstreetmap</div>
diff --git a/examples/static-image.html b/examples/static-image.html
index 9dc9142288..0386496bb7 100644
--- a/examples/static-image.html
+++ b/examples/static-image.html
@@ -32,8 +32,9 @@
 
         <div class="span12">
           <h4 id="title">Static image example</h4>
-          <p id="shortdesc">Example of a static image layer. Source: <a href="http://xkcd.com/256/">xkcd.com/256/</a></p>
+          <p id="shortdesc">Example of a static image layer.</p>
           <div id="docs">
+            <p>Source: <a href="http://xkcd.com/256/">xkcd.com/256/</a></p>
             <p>See the <a href="static-image.js" target="_blank">static-image.js source</a> to see how this is done.</p>
           </div>
           <div id="tags">static image, xkcd</div>
diff --git a/examples/tile-vector.html b/examples/tile-vector.html
index e6b7167c85..02784c351c 100644
--- a/examples/tile-vector.html
+++ b/examples/tile-vector.html
@@ -32,7 +32,7 @@
 
         <div class="span12">
           <h4 id="title">Tile vector example</h4>
-          <p id="shortdesc">Example of <a href="http://openstreetmap.us/~migurski/vector-datasource/">vector tiles from openstreetmap.us</a>.</p>
+          <p id="shortdesc">Example of vector tiles from openstreetmap.us.</p>
           <div id="docs">
             <p>See the <a href="tile-vector.js" target="_blank">tile-vector.js source</a> to see how this is done.</p>
           </div>
diff --git a/tasks/parse-examples.js b/tasks/parse-examples.js
index 361d489e6f..0def06131a 100644
--- a/tasks/parse-examples.js
+++ b/tasks/parse-examples.js
@@ -49,21 +49,25 @@ function parseExamples(examplePaths, callback) {
         tags: ''
       };
       var key;
+      var openTag;
       var parser = new Parser({
-        onopentag: function(name, attrs) {
+        onopentag: function(tag, attrs) {
           if (attrs.id in info) {
             key = attrs.id;
-          } else {
-            key = undefined;
+            openTag = tag;
           }
         },
         ontext: function(text) {
           if (key) {
-            info[key] = text.replace(/\n/g, '').trim();
+            info[key] += text.replace(/\n/g, '').trim() + ' ';
           }
         },
-        onclosetag: function(name) {
-          key = undefined;
+        onclosetag: function(tag) {
+          if (tag === openTag) {
+            info[key] = info[key].trim();
+            key = undefined;
+            openTag = undefined;
+          }
         },
         onerror: function(err2) {
           var message = 'Trouble parsing ' + examplePath + '\n' + err2.message;