From 61b17d3dc8ba74c508d7e60cd746e18b231b4f50 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Tue, 12 Apr 2016 03:02:34 -0500
Subject: [PATCH] Update History.markdown to reflect the cherry-pick of
 2b9e849.

---
 History.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.markdown b/History.markdown
index b7709ef1..f5bc23d6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
 
 ### Bug Fixes
 
+  * Cherry Pick: 2b9e849 into Master (Fix SSL options.)
   * Site Template: Added a default lang attribute (#4633)
   * Site template: Escape title and description where it is used in HTML (#4606)
   * Document#date: drafts which have no date should use source file mtime (#4611)
@@ -30,6 +31,7 @@
   * Ensures related_posts are only set for a post (#4620)
   * EntryFilter#special?: ignore filenames which begin with '~' (#4491)
   * Cleaner: `keep_files` should only apply to the beginning of paths, not substrings with index > 0 (#3849)
+  * Fix #4689: Use SSLEnable instead of EnableSSL and make URL HTTPS. (#4693)
 
 ### Development Fixes