[S] Change in flashrom[1.3.x]: cli, manpage: Clean up occurrences of old image argument

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/70326 )

Change subject: cli, manpage: Clean up occurrences of old image argument
......................................................................

cli, manpage: Clean up occurrences of old image argument

--include argument was introduced and replaced --image argument in
commit 45d50a101e8073191e6d88143990ed91d3bfe815

This patch cleans up remaining few places where old `--image`
argument was mentioned so that now all the documentation has
`--include`. --image is deprecated.

Both old --image and new --include have the same short version -i
and it remains the same. The code remains the same since the code
handles --include already.

Tested by running
flashrom -h
man ./flashrom.8.tmpl

Ticket: https://ticket.coreboot.org/issues/372

Original-Signed-off-by: Anastasia Klimchuk 
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/70003
Original-Reviewed-by: Edward O'Callaghan 
Original-Reviewed-by: Felix Singer 
Original-Tested-by: build bot (Jenkins) 
(cherry picked from commit 8274c6321ae2ff29bc9eb0de9dc32d289d3c2cc5)

Change-Id: If457e2b8548034868105b515125d7e8b4d5f6134
Signed-off-by: Evan Benn 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/70326
Tested-by: build bot (Jenkins) 
Reviewed-by: Anastasia Klimchuk 
Reviewed-by: David Hendricks 
Reviewed-by: Angel Pons 
---
M cli_classic.c
M flashrom.8.tmpl
2 files changed, 44 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  David Hendricks: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve
  Anastasia Klimchuk: Looks good to me, approved

diff --git a/cli_classic.c b/cli_classic.c
index 4649c73..4f4f074 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -71,8 +71,9 @@
           "      --fmap                        read ROM layout from fmap embedded in ROM\n"
           "      --fmap-file <fmapfile>        read ROM layout from fmap in <fmapfile>\n"
           "      --ifd                         read layout from an Intel Firmware Descriptor\n"
-	       " -i | --image <region>[:<file>]     only read/write image <region> from layout\n"
+	       " -i | --include <region>[:<file>]   only read/write image <region> from layout\n"
           "                                    (optionally with data from <file>)\n"
+	       "      --image <region>[:<file>]     deprecated, please use --include\n"
           " -o | --output <logfile>            log output to <logfile>\n"
           "      --flash-contents <ref-file>   assume flash contents to be <ref-file>\n"
           " -L | --list-supported              print supported devices\n"
@@ -613,7 +614,8 @@
    	{"ifd",			0, NULL, OPTION_IFD},
    	{"fmap",		0, NULL, OPTION_FMAP},
    	{"fmap-file",		1, NULL, OPTION_FMAP_FILE},
-		{"image",		1, NULL, 'i'},
+		{"image",		1, NULL, 'i'}, // (deprecated): back compatibility.
+		{"include",		1, NULL, 'i'},
    	{"flash-contents",	1, NULL, OPTION_FLASH_CONTENTS},
    	{"flash-name",		0, NULL, OPTION_FLASH_NAME},
    	{"flash-size",		0, NULL, OPTION_FLASH_SIZE},
diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl
index b977908..4bb9683 100644
--- a/flashrom.8.tmpl
+++ b/flashrom.8.tmpl
@@ -49,7 +49,7 @@
             (\fB--flash-name\fR|\fB--flash-size\fR|
              [\fB-E\fR|\fB-x\fR|\fB-r\fR <file>|\fB-w\fR <file>|\fB-v\fR <file>]
              [(\fB-l\fR <file>|\fB--ifd\fR|\fB --fmap\fR|\fB--fmap-file\fR <file>)
-               [\fB-i\fR <image>[:<file>]]]
+               [\fB-i\fR <include>[:<file>]]]
              [\fB--wp-status\fR] [\fB--wp-list\fR] [\fB--wp-enable\fR|\fB--wp-disable\fR]
              [\fB--wp-range\fR <start>,<length>|\fB--wp-region\fR <region>]
              [\fB-n\fR] [\fB-N\fR] [\fB-f\fR])]