Getting rid of extra swap-space instructions

Author: cynthn

articles/virtual-machines/linux/create-upload-generic.md

@@ -228,37 +228,37 @@ The [Azure Linux Agent](../extensions/agent-linux.md) `waagent` provisions a Lin
    sudo systemctl enable cloud-init.service
    ```
 
+1. Swap: Do not create swap space on the OS disk.
 
-1. 7. Swap: Do not create swap space on the OS disk. 
+   The Azure Linux Agent or Cloud-init can be used to configure swap space using the local resource disk.  This resource disk is attached to the VM after provisioning on Azure. The local resource disk is a temporary disk, and might be emptied when the VM is deprovisioned. The following blocks show how to configure this swap.
 
-The Azure Linux Agent or Cloud-init can be used to configure swap space using the local resource disk.  This resource disk is attached to the VM after provisioning on Azure. The local resource disk is a temporary disk, and might be emptied when the VM is deprovisioned. The following blocks show how to configure this swap.
+   Azure Linux Agent 
+   Modify the following parameters in /etc/waagent.conf
 
-Azure Linux Agent 
-Modify the following parameters in /etc/waagent.conf
-    ```
-    ResourceDisk.Format=y
-    ResourceDisk.Filesystem=ext4
-    ResourceDisk.MountPoint=/mnt/resource
-    ResourceDisk.EnableSwap=y
-    ResourceDisk.SwapSizeMB=2048    ## NOTE: Set this to your desired size.
-    ```
+   ```
+   ResourceDisk.Format=y
+   ResourceDisk.Filesystem=ext4
+   ResourceDisk.MountPoint=/mnt/resource
+   ResourceDisk.EnableSwap=y
+   ResourceDisk.SwapSizeMB=2048    ## NOTE: Set this to your desired size.
+   ```
 
-Cloud-init
-Configure cloud-init to handle the provisioning:
+   Cloud-init
+   Configure cloud-init to handle the provisioning:
 
    ```bash
    sed -i 's/Provisioning.Agent=auto/Provisioning.Agent=cloud-auto/g' /etc/waagent.conf
    sed -i 's/ResourceDisk.Format=y/ResourceDisk.Format=n/g' /etc/waagent.conf
    sed -i 's/ResourceDisk.EnableSwap=y/ResourceDisk.EnableSwap=n/g' /etc/waagent.conf
    ```
 
-Configure Cloud-init to create swap.
+   Configure Cloud-init to create swap.
 
-To format and create swap you have 2 options either:
+   To format and create swap you have 2 options either:
 
-1. Pass this in as a cloud-init config every time you create a VM through `customdata`. This is the recommended method.
+   1. Pass this in as a cloud-init config every time you create a VM through `customdata`. This is the recommended method.
 
-2. Use a cloud-init directive baked into the image that will do this every time the VM is created.
+   2. Use a cloud-init directive baked into the image that will do this every time the VM is created.
 
    Create cfg file to configure swap using Cloud-init:
 
@@ -283,14 +283,6 @@ To format and create swap you have 2 options either:
     EOF
     ```
        
-2. Don't create swap space on the OS disk. The Azure Linux Agent can automatically configure swap space using the local resource disk that is attached to the VM after provisioning on Azure. The local resource disk is a temporary disk, and might be emptied when the VM is deprovisioned. After installing the Azure Linux Agent, modify the following parameters in /etc/waagent.conf as needed.
-    ```
-    ResourceDisk.Format=y
-    ResourceDisk.Filesystem=ext4
-    ResourceDisk.MountPoint=/mnt/resource
-    ResourceDisk.EnableSwap=y
-    ResourceDisk.SwapSizeMB=2048    ## NOTE: Set this to your desired size.
-    ```
 
 9.	Configure cloud-init to handle the provisioning:
     1. Configure waagent for cloud-init:
@@ -337,37 +329,6 @@ To format and create swap you have 2 options either:
          EOF
          ```
 
-10.	Swap configuration. Do not create swap space on the operating system disk.
-     Previously, the Azure Linux Agent automatically configured swap space by using the local resource disk that is attached to the virtual machine after the virtual machine is provisioned on Azure. However, this is now handled by cloud-init, you must not use the Linux Agent to format the resource disk create the swap file, modify the following parameters in /etc/waagent.conf appropriately:
-     ``` 
-     ResourceDisk.Format=n
-     ResourceDisk.EnableSwap=n
-     ```
-     If you want to mount, format and create swap you can either:
-        1. Pass this in as a cloud-init config every time you create a VM through `customdata`. This is the recommended method.
-        2. Use a cloud-init directive baked into the image that will do this every time the VM is created.
-           
-	```
-           echo 'DefaultEnvironment="CLOUD_CFG=/etc/cloud/cloud.cfg.d/00-azure-swap.cfg"' >> /etc/systemd/system.conf
-           cat > /etc/cloud/cloud.cfg.d/00-azure-swap.cfg << EOF
-           #cloud-config
-           # Generated by Azure cloud image build
-           disk_setup:
-             ephemeral0:
-               table_type: mbr
-               layout: [66, [33, 82]]
-               overwrite: True
-           fs_setup:
-             - device: ephemeral0.1
-               filesystem: ext4
-             - device: ephemeral0.2
-               filesystem: swap
-           mounts:
-             - ["ephemeral0.1", "/mnt"]
-             - ["ephemeral0.2", "none", "swap", "sw,nofail,x-systemd.requires=cloud-init.service,x-systemd.device-timeout=2", "0", "0"]
-           EOF
-	   
-         ```
 	
 1. Deprovision.
    > [!CAUTION]