From 5c85dd22b46dc2191a930a2f8d678045c46ec0af Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Oct 2015 18:34:56 +0200
Subject: [PATCH] Update docs and changelog.

---
 CHANGELOG.asciidoc         |  2 ++
 README.asciidoc            |  1 +
 doc/help/settings.asciidoc | 15 +++++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ee59e0133..f4e5c29a0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -33,6 +33,8 @@ Added
   the URL should be affected by `:navigate increment/decrement`.
 - New `--target` argument to specify how URLs should be opened in an existing
   instance.
+- New setting `statusbar.url.fg.success.https` to set the foreground color for
+  the URL when a page was loaded via HTTPS.
 
 Changed
 ~~~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index 59363c9c5..4385ad1fb 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -155,6 +155,7 @@ Contributors, sorted by the number of commits in descending order:
 * Zach-Button
 * rikn00
 * Patric Schmitz
+* Nathan Isom
 * Martin Zimmermann
 * Error 800
 * Brian Jackson
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index b0e757957..2a8502bdd 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -197,7 +197,7 @@
 |<<colors-completion.item.selected.border.bottom,completion.item.selected.border.bottom>>|Bottom border color of the selected completion item.
 |<<colors-completion.match.fg,completion.match.fg>>|Foreground color of the matched text in the completion.
 |<<colors-statusbar.fg,statusbar.fg>>|Foreground color of the statusbar.
-|<<colors-statusbar.bg,statusbar.bg>>|Foreground color of the statusbar.
+|<<colors-statusbar.bg,statusbar.bg>>|Background color of the statusbar.
 |<<colors-statusbar.fg.error,statusbar.fg.error>>|Foreground color of the statusbar if there was an error.
 |<<colors-statusbar.bg.error,statusbar.bg.error>>|Background color of the statusbar if there was an error.
 |<<colors-statusbar.fg.warning,statusbar.fg.warning>>|Foreground color of the statusbar if there is a warning.
@@ -214,7 +214,8 @@
 |<<colors-statusbar.bg.caret-selection,statusbar.bg.caret-selection>>|Background color of the statusbar in caret mode with a selection
 |<<colors-statusbar.progress.bg,statusbar.progress.bg>>|Background color of the progress bar.
 |<<colors-statusbar.url.fg,statusbar.url.fg>>|Default foreground color of the URL in the statusbar.
-|<<colors-statusbar.url.fg.success,statusbar.url.fg.success>>|Foreground color of the URL in the statusbar on successful load.
+|<<colors-statusbar.url.fg.success,statusbar.url.fg.success>>|Foreground color of the URL in the statusbar on successful load (http).
+|<<colors-statusbar.url.fg.success.https,statusbar.url.fg.success.https>>|Foreground color of the URL in the statusbar on successful load (https).
 |<<colors-statusbar.url.fg.error,statusbar.url.fg.error>>|Foreground color of the URL in the statusbar on error.
 |<<colors-statusbar.url.fg.warn,statusbar.url.fg.warn>>|Foreground color of the URL in the statusbar when there's a warning.
 |<<colors-statusbar.url.fg.hover,statusbar.url.fg.hover>>|Foreground color of the URL in the statusbar for hovered links.
@@ -1662,7 +1663,7 @@ Default: +pass:[white]+
 
 [[colors-statusbar.bg]]
 === statusbar.bg
-Foreground color of the statusbar.
+Background color of the statusbar.
 
 Default: +pass:[black]+
 
@@ -1764,7 +1765,13 @@ Default: +pass:[${statusbar.fg}]+
 
 [[colors-statusbar.url.fg.success]]
 === statusbar.url.fg.success
-Foreground color of the URL in the statusbar on successful load.
+Foreground color of the URL in the statusbar on successful load (http).
+
+Default: +pass:[white]+
+
+[[colors-statusbar.url.fg.success.https]]
+=== statusbar.url.fg.success.https
+Foreground color of the URL in the statusbar on successful load (https).
 
 Default: +pass:[lime]+