update docs

Signed-off-by: Jade Abraham <jade.abraham@hpe.com>

doc/rst/tools/chpl-language-server/chpl-language-server.rst

@@ -77,7 +77,7 @@ syntax highlighting in Emacs):
 
   (with-eval-after-load 'eglot
     (add-to-list 'eglot-server-programs
-                 '(chpl-mode . ("chpl-language-server"))))
+                 '(chpl-mode . ("chpl-language-server", "--chplcheck"))))
 
 This will enable using the language server with a particular ``.chpl`` file by
 calling ``M-x eglot``.
@@ -91,11 +91,8 @@ additionally add the following to your ``.emacs`` file:
 
 .. note::
 
-   There is currently a limitation with Eglot that only one language server can
-   be registered per language.  We are investigating merging the support for
-   :ref:`readme-chplcheck` such that both can be used in Emacs at the same time,
-   stay tuned!
-
+   The above uses the ``--chplcheck`` flag to enable additional diagnostics from
+   ``chplcheck``. If you do not want to use ``chplcheck``, you can remove this.
 
 Supported Features
 ------------------
@@ -191,6 +188,25 @@ The following features are extra visual aids:
 | Instantiations | instantiations of a generic function.      |                                       |
 +----------------+--------------------------------------------+---------------------------------------+
 
+Using ``chplcheck`` from ``CLS``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Although ``chplcheck`` is a separate tool from ``CLS``, it can be used from
+``CLS`` to provide additional diagnostics. This is done by enabling the
+``--chplcheck`` flag. This will incorporate the diagnostics and fixits from
+``chplcheck``.
+
+You can also still pass many of the same ``chplcheck`` flags to ``CLS``, just
+prefixed with ``--chplcheck-``. For example, the following command runs the
+language server with linting enabled various ``chplcheck`` flags:
+
+.. code-block:: bash
+
+   chpl-language-server --chplcheck \
+     --chplcheck-enable-rule UseExplicitModules \
+     --chplcheck-disable-rule UnusedLoopIndex \
+     --chplcheck-add-rules path/to/my/myrules.py
+
 Configuring Chapel Projects
 ---------------------------
 

doc/rst/tools/chplcheck/chplcheck.rst

@@ -168,13 +168,6 @@ additionally add the following to your ``.emacs`` file:
 
    (add-hook 'chpl-mode-hook 'eglot-ensure)
 
-.. note::
-
-   There is currently a limitation with Eglot that only one language server can
-   be registered per language.  We are investigating merging the support for
-   :ref:`readme-chpl-language-server` such that both can be used in Emacs at the
-   same time, stay tuned!
-
 
 
 Writing New Rules