aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ScintillaDoc.html10
-rw-r--r--doc/ScintillaHistory.html6
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index e21be5e6a..068dbdf9d 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -82,7 +82,7 @@
<h1>Scintilla Documentation</h1>
- <p>Last edited 16 October 2014 NH</p>
+ <p>Last edited 16 November 2014 NH</p>
<p>There is <a class="jump" href="Design.html">an overview of the internal design of
Scintilla</a>.<br />
@@ -3160,6 +3160,14 @@ struct Sci_TextToFind {
<td>Annotations are indented to match the text and are surrounded by a box.</td>
</tr>
+
+ <tr>
+ <th align="left"><code>ANNOTATION_INDENTED</code></th>
+
+ <td>3</td>
+
+ <td>Annotations are indented to match the text.</td>
+ </tr>
</tbody>
</table>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 61ed3b7bc..5be8e6b89 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -460,6 +460,8 @@
<td>Mat Berchtold</td>
<td>Michael Staszewski</td>
<td>Baurzhan Muftakhidinov</td>
+ </tr><tr>
+ <td>Erik Angelin</td>
</tr>
</table>
<p>
@@ -493,6 +495,10 @@
ensure no clash between the use of indicators for IME and for the application.
</li>
<li>
+ ANNOTATION_INDENTED added which is similar to ANNOTATION_BOXED in terms of positioning
+ but does not show a border.
+ </li>
+ <li>
VHDL folder fixes "block" keyword.
<a href="http://sourceforge.net/p/scintilla/bugs/1664/">Bug #1664</a>.
</li>