Merge pull request #311988 from jlian/fix/proxy-and-gateway-cleanup

Fix duplicated steps in proxy guide and step ordering in gateway guide

Author: prmerger-automator[bot]

articles/iot-edge/how-to-configure-proxy-support.md

@@ -231,34 +231,6 @@ This step takes place once on the IoT Edge device during initial device setup.
     https_proxy = "<proxy URL>"
     ```
 
-3. Add the **https_proxy** parameter to the environment variables section, and set your proxy URL as its value.
-
-    ```toml
-    [agent]
-    name = "edgeAgent"
-    type = "docker"
-    
-    [agent.config]
-    image = "mcr.microsoft.com/azureiotedge-agent:1.5"
-    
-    [agent.env]
-    # RuntimeLogLevel = "debug"
-    # UpstreamProtocol = "AmqpWs"
-    https_proxy = "<proxy URL>"
-    ```
-
-4. The IoT Edge runtime uses AMQP by default to talk to IoT Hub. Some proxy servers block AMQP ports. If that's the case, then you also need to configure edgeAgent to use AMQP over WebSocket. Uncomment the `UpstreamProtocol` parameter.
-
-    ```toml
-    [agent.config]
-    image = "mcr.microsoft.com/azureiotedge-agent:1.5"
-    
-    [agent.env]
-    # RuntimeLogLevel = "debug"
-    UpstreamProtocol = "AmqpWs"
-    https_proxy = "<proxy URL>"
-    ```
-
 5. Save the changes and close the editor. Apply the changes.
 
    ```bash
@@ -328,7 +300,7 @@ With the environment variables included, the module definition looks like the fo
 }
 ```
 
-If you included the **UpstreamProtocol** environment variable in the config.yaml file on your IoT Edge device, add that to the IoT Edge agent module definition too.
+If you included the **UpstreamProtocol** environment variable in the config.toml file on your IoT Edge device, add that to the IoT Edge agent module definition too.
 
 ```json
 "env": {

articles/iot-edge/how-to-create-transparent-gateway.md

@@ -88,7 +88,6 @@ If you don't have your own certificate authority and want to use demo certificat
 
 1. Check the certificate meets [format requirements](how-to-manage-device-certificates.md#format-requirements).
 1. If you created the certificates on a different machine, copy them to your IoT Edge device. Use a USB drive, a service like [Azure Key Vault](/azure/key-vault/general/overview), or a command like [Secure file copy](https://www.ssh.com/ssh/scp/).
-1. Move the files to the preferred directory for certificates and keys: `/var/aziot/certs` for certificates and `/var/aziot/secrets` for keys.
 1. Create the certificates and keys directories and set permissions. Store your certificates and keys in the preferred `/var/aziot` directory: `/var/aziot/certs` for certificates and `/var/aziot/secrets` for keys.
 
    ```bash
@@ -101,6 +100,7 @@ If you don't have your own certificate authority and want to use demo certificat
    sudo chown aziotks:aziotks /var/aziot/secrets
    sudo chmod 700 /var/aziot/secrets
    ```
+1. Move the files to the preferred directory for certificates and keys: `/var/aziot/certs` for certificates and `/var/aziot/secrets` for keys.
 1. Change the ownership and permissions for the certificates and keys.
 
    ```bash
@@ -112,7 +112,7 @@ If you don't have your own certificate authority and want to use demo certificat
    # Give aziotks ownership to private keys
    # Read and write for aziotks, no permission for others
    sudo chown -R aziotks:aziotks /var/aziot/secrets
-    sudo find /var/aziot/secrets -type f -name "*.*" -exec chmod 600 {} \;
+   sudo find /var/aziot/secrets -type f -name "*.*" -exec chmod 600 {} \;
    ```
 
 # [IoT Edge for Linux on Windows](#tab/eflow)