--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -1,4 +1,5 @@
 .. |(version)| replace:: 1.24
+.. -*- reStructuredText -*-
 
 =======
  Geany
@@ -178,12 +179,12 @@
 A possible location of the cache directory could be ``~/.cache/waf``. In order to make use of
 this, you first need to create this directory::
 
-	$ mkdir -p ~/.cache/waf
+    $ mkdir -p ~/.cache/waf
 
 then add the environment variable to your shell configuration (the following example is for
 Bash and should be adjusted to your used shell)::
 
-	export WAFCACHE=/home/username/.cache/waf
+    export WAFCACHE=/home/username/.cache/waf
 
 Remember to replace ``username`` with your actual username.
 
@@ -214,7 +215,7 @@
     $ ./configure --help
 
 or::
-	$ ./waf --help
+    $ ./waf --help
 
 (depending on which build system you use).
 
@@ -268,6 +269,9 @@
 
   Choose in your application menu of your used Desktop Environment:
   Development --> Geany.
+
+  At Windows-systems you will find Geany after installation inside
+  the application menu within its special folder.
 
 * From the command line:
 
@@ -782,9 +786,22 @@
 ^^^^^^^^^^^
 
 Geany allows each document to indent either with a tab character,
-multiple spaces or a combination of both. The default indent
-settings are set in `Editor Indentation preferences`_ (see the link
-for more information).
+multiple spaces or a combination of both. 
+
+The *Tabs* setting indents with one tab character per indent level, and 
+displays tabs as the indent width.
+
+The *Spaces* setting indents with the number of spaces set in the indent 
+width for each level.
+
+The *Tabs and Spaces* setting indents with spaces as above, then converts 
+as many spaces as it can to tab characters at the rate of one tab for 
+each multiple of the `Various preference` setting 
+*indent_hard_tab_width* (default 8) and displays tabs as the 
+*indent_hard_tab_width* value.
+
+The default indent settings are set in `Editor Indentation 
+preferences`_ (see the link for more information).
 
 The default settings can be overridden per-document using the
 Document menu. They can also be overridden by projects - see
@@ -826,7 +843,10 @@
 None
     Disables auto-indentation completely.
 Basic
-    Adds the same amount of whitespace on a new line as on the last line.
+    Adds the same amount of whitespace on a new line as on the previous line.
+    For the *Tabs* and the *Spaces* indent types the indentation will use the
+    same combination of characters as the previous line.  The
+    *Tabs and Spaces* indentation type converts as explained above.
 Current chars
     Does the same as *Basic* but also indents a new line after an opening
     brace '{', and de-indents when typing a closing brace '}'. For Python,
@@ -834,7 +854,10 @@
     previous line.
 Match braces
     Similar to *Current chars* but the closing brace will be aligned to
-    match the indentation of the line with the opening brace.
+    match the indentation of the line with the opening brace.  This 
+    requires the filetype to be one where Geany knows that the Scintilla 
+    lexer understands matching braces (C, C++, D, HTML, Pascal, Bash, 
+    Perl, TCL).
 
 There is also XML-tag auto-indentation. This is enabled when the
 mode is more than just Basic, and is also controlled by a filetype
@@ -2489,65 +2512,53 @@
 restart to take effect, and a few other will only affect newly opened or created
 documents before restart.
 
-================================  =========================================  ==========  ===========
-Key                               Description                                Default     Applies
-================================  =========================================  ==========  ===========
+================================  ===========================================  ==========  ===========
+Key                               Description                                  Default     Applies
+================================  ===========================================  ==========  ===========
 **Editor related**
-use_gtk_word_boundaries           Whether to look for the end of a word      true        to new
-                                  when using word-boundary related                       documents
+use_gtk_word_boundaries           Whether to look for the end of a word        true        to new
+                                  when using word-boundary related                         documents
                                   Scintilla commands (see `Scintilla
                                   keyboard commands`_).
-brace_match_ltgt                  Whether to highlight <, > angle brackets.  false       immediately
-complete_snippets_whilst_editing  Whether to allow completion of snippets    false       immediately
+brace_match_ltgt                  Whether to highlight <, > angle brackets.    false       immediately
+complete_snippets_whilst_editing  Whether to allow completion of snippets      false       immediately
                                   when editing an existing line (i.e. there
                                   is some text after the current cursor
                                   position on the line). Only used when the
                                   keybinding `Complete snippet` is set to
                                   ``Space``.
-show_editor_scrollbars            Whether to display scrollbars. If set to   true        immediately
+show_editor_scrollbars            Whether to display scrollbars. If set to     true        immediately
                                   false, the horizontal and vertical
                                   scrollbars are hidden completely.
