Update help to match new documentation.

2 files changed, 23 insertions, 49 deletions

diff --git a/drakclassic b/drakclassic
index a7d7fad..0ddfb1a 100755
--- a/drakclassic
+++ b/drakclassic
@@ -137,11 +137,11 @@ drakclassic [options]
    --config <file>   use this configuration file to control the build
                      defaults to "config/build.cfg"
 
-   --settings <file> use this file as build settings (key=value format)
+   --settings <file> use this file as build settings (name=value format)
                      defaults to "config/settings.cfg"
 
-   --define key=value
-                     set setting "key" to "value"
+   --define name=value
+                     set setting "name" to "value"
                      takes precedence over values from a settings file
 
    --verbose <level>
@@ -165,35 +165,24 @@ Examples:
 
 =item B<--config>
 
-Makes drakclassic use the next argument as a configuration file.
-This file should contain a hash specifying the ISO makeup.
-See the "drakiso-classic" page on the Mageia Wiki for details.
+Makes B<drakclassic> use the next argument as a configuration file. This file
+should contain an associative array specifying the ISO composition. See
+L<https://wiki.mageia.org/en/drakclassic> for details.
 
 =item B<--settings>
 
-Makes drakclassic load the next argument as a file in key=value format into
-the $build->{settings} hash ($build being the global configuration hash).
-
-Built-in keys:
-
-  arch:       build architecture
-
-  workdir:    directory hosting urpmi root and all build files
-
-  repository: path to the Mandriva distribution repository (ftp/http/local)
-
-Example keys:
-  media
-  product
+Makes B<drakclassic> load the next argument as a file in name=value format into
+the $build->{settings} associative array ($build being the global configuration
+associative array). See L<https://wiki.mageia.org/en/drakclassic> for details.
 
 =back
 
 =head1 DESCRIPTION
 
-B<drakclassic> builds a classic installer ISO according to a configuration file,
-creates a master image, and optionally installs it on a device.
+B<drakclassic> builds a classic installer ISO according to a configuration
+file.
 
-See L<https://wiki.mageia.org/en/drakiso-classic>
+See L<https://wiki.mageia.org/en/drakclassic>
 
 =head1 AUTHORS
 
diff --git a/draklive2 b/draklive2
index 55dd070..d671e9c 100755
--- a/draklive2
+++ b/draklive2
@@ -169,11 +169,11 @@ draklive2 [options]
    --config <file>   use this configuration file to control the build
                      defaults to "config/build.cfg"
 
-   --settings <file> use this file as build settings (key=value format)
+   --settings <file> use this file as build settings (name=value format)
                      defaults to "config/settings.cfg"
 
-   --define key=value
-                     set setting "key" to "value"
+   --define name=value
+                     set setting "name" to "value"
                      takes precedence over values from a settings file
 
    --all-regions     proceed with all configured regions
@@ -196,38 +196,23 @@ Examples:
 
 =item B<--config>
 
-Makes draklive2 use the next argument as a configuration file.
-This file should contain a hash specifying the ISO makeup.
-See the "drakiso-live" page on the Mageia Wiki for details.
+Makes B<draklive2> use the next argument as a configuration file. This file
+should contain an associative array specifying the ISO composition. See
+L<https://wiki.mageia.org/en/draklive2> for details.
 
 =item B<--settings>
 
-Makes draklive2 load the next argument as a file in key=value format into
-the $build->{settings} hash ($build being the global configuration hash).
-
-Built-in keys:
-
-  arch:       build architecture
-
-  workdir:    directory hosting chrooted installation and all build files
-
-  region:     use the matching set of langs from the regions configuration hash
-
-  repository: path to the Mandriva distribution repository (ftp/http/local)
-
-Example keys:
-  desktop
-  media
-  product
+Makes B<draklive2> load the next argument as a file in name=value format into
+the $build->{settings} associative array ($build being the global configuration
+associative array). See L<https://wiki.mageia.org/en/draklive2> for details.
 
 =back
 
 =head1 DESCRIPTION
 
-B<draklive2> builds a live distribution ISO according to a configuration file,
-creates a master image, and optionally installs it on a device.
+B<draklive2> builds a live distribution ISO according to a configuration file.
 
-See L<https://wiki.mageia.org/en/drakiso-live>
+See L<https://wiki.mageia.org/en/draklive2>
 
 =head1 AUTHORS