From 73812c3e41c1c7fcf1705811f35ac4c9ccec003e Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Sun, 18 Aug 2019 18:28:58 +0100
Subject: Merge remote-tracking branch 'AlexeiDrake/master' into
 bugfix/c-lsp-build-dir-settings

---
 doc/ale-haskell.txt                       | 22 ++++++++++++++++++++++
 doc/ale-supported-languages-and-tools.txt |  1 +
 doc/ale.txt                               |  1 +
 3 files changed, 24 insertions(+)

(limited to 'doc')

diff --git a/doc/ale-haskell.txt b/doc/ale-haskell.txt
index e2073e37..5dd3ec15 100644
--- a/doc/ale-haskell.txt
+++ b/doc/ale-haskell.txt
@@ -12,6 +12,7 @@ g:ale_haskell_brittany_executable           *g:ale_haskell_brittany_executable*
 
   This variable can be changed to use a different executable for brittany.
 
+
 ===============================================================================
 floskell                                                 *ale-haskell-floskell*
 
@@ -22,6 +23,7 @@ g:ale_haskell_floskell_executable           *g:ale_haskell_floskell_executable*
 
   This variable can be changed to use a different executable for floskell.
 
+
 ===============================================================================
 ghc                                                           *ale-haskell-ghc*
 
@@ -32,6 +34,7 @@ g:ale_haskell_ghc_options                           *g:ale_haskell_ghc_options*
 
   This variable can be changed to modify flags given to ghc.
 
+
 ===============================================================================
 ghc-mod                                                   *ale-haskell-ghc-mod*
 
@@ -42,6 +45,7 @@ g:ale_haskell_ghc_mod_executable             *g:ale_haskell_ghc_mod_executable*
 
   This variable can be changed to use a different executable for ghc-mod.
 
+
 ===============================================================================
 cabal-ghc                                               *ale-haskell-cabal-ghc*
 
@@ -53,6 +57,7 @@ g:ale_haskell_cabal_ghc_options               *g:ale_haskell_cabal_ghc_options*
   This variable can be changed to modify flags given to ghc through cabal
   exec.
 
+
 ===============================================================================
 hdevtools                                               *ale-haskell-hdevtools*
 
@@ -87,6 +92,18 @@ g:ale_haskell_hfmt_executable                   *g:ale_haskell_hfmt_executable*
 
   This variable can be changed to use a different executable for hfmt.
 
+
+===============================================================================
+hindent                                                   *ale-haskell-hindent*
+
+g:ale_haskell_hindent_executable             *g:ale_haskell_hindent_executable*
+                                             *b:ale_haskell_hindent_executable*
+  Type: |String|
+  Default: `'hindent'`
+
+  This variable can be changed to use a different executable for hindent.
+
+
 ===============================================================================
 hlint                                                       *ale-haskell-hlint*
 
@@ -106,6 +123,7 @@ g:ale_haskell_hlint_options                       g:ale_haskell_hlint_options
   This variable can be used to pass extra options to the underlying hlint
   executable.
 
+
 ===============================================================================
 stack-build                                           *ale-haskell-stack-build*
 
@@ -117,6 +135,7 @@ g:ale_haskell_stack_build_options           *g:ale_haskell_stack_build_options*
   We default to using `'--fast'`. Since Stack generates binaries, your
   programs will be slower unless you separately rebuild them outside of ALE.
 
+
 ===============================================================================
 stack-ghc                                               *ale-haskell-stack-ghc*
 
@@ -128,6 +147,7 @@ g:ale_haskell_stack_ghc_options               *g:ale_haskell_stack_ghc_options*
   This variable can be changed to modify flags given to ghc through `stack
   ghc`
 
+
 ===============================================================================
 stylish-haskell                                   *ale-haskell-stylish-haskell*
 
@@ -139,6 +159,7 @@ g:ale_haskell_stylish_haskell_executable
 
   This variable can be changed to use a different executable for stylish-haskell.
 
+
 ===============================================================================
 hie                                                           *ale-haskell-hie*
 
@@ -150,5 +171,6 @@ g:ale_haskell_hie_executable                     *g:ale_haskell_hie_executable*
   This variable can be changed to use a different executable for the haskell
   ide engine. i.e. `'hie-wrapper'`
 
+
 ===============================================================================
   vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/doc/ale-supported-languages-and-tools.txt b/doc/ale-supported-languages-and-tools.txt
index 1a664450..37345f7b 100644
--- a/doc/ale-supported-languages-and-tools.txt
+++ b/doc/ale-supported-languages-and-tools.txt
@@ -183,6 +183,7 @@ Notes:
   * `hdevtools`
   * `hfmt`
   * `hie`
+  * `hindent`
   * `hlint`
   * `stack-build`!!
   * `stack-ghc`
diff --git a/doc/ale.txt b/doc/ale.txt
index 6d8c6a45..beca8546 100644
--- a/doc/ale.txt
+++ b/doc/ale.txt
@@ -2119,6 +2119,7 @@ documented in additional help files.
     cabal-ghc.............................|ale-haskell-cabal-ghc|
     hdevtools.............................|ale-haskell-hdevtools|
     hfmt..................................|ale-haskell-hfmt|
+    hindent...............................|ale-haskell-hindent|
     hlint.................................|ale-haskell-hlint|
     stack-build...........................|ale-haskell-stack-build|
     stack-ghc.............................|ale-haskell-stack-ghc|
-- 
cgit v1.2.3