-indent_hard_tab_width             The size of a tab character. Don't change  8           immediately
+indent_hard_tab_width             The size of a tab character. Don't change    8           immediately
                                   it unless you really need to; use the
                                   indentation settings instead.
 **Interface related**
-show_symbol_list_expanders        Whether to show or hide the small          true        to new
-                                  expander icons on the symbol list                      documents
+show_symbol_list_expanders        Whether to show or hide the small            true        to new
+                                  expander icons on the symbol list                        documents
                                   treeview.
-allow_always_save                 Whether files can be saved always, even    false       immediately
+allow_always_save                 Whether files can be saved always, even      false       immediately
                                   if they don't have any changes.
                                   By default, the Save button and menu
                                   item are disabled when a file is
                                   unchanged. When setting this option to
                                   true, the Save button and menu item are
                                   always active and files can be saved.
-compiler_tab_autoscroll           Whether to automatically scroll to the     true        immediately
+compiler_tab_autoscroll           Whether to automatically scroll to the       true        immediately
                                   last line of the output in the Compiler
                                   tab.
-statusbar_template                The status bar statistics line format.     See below.  immediately
-                                  (Search in src/ui_utils.c for details).
-new_document_after_close          Whether to open a new document after all   false       immediately
+statusbar_template                The status bar statistics line format.       See below.  immediately
+                                  (See `Statusbar Templates`_ for details).
+new_document_after_close          Whether to open a new document after all     false       immediately
                                   documents have been closed.
-msgwin_status_visible             Whether to show the Status tab in the      true        immediately
+msgwin_status_visible             Whether to show the Status tab in the        true        immediately
                                   Messages Window
-msgwin_compiler_visible           Whether to show the Compiler tab in the    true        immediately
+msgwin_compiler_visible           Whether to show the Compiler tab in the      true        immediately
                                   Messages Window
-msgwin_messages_visible           Whether to show the Messages tab in the    true        immediately
+msgwin_messages_visible           Whether to show the Messages tab in the      true        immediately
                                   Messages Window
-msgwin_scribble_visible           Whether to show the Scribble tab in the    true        immediately
+msgwin_scribble_visible           Whether to show the Scribble tab in the      true        immediately
                                   Messages Window
-================================  =========================================  ==========  ===========
-
-By default, statusbar_template is empty. This tells Geany to use its
-internal default, which is currently:
-
-``line: %l / %L\t col: %c\t sel: %s\t %w      %t      %mmode: %M      encoding: %e      filetype: %f      scope: %S``
-
-Note that ``\t`` = tab.
-
-================================  ===========================================  ==========  ===========
-Key                               Description                                  Default     Applies
-================================  ===========================================  ==========  ===========
 **VTE related**
 emulation                         Terminal emulation mode. Only change this    xterm       immediately
                                   if you have VTE termcap files other than
@@ -2609,6 +2620,43 @@
 
 The extract_filetype_regex has the default value GEANY_DEFAULT_FILETYPE_REGEX.
 
+Statusbar Templates
+```````````````````
+
+The default statusbar template is (note ``\t`` = tab):
+
+``line: %l / %L\t col: %c\t sel: %s\t %w      %t      %mmode: %M      encoding: %e      filetype: %f      scope: %S``
+
+Settings the preference to an empty string will also cause Geany to use this
+internal default.
+
+The following format characters are available for the statusbar template:
+
+============  ===========================================================
+Placeholder   Description
+============  ===========================================================
+  ``%l``      The current line number starting at 1
+  ``%L``      The total number of lines
+  ``%c``      The current column number starting at 0
+  ``%C``      The current column number starting at 1
+  ``%s``      The number of selected characters or if only whole lines
+              selected, the number of selected lines.
+  ``%w``      Shows ``RO`` when the document is in read-only mode,
+              otherwise shows whether the editor is in overtype (OVR)
+              or insert (INS) mode.
+  ``%t``      Shows the indentation mode, either tabs (TAB),
+              spaces (SP) or both (T/S).
+  ``%m``      Shows whether the document is modified (MOD) or nothing.
+  ``%M``      The name of the document's line-endings (ex. ``Unix (LF)``)
+  ``%e``      The name of the document's encoding (ex. UTF-8).
+  ``%f``      The filetype of the document (ex. None, Python, C, etc).
+  ``%S``      The name of the scope where the caret is located.
+  ``%p``      The caret position in the entire document starting at 0.
+  ``%r``      Shows whether the document is read-only (RO) or nothing.
+  ``%Y``      The Scintilla style number at the caret position. This is
+              useful if you're debugging color schemes or related code.
+============  ===========================================================
+
 Terminal (VTE) preferences
 ^^^^^^^^^^^^^^^^^^^^^^^^^^