Merge branch '512-final-review-feedback' into ania-stage

content/cumulus-linux-510/Installation-Management/Installing-a-New-Cumulus-Linux-Image.md

@@ -259,7 +259,9 @@ cumulus@cumulus:~$ sudo onie-install -i http://203.0.113.10/image-installer -t /
 ```
 
 {{%notice note%}}
-When you stage an NVUE `startup.yaml` file, ZTP will still run after the new image is installed. To avoid this, use the `-z` option to specify a ZTP script that exists without taking any action, or disable ZTP after the new image is running with the `sudo ztp -d` or `nv action disable system ztp` commands.
+When you stage an NVUE `startup.yaml` file, ZTP still runs after the new image is installed. To prevent ZTP from running after the new image is installed, either:
+- Run the `sudo ztp -d` command to disable ZTP after the new image is running.
+- Use the `-z` option to specify an existing ZTP script that takes no action. For example, create a file called `/tmp/cumulus_ztp.sh` that contains the line `#!/bin/bash # CUMULUS-AUTOPROVISIONING` and specify `sudo onie-install -fa -i <image-path> -z /tmp/cumulus_ztp.sh -t /etc/nvue.d/startup.yaml`.
 {{%/notice%}}
 
 To activate the staged installation, use the `-a` option, then reboot the switch:

content/cumulus-linux-511/Installation-Management/Installing-a-New-Cumulus-Linux-Image.md

@@ -260,8 +260,8 @@ cumulus@cumulus:~$ sudo onie-install -i http://203.0.113.10/image-installer -t /
 
 {{%notice note%}}
 When you stage an NVUE `startup.yaml` file, ZTP still runs after the new image is installed. To prevent ZTP from running after the new image is installed, either:
-- Use the `-z` option to specify an existing ZTP script that takes no action.
 - Run the `sudo ztp -d` or `nv action disable system ztp` commands to disable ZTP after the new image is running.
+- Use the `-z` option to specify an existing ZTP script that takes no action. For example, create a file called `/tmp/cumulus_ztp.sh` that contains the line `#!/bin/bash # CUMULUS-AUTOPROVISIONING` and specify `sudo onie-install -fa -i <image-path> -z /tmp/cumulus_ztp.sh -t /etc/nvue.d/startup.yaml`.
 {{%/notice%}}
 
 To activate the staged installation, use the `-a` option, then reboot the switch:

content/cumulus-linux-512/Installation-Management/Installing-a-New-Cumulus-Linux-Image-with-ONIE.md

@@ -262,7 +262,6 @@ cumulus@cumulus:~$ sudo onie-install -i http://203.0.113.10/image-installer -t /
 When you stage an NVUE `startup.yaml` file, ZTP still runs after the new image is installed. To prevent ZTP from running after the new image is installed, either:
 - Run the `sudo ztp -d` or `nv action disable system ztp` commands to disable ZTP after the new image is running.
 - Use the `-z` option to specify an existing ZTP script that takes no action. For example, create a file called `/tmp/cumulus_ztp.sh` that contains the line `#!/bin/bash # CUMULUS-AUTOPROVISIONING` and specify `sudo onie-install -fa -i <image-path> -z /tmp/cumulus_ztp.sh -t /etc/nvue.d/startup.yaml`.
-
 {{%/notice%}}
 
 To activate the staged installation, use the `-a` option, then reboot the switch:

content/cumulus-linux-59/Installation-Management/Installing-a-New-Cumulus-Linux-Image.md

@@ -259,7 +259,9 @@ cumulus@cumulus:~$ sudo onie-install -i http://203.0.113.10/image-installer -t /
 ```
 
 {{%notice note%}}
-When you stage an NVUE `startup.yaml` file, ZTP will still run after the new image is installed. To avoid this, use the `-z` option to specify a ZTP script that exists without taking any action, or disable ZTP after the new image is running with the `sudo ztp -d` or `nv action disable system ztp` commands.
+When you stage an NVUE `startup.yaml` file, ZTP still runs after the new image is installed. To prevent ZTP from running after the new image is installed, either:
+- Run the `sudo ztp -d` command to disable ZTP after the new image is running.
+- Use the `-z` option to specify an existing ZTP script that takes no action. For example, create a file called `/tmp/cumulus_ztp.sh` that contains the line `#!/bin/bash # CUMULUS-AUTOPROVISIONING` and specify `sudo onie-install -fa -i <image-path> -z /tmp/cumulus_ztp.sh -t /etc/nvue.d/startup.yaml`.
 {{%/notice%}}
 
 To activate the staged installation, use the `-a` option, then reboot the switch: