Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add missing configuations in EditPreferencesInfo doc

Change-Id: If67e481fcfad5b5bccb29331256a8d40b325f85c
This commit is contained in:
David Pursehouse 2018-01-24 09:40:57 +09:00
commit 12f8f12034

View File

@ -2462,8 +2462,12 @@ Whether line numbers should be hidden.
Whether matching brackets should be highlighted.
|`line_wrapping` |not set if `false`|
Whether to enable line wrapping or not.
|`indent_with_tabs` |not set if `false`|
Whether to indent with tabs or not.
|`auto_close_brackets` |not set if `false`|
Whether brackets and quotes should be auto-closed during typing.
|`show_base` |not set if `false`|
Whether to show the inline edit base version or not.
|===========================================
[[email-info]]