content: inline small .html directives

Now that the blog can handle Markdown,
minor HTML adjustments can be made directly
in the article files, so inline those instead of
using .html commands.

Change-Id: I5069f18ab98b38cdb8528ae2d5529abf06baf1ef
Reviewed-on: https://go-review.googlesource.com/c/blog/+/223600
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Andrew Bonventre <andybons@golang.org>

21 files changed, 61 insertions, 72 deletions

diff --git a/content/10years.article b/content/10years.article
index bcd4933..5c2d69a 100644
--- a/content/10years.article
+++ b/content/10years.article
@@ -20,9 +20,9 @@ the creator of the
 [Go gopher](https://blog.golang.org/gopher),
 painted this delightful scene:
 
-.html 10years/img1.html
+<a href="10years/gopher10th-large.jpg">
 .image 10years/gopher10th-small.jpg _ 850
-.html 10years/img2.html
+</a>
 
 Celebrating 10 years of Go makes me think back to early November 2009,
 when we were getting ready to share Go with the world.
@@ -129,6 +129,9 @@ On behalf of the entire Go team at Google,
 thank you to everyone who has joined us over the past decade.
 Let’s make the next one even more incredible!
 
-.html 10years/pin1.html
+<div>
+<center>
+<a href="10years/gopher10th-pin-large.jpg">
 .image 10years/gopher10th-pin-small.jpg _ 150
-.html 10years/pin2.html
+</center>
+</div>
diff --git a/content/10years/img1.html b/content/10years/img1.html
deleted file mode 100644
index ee36537..0000000
--- a/content/10years/img1.html
+++ /dev/null
@@ -1 +0,0 @@
-<a href="10years/gopher10th-large.jpg">
diff --git a/content/10years/img2.html b/content/10years/img2.html
deleted file mode 100644
index 937be08..0000000
--- a/content/10years/img2.html
+++ /dev/null
@@ -1 +0,0 @@
-</a>
diff --git a/content/10years/pin1.html b/content/10years/pin1.html
deleted file mode 100644
index 16b6211..0000000
--- a/content/10years/pin1.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-<center>
-<a href="10years/gopher10th-pin-large.jpg">
diff --git a/content/10years/pin2.html b/content/10years/pin2.html
deleted file mode 100644
index d591324..0000000
--- a/content/10years/pin2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-</center>
-</div>
diff --git a/content/7years.article b/content/7years.article
index e46cc37..2a1dae2 100644
--- a/content/7years.article
+++ b/content/7years.article
@@ -7,7 +7,7 @@ rsc@golang.org
 
 ##
 
-.html 7years/gopherbelly.html
+<img src="7years/gopherbelly300.jpg" align="right">
 
 Today marks seven years since we open-sourced our preliminary sketch of Go.
 With the help of the open source community, including more than a thousand
diff --git a/content/7years/gopherbelly.html b/content/7years/gopherbelly.html
deleted file mode 100644
index 021d550..0000000
--- a/content/7years/gopherbelly.html
+++ /dev/null
@@ -1 +0,0 @@
- <img src="7years/gopherbelly300.jpg" align="right">
diff --git a/content/experiment.article b/content/experiment.article
index 99390c8..ebe0282 100644
--- a/content/experiment.article
+++ b/content/experiment.article
@@ -18,9 +18,9 @@ This post discusses how we actually
 find and follow the path to Go 2.
 Here’s what the process looks like.
 
-.html experiment/div-indent.html
+<div style="margin-left: 2em;">
 .image experiment/expsimp1.png _ 179
-.html experiment/div-end.html
+</div>
 
 We experiment with Go as it exists now,
 to understand it better,
@@ -177,9 +177,9 @@ Of course, using it enables more experiments,
 and possibly more simplifying,
 and the process cycles on and on.
 
-.html experiment/div-indent.html
+<div style="margin-left: 2em;">
 .image experiment/expsimp2.png _ 326
-.html experiment/div-end.html
+</div>
 
 We shipped Go to all of you for the first time
 on November 10, 2009.
@@ -882,7 +882,7 @@ with the same backwards compatibility
 we did for the Go 1 libraries.
 Quoting [the Go FAQ](https://golang.org/doc/faq#get_version):
 
-.html experiment/div-quote.html
+<div style="margin-left: 2em; font-style: italic;">
 
 “Packages intended for public use should try to maintain backwards compatibility as they evolve.
 
@@ -892,7 +892,7 @@ add a new name instead of changing an old one.
 If a complete break is required,
 create a new package with a new import path.”
 
-.html experiment/div-end.html
+</div>
 
 This convention
 simplifies the overall experience of using a package
@@ -1030,18 +1030,18 @@ Suppose you are building your own program,
 and you need to have a configuration file,
 so you use version 2 of a popular Go YAML package:
 
-.html experiment/div-indent.html
+<div style="margin-left: 2em;">
 .image experiment/yamldeps1.png _ 214
-.html experiment/div-end.html
+</div>
 
 Now suppose your program
 imports the Kubernetes client.
 It turns out that Kubernetes uses YAML extensively,
 and it uses version 1 of the same popular package:
 
-.html experiment/div-indent.html
+<div style="margin-left: 2em;">
 .image experiment/yamldeps2.png _ 557
-.html experiment/div-end.html
+</div>
 
 Version 1 and version 2 have incompatible APIs,
 but they also have different import paths,
@@ -1059,9 +1059,9 @@ combined with package uniqueness,
 makes it impossible to build this program
 that you could build before:
 
-.html experiment/div-indent.html
+<div style="margin-left: 2em;">
 .image experiment/yamldeps3.png _ 450
-.html experiment/div-end.html
+</div>
 
 It took us a while to understand this problem,
 because we had been applying the
@@ -1072,12 +1072,12 @@ appreciate that convention better,
 and we gave it a name:
 the _import compatibility rule_:
 
-.html experiment/div-quote.html
+<div style="margin-left: 2em; font-style: italic;">
 
 “If an old package and a new package have the same import path,
 the new package must be backwards compatible with the old package.”
 
-.html experiment/div-end.html
+</div>
 
 **Go Modules**
 
@@ -1283,9 +1283,9 @@ extensible way and for making `go vet` even more helpful.
 
 ## Coda
 
-.html experiment/div-indent.html
+<div style="margin-left: 2em;">
 .image experiment/expsimp2.png _ 326
-.html experiment/div-end.html
+</div>
 
 So there’s the path to Go 2.
 We will experiment and simplify.
diff --git a/content/experiment/div-end.html b/content/experiment/div-end.html
deleted file mode 100644
index 04f5b84..0000000
--- a/content/experiment/div-end.html
+++ /dev/null
@@ -1 +0,0 @@
-</div>
diff --git a/content/experiment/div-indent.html b/content/experiment/div-indent.html
deleted file mode 100644
index 627d871..0000000
--- a/content/experiment/div-indent.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="margin-left: 2em;">
diff --git a/content/experiment/div-quote.html b/content/experiment/div-quote.html
deleted file mode 100644
index 191bfac..0000000
--- a/content/experiment/div-quote.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="margin-left: 2em; font-style: italic;">
diff --git a/content/go-brand.article b/content/go-brand.article
index e63a16e..4e2d937 100644
--- a/content/go-brand.article
+++ b/content/go-brand.article
@@ -33,7 +33,9 @@ pair well together.
 Our new logo went through an extensive design process. Here are some of the
 revisions we went through…
 
-.html go-brand/video.html
+<div><center>
+.iframe //www.youtube.com/embed/V4t-ymImW6c 315 560
+</center></div>
 
 ## New Brand Guide
 
diff --git a/content/go-brand/video.html b/content/go-brand/video.html
deleted file mode 100644
index 7ee1e9a..0000000
--- a/content/go-brand/video.html
+++ /dev/null
@@ -1 +0,0 @@
-<iframe width="560" height="315" src="https://www.youtube.com/embed/V4t-ymImW6c?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/content/gophercon2015.article b/content/gophercon2015.article
index 526859c..47b1245 100644
--- a/content/gophercon2015.article
+++ b/content/gophercon2015.article
@@ -13,7 +13,12 @@ more than 1,250 attendees—nearly double last year's number—and featured 22
 talks presented by Go community members.
 
 .image gophercon2015/cowboy.jpg _ 550
-.html gophercon2015/cowboy.caption
+
+<p>
+<small>The Cowboy Gopher (a toy given to each attendee) watches over the ranch.<br>
+<i>Photograph by <a href="https://twitter.com/nathany/status/619861336399351808">Nathan Youngman</a>. Gopher by Renee French.</i>
+</small>
+</p>
 
 Today the organizers have posted the videos online so you can now enjoy the
 conference from afar:
diff --git a/content/gophercon2015/cowboy.caption b/content/gophercon2015/cowboy.caption
deleted file mode 100644
index 3fb11d8..0000000
--- a/content/gophercon2015/cowboy.caption
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>
-<small>The Cowboy Gopher (a toy given to each attendee) watches over the ranch.<br>
-<i>Photograph by <a href="https://twitter.com/nathany/status/619861336399351808">Nathan Youngman</a>. Gopher by Renee French.</i>
-</small>
-</p>
diff --git a/content/survey2018-results.article b/content/survey2018-results.article
index f50eb46..de95d0b 100644
--- a/content/survey2018-results.article
+++ b/content/survey2018-results.article
@@ -8,7 +8,12 @@ tkulesza@google.com, spf@golang.org
 
 ## Thank you
 
-.html survey2018/style.html
+<style>
+    p.note {
+        font-size: 0.80em;
+        font-family: "Helvetica Neue", Arial, sans-serif; /* Helvetica on Mac aka sans-serif has broken U+2007 */
+    }
+</style>
 
 This post summarizes the results of our 2018 user survey and draws comparisons
 between the results of our prior surveys from [2016](https://blog.golang.org/survey2016-results)
@@ -121,7 +126,10 @@ which highlights three interesting bits:
 
 .image survey2018/fig6.svg _ 600
 .image survey2018/fig7.svg _ 600
-.html survey2018/reading.html
+
+<p class="note">
+    <i>Reading the data</i>: Participants could rank their top 5 languages. The color coding starts with dark blue for the top rank and lightens for each successive rank. These charts are sorted by the percentage of participants who ranked each language as their top choice.
+</p>
 
 ## Development domains
 
diff --git a/content/survey2018/reading.html b/content/survey2018/reading.html
deleted file mode 100644
index 0d313f5..0000000
--- a/content/survey2018/reading.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<p class="note">
-    <i>Reading the data</i>: Participants could rank their top 5 languages. The color coding starts with dark blue for the top rank and lightens for each successive rank. These charts are sorted by the percentage of participants who ranked each language as their top choice.
-</p>
-    
\ No newline at end of file
diff --git a/content/survey2018/style.html b/content/survey2018/style.html
deleted file mode 100644
index 71528f9..0000000
--- a/content/survey2018/style.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<style>
-    p.note {
-        font-size: 0.80em;
-        font-family: "Helvetica Neue", Arial, sans-serif; /* Helvetica on Mac aka sans-serif has broken U+2007 */
-    }
-</style>
\ No newline at end of file
diff --git a/content/toward-go2.article b/content/toward-go2.article
index 638ae2f..0c506af 100644
--- a/content/toward-go2.article
+++ b/content/toward-go2.article
@@ -16,32 +16,32 @@ On September 25, 2007, after Rob Pike, Robert Griesemer, and Ken
 Thompson had been discussing a new programming language for a few
 days, Rob suggested the name “Go.”
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/mail.png _ 446
-.html toward-go2/div-end.html
+</div>
 
 The next year, Ian Lance Taylor and I joined the team, and together
 the five of us built two compilers and a standard library, leading up
 to the [open-source release](https://opensource.googleblog.com/2009/11/hey-ho-lets-go.html) on November 10, 2009.
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/tweet.png _ 467
-.html toward-go2/div-end.html
+</div>
 
 For the next two years, with the help of the new Go open source
 community, we experimented with changes large and small, refining Go
 and leading to the [plan for Go 1](https://blog.golang.org/preview-of-go-version-1), proposed on October 5, 2011.
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/go1-preview.png _ 560
-.html toward-go2/div-end.html
+</div>
 
 With more help from the Go community, we revised and implemented that
 plan, eventually [releasing Go 1](https://blog.golang.org/go-version-1-is-released) on March 28, 2012.
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/go1-release.png _ 556
-.html toward-go2/div-end.html
+</div>
 
 The release of Go 1 marked the culmination of nearly five years of
 creative, frenetic effort that took us from a name and a list of ideas
@@ -170,9 +170,9 @@ consciously thought about it. Looking back, though, I think this is
 the basic outline of our work on Go, the process we've been following
 since the first prototype was running.
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/process.png _ 410
-.html toward-go2/div-end.html
+</div>
 
 Step 1 is to use Go, to accumulate experience with it.
 
@@ -210,9 +210,9 @@ Andrew Gerrand's GopherCon 2015 talk “[How Go was Made](https://www.youtube.co
 
 ## Explaining Problems
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/process2.png _ 410
-.html toward-go2/div-end.html
+</div>
 
 There are two parts to explaining a problem. The first part—the easier
 part—is stating exactly what the problem is. We developers are
@@ -231,9 +231,9 @@ not today.
 Let's look at an old example from 2011. Here is what I wrote about
 renaming os.Error to error.Value while we were planning Go 1.
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/error.png _ 495
-.html toward-go2/div-end.html
+</div>
 
 It begins with a precise, one-line statement of the problem: in very
 low-level libraries everything imports "os" for os.Error. Then there
@@ -460,9 +460,9 @@ After you've posted, please add the post to our new wiki page,
 
 ## Solutions
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/process34.png _ 410
-.html toward-go2/div-end.html
+</div>
 
 Now that we know how we're going to identify and explain problems that
 need to be solved, I want to note briefly that not all problems are
@@ -518,9 +518,9 @@ problems are best solved in the language.
 
 ## Shipping Go 2
 
-.html toward-go2/div-indent.html
+<div style="margin-left: 2em;">
 .image toward-go2/process5.png _ 410
-.html toward-go2/div-end.html
+</div>
 
 Finally, how will we ship and deliver Go 2?
 
diff --git a/content/toward-go2/div-end.html b/content/toward-go2/div-end.html
deleted file mode 100644
index 04f5b84..0000000
--- a/content/toward-go2/div-end.html
+++ /dev/null
@@ -1 +0,0 @@
-</div>
diff --git a/content/toward-go2/div-indent.html b/content/toward-go2/div-indent.html
deleted file mode 100644
index 627d871..0000000
--- a/content/toward-go2/div-indent.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="margin-left: 2em;">