Merge branch 'current' into beta

guides/cli.rst

@@ -20,7 +20,18 @@ ESPHome's command line interface always has the following format
 
     .. code-block:: console
 
-        esphome livingroom.yaml kitchen.yaml run
+    esphome livingroom.yaml kitchen.yaml run
+
+``--help`` Option
+--------------------
+
+.. option:: -h|--help
+
+    Output possible <commands> and [arguments].
+    Note: you can also use ``--help`` for any command to get arguments specific to that command.
+.. code-block:: console
+
+    esphome <some_command> --help
 
 ``--verbose`` Option
 --------------------
@@ -208,4 +219,3 @@ through a graphical user interface.
     If set, opens the dashboard UI in a browser once the server is up and running.
 
 
-

guides/getting_started_command_line.rst

@@ -187,6 +187,7 @@ After that, you will be able to access the dashboard through ``localhost:6052``.
 See Also
 --------
 
+- :doc:`cli`
 - :doc:`ESPHome index </index>`
 - :doc:`getting_started_hassio`
 - :ghedit:`Edit`