From 56f104b5e71ffbf7219444f6e95d0ef8214803f7 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 14 Jun 2019 14:44:00 -0400
Subject: [PATCH] user guide: improve changelog handling

---
 doc/user_guide.md    | 2 +-
 rb/gen_user_guide.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/user_guide.md b/doc/user_guide.md
index fc25ff7..584f4db 100644
--- a/doc/user_guide.md
+++ b/doc/user_guide.md
@@ -653,4 +653,4 @@ ${include LICENSE.txt}
 
 # Change Log
 
-${include CHANGELOG.md}
+${changelog}
diff --git a/rb/gen_user_guide.rb b/rb/gen_user_guide.rb
index 085cda8..0fda2f8 100644
--- a/rb/gen_user_guide.rb
+++ b/rb/gen_user_guide.rb
@@ -55,7 +55,7 @@ class Generator
     end
 
     renderer = Redcarpet::Render::HTML.new
-    markdown = Redcarpet::Markdown.new(renderer)
+    @markdown_renderer = Redcarpet::Markdown.new(renderer)
     content = %[<h1>Table of Contents</h1>\n]
     @sections.each do |section|
       indent = section.number.split(".").size - 1
@@ -65,8 +65,10 @@ class Generator
     end
     @sections.each do |section|
       content += %[<a name="#{section.anchor}" />]
-      content += markdown.render(section.contents)
+      content += @markdown_renderer.render(section.contents)
     end
+    changelog = @markdown_renderer.render(File.read("CHANGELOG.md"))
+    content.gsub!("${changelog}", changelog)
 
     template = File.read("rb/assets/user_guide.html.erb")
     erb = ERB.new(template, nil, "<>")