From dbe7e35b1148c6304872198e4ee057671ea85f7f Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 26 Jun 2015 10:49:40 +1000
Subject: Added CodeMirror to list of editing components.

---
 doc/ScintillaRelated.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/ScintillaRelated.html b/doc/ScintillaRelated.html
index e0cd4f18b..6f31e5a56 100644
--- a/doc/ScintillaRelated.html
+++ b/doc/ScintillaRelated.html
@@ -454,6 +454,10 @@
     <h3>
        Editing Components
     </h3>
+    <p>
+       <a href="https://codemirror.net/">CodeMirror</a>
+       is a versatile text editor implemented in JavaScript for the browser.
+    </p>
     <p>
        <a href="http://www.soft-gems.net/index.php/controls/unicodeeditor-formerly-unicode-syntax-editor">UniCodeEditor</a>
        is a Unicode aware syntax editor control for Delphi and C++ Builder.
-- 
cgit v1.2.3


From ab8d99dbac66d427de3a0ffc750fa2fb411f0759 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 27 Jun 2015 13:18:18 +1000
Subject: Make documentation of SCI_MARKERENABLEHIGHLIGHT consistent.

---
 doc/ScintillaDoc.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 154747cc5..6e3bab3a6 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -3641,7 +3641,7 @@ struct Sci_TextToFind {
     colour)</a><br />
     <a class="message" href="#SCI_MARKERSETBACKSELECTED">SCI_MARKERSETBACKSELECTED(int markerNumber, int
     colour)</a><br />
-    <a class="message" href="#SCI_MARKERENABLEHIGHLIGHT">SCI_MARKERENABLEHIGHLIGHT(int enabled)</a><br />
+    <a class="message" href="#SCI_MARKERENABLEHIGHLIGHT">SCI_MARKERENABLEHIGHLIGHT(bool enabled)</a><br />
      <a class="message" href="#SCI_MARKERSETALPHA">SCI_MARKERSETALPHA(int markerNumber, int
     alpha)</a><br />
      <a class="message" href="#SCI_MARKERADD">SCI_MARKERADD(int line, int markerNumber)</a><br />
-- 
cgit v1.2.3