Merge branch 'master' into from-stable

Conflicts:

	Create.c
	Manage.c

1 files changed, 4 insertions, 2 deletions

diff --git a/ReadMe.c b/ReadMe.c
index 3fae1930..12ed17f9 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -518,9 +518,11 @@ char Help_grow[] =
 "  --size=        -z   : Change the active size of devices in an array.\n"
 "                      : This is useful if all devices have been replaced\n"
 "                      : with larger devices.\n"
-"  --raid-disks=  -n   : Change the number of active devices in an array.\n"
-"                      : array.\n"
+"  --raid-devices= -n  : Change the number of active devices in an array.\n"
 "  --bitmap=      -b   : Add or remove a write-intent bitmap.\n"
+"  --backup-file= file : A file on a differt device to store data for a\n"
+"                      : short time while increasing raid-devices on a\n"
+"                      : RAID4/5/6 array. Not needed when a spare is present.\n"
 ;
 
 char Help_incr[] =