Skip to content

Commit

Permalink
Merge a47eb6b into b651db8
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbrochart committed Dec 3, 2022
2 parents b651db8 + a47eb6b commit 4ab9f82
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions docs/userguide/deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ Running the launcher is very straightfoward:

.. code-block:: bash
asphalt run yourconfig.yaml [your-overrides.yml...] [--set path.to.key=val]
asphalt run [yourconfig.yaml your-overrides.yml...] [--set path.to.key=val]
Or alternatively:

python -m asphalt run yourconfig.yaml [your-overrides.yml...] [--set path.to.key=val]
python -m asphalt [run yourconfig.yaml your-overrides.yml...] [--set path.to.key=val]

What this will do is:

#. read all the given configuration files, starting from ``yourconfig.yaml``
#. read all the given configuration files, if any, starting from ``yourconfig.yaml``
#. read the command line configuration options passed with ``--set``, if any
#. merge the configuration files' contents and the command line configuration options into a single configuration dictionary using
:func:`~asphalt.core.utils.merge_config`.
Expand Down
4 changes: 2 additions & 2 deletions src/asphalt/core/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def main() -> None:
pass # pragma: no cover


@main.command(help="Read one or more configuration files and start the application.")
@click.argument("configfile", type=click.File(), nargs=-1, required=True)
@main.command(help="Read configuration files, pass configuration options, and start the application.")
@click.argument("configfile", type=click.File(), nargs=-1)
@click.option(
"--unsafe",
is_flag=True,
Expand Down

0 comments on commit 4ab9f82

Please sign in to comment.