Merge remote-tracking branch 'zyedidia/master' into pm

[micro.git] / runtime / help / options.md

diff --git a/runtime/help/options.md b/runtime/help/options.md
index de3d5e9691fc16b8ab053476afd263aa197d59e5..db91fd04dc4fcf8d479bb6ab1ffb0d5477d9a99c 100644 (file)
--- a/runtime/help/options.md
+++ b/runtime/help/options.md
@@ -14,7 +14,7 @@ Here are the options that you can set:
 
        default value: `default`
        Note that the default colorschemes (default, solarized, and solarized-tc)
-       are not located in configDir, because they are embedded in the micro binary
+       are not located in configDir, because they are embedded in the micro binary.
 
        The colorscheme can be selected from all the files in the 
        ~/.config/micro/colorschemes/ directory. Micro comes by default with three
@@ -23,6 +23,11 @@ Here are the options that you can set:
     You can read more about micro's colorschemes in the `colors` help topic
     (`help colors`).
 
+* `colorcolumn`: if this is not set to 0, it will display a column at the specified
+   column. This is useful if you want column 80 to be highlighted special for example.
+
+       default value: `0`
+
 * `tabsize`: sets the tab size to `option`
 
        default value: `4`
@@ -31,6 +36,11 @@ Here are the options that you can set:
 
        default value: ` `
 
+* `infobar`: enables the line at the bottom of the editor where messages are printed.
+   This option is `global only`.
+
+       default value: `on`
+
 * `filetype`: sets the filetype for the current buffer. This setting is `local only`
 
     default value: this will be automatically set depending on the file you have open
@@ -92,7 +102,7 @@ Default plugin options:
 
        default value: `on`
 
-* `autoclose`: Automatically close `{}` `()` `[]` `""` `''`. Provided by the autoclose plugin
+* `autoclose`: Automatically close `{}` `()` `[]` `""` `''`. Provided by the `autoclose` plugin
 
        default value: `on`
 
@@ -123,16 +133,16 @@ In the `settings.json` file you can also put set options locally by specifying a
 Here is an example which has `tabstospaces` on for all files except Go files, and
 `tabsize` 4 for all files except Ruby files:
 
-```
+```json
 {
     "*.go": {
         "tabstospaces": false
     },
     "*.rb": {
         "tabsize": 2
-    }
+    },
     "tabstospaces": true,
-    "tabsize": 4,
+    "tabsize": 4
 }
 ```