From fedaa31a82391cf56ea4aa1dec611c8b0cdf1276 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Mon, 22 Jun 2015 16:24:48 +0100 Subject: [PATCH] doc: quickstart.md fixup Fix line wrapping in quickstart.md so lines aren't deliberately cut off at particular points. Change-Id: Ie166c679b7036c850412be645fcc1fee65400b1b Signed-off-by: Maryam Tahhan Reviewed-by: TV Rao --- docs/quickstart.md | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) mode change 100644 => 100755 docs/quickstart.md diff --git a/docs/quickstart.md b/docs/quickstart.md old mode 100644 new mode 100755 index 5d71c77a..e6fb9b3d --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -8,28 +8,21 @@ Follow the [installation instructions] to install. ## Configure the `./conf/10_custom.conf` file -The supplied `10_custom.conf` file must be modified, as it contains -configuration items for which there are no reasonable default values. +The supplied `10_custom.conf` file must be modified, as it contains configuration items for which there are no reasonable default values. -The configuration items that can be added is not limited to the initial -contents. Any configuration item mentioned in any .conf file in `./conf` -directory can be added and that item will be overridden by the custom +The configuration items that can be added is not limited to the initial contents. Any configuration item mentioned in any .conf file in `./conf` directory can be added and that item will be overridden by the custom configuration value. ## Using a custom settings file -Alternatively a custom settings file can be passed to `vsperf` via the -`--conf-file` argument. +Alternatively a custom settings file can be passed to `vsperf` via the `--conf-file` argument. ```bash ./vsperf --conf-file ... ``` -Note that configuration passed in via the environment (`--load-env`) or via -another command line argument will override both the default and your custom -configuration files. This "priority hierarchy" can be described like so (1 = -max priority): +Note that configuration passed in via the environment (`--load-env`) or via another command line argument will override both the default and your custom configuration files. This "priority hierarchy" can be described like so (1 = max priority): 1. Command line arguments 2. Environment variables -- 2.16.6