Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr

Author: dagiro

articles/active-directory/devices/hybrid-azuread-join-plan.md

@@ -100,7 +100,9 @@ If your Windows 10 domain joined devices are [Azure AD registered](overview.md#g
 ### Additional considerations
 - If your environment uses virtual desktop infrastructure (VDI), see [Device identity and desktop virtualization](/azure/active-directory/devices/howto-device-identity-virtual-desktop-infrastructure).
 
-- Hybrid Azure AD join is supported for FIPS-compliant TPM 2.0 and not supported for TPM 1.2. If your devices have FIPS-compliant TPM 1.2, you must disable them before proceeding with Hybrid Azure AD join. Microsoft does not provide any tools for disabling FIPS mode for TPMs as it is dependent on the TPM manufacturer. Please contact your hardware OEM for support. Starting from Windows 10 1903 release, TPMs 1.2 are not used for hybrid Azure AD join and devices with those TPMs will be considered as if they don't have a TPM.
+- Hybrid Azure AD join is supported for FIPS-compliant TPM 2.0 and not supported for TPM 1.2. If your devices have FIPS-compliant TPM 1.2, you must disable them before proceeding with Hybrid Azure AD join. Microsoft does not provide any tools for disabling FIPS mode for TPMs as it is dependent on the TPM manufacturer. Please contact your hardware OEM for support. 
+
+- Starting from Windows 10 1903 release, TPMs 1.2 are not used with hybrid Azure AD join and devices with those TPMs will be considered as if they don't have a TPM.
 
 ## Review controlled validation of hybrid Azure AD join
 

articles/fxt-edge-filer/fxt-mount-clients.md

@@ -10,9 +10,9 @@ ms.author: rohogue
 
 # Tutorial: Mount the cluster
 
-This tutorial teaches you how to mount NFS clients to the Azure FXT Edge Filer cluster. Clients mount the virtual namespace paths that you assigned when you added back-end storage. 
+This tutorial teaches you how to mount NFS clients to the Azure FXT Edge Filer cluster. Clients mount the virtual namespace paths that you assigned when you added back-end storage.
 
-This tutorial teaches: 
+This tutorial teaches:
 
 > [!div class="checklist"]
 > * Strategies for load balancing clients across the range of client-facing IP addresses
@@ -25,7 +25,7 @@ This tutorial takes approximately 45 minutes to complete.
 
 Follow these steps to connect client machines to your Azure FXT Edge Filer cluster.
 
-1. Decide how to load-balance client traffic among your cluster nodes. Read [Balance client load](#balance-client-load), below, for details. 
+1. Decide how to load-balance client traffic among your cluster nodes. Read [Balance client load](#balance-client-load), below, for details.
 1. Identify the cluster IP address and junction path to mount.
 1. Determine the client-facing path for the mount.
 1. Issue the [mount command](#use-recommended-mount-command-options), with appropriate arguments.
@@ -36,67 +36,67 @@ To help balance client requests among all the nodes in the cluster, you should m
 
 To learn about round-robin DNS load balancing for the cluster, read [Configure DNS for the Azure FXT Edge Filer cluster](fxt-configure-network.md#configure-dns-for-load-balancing). To use this method you must maintain a DNS server, which is not explained in these articles.
 
-A simpler method for small installations is to use a script to assign IP addresses throughout the range at client mount time. 
+A simpler method for small installations is to use a script to assign IP addresses throughout the range at client mount time.
 
 Other load-balancing methods might be appropriate for large or complicated systems. Consult your Microsoft representative or open a [support request](fxt-support-ticket.md) for help. (Azure Load Balancer is currently *not supported* with Azure FXT Edge Filer.)
 
-## Create the mount command 
+## Create the mount command
 
-From your client, the ``mount`` command maps the virtual server (vserver) on the Azure FXT Edge Filer cluster to a path on the local filesystem. 
+From your client, the ``mount`` command maps the virtual server (vserver) on the Azure FXT Edge Filer cluster to a path on the local filesystem.
 
 The format is ``mount <FXT cluster path> <local path> {options}``
 
-There are three elements to the mount command: 
+There are three elements to the mount command:
 
 * cluster path - a combination of IP address and namespace junction path described below
-* local path - the path on the client 
+* local path - the path on the client
 * mount command options - (listed in [Use recommended mount command options](#use-recommended-mount-command-options))
 
 ### Create the cluster path
 
 The cluster path is a combination of the vserver *IP address* plus the path to a *namespace junction*. The namespace junction is a virtual path that you defined when you [added the storage system](fxt-add-storage.md#create-a-junction).
 
-For example, if you used ``/fxt/files`` as your namespace path, your clients would mount *IP_address*:/fxt/files to their local mount point. 
+For example, if you used ``/fxt/files`` as your namespace path, your clients would mount *IP_address*:/fxt/files to their local mount point.
 
 !["Add new junction" dialog with /avere/files in the namespace path field](media/fxt-mount/fxt-junction-example.png)
 
 The IP address is one of the client-facing IP addresses defined for the vserver. You can find the range of client-facing IPs in two places in the cluster Control Panel:
 
-* **VServers** table (Dashboard tab) - 
+* **VServers** table (Dashboard tab) -
 
   ![Dashboard tab of the Control Panel with the VServer tab selected in the data table below the graph, and the IP address section circled](media/fxt-mount/fxt-ip-addresses-dashboard.png)
 
-* **Client Facing Network** settings page - 
+* **Client Facing Network** settings page -
 
   ![Settings > VServer > Client Facing Network configuration page with a circle around the Address Range section of the table for a particular vserver](media/fxt-mount/fxt-ip-addresses-settings.png)
 
-Combine the IP address and the namespace path to form the cluster path for the mount command. 
+Combine the IP address and the namespace path to form the cluster path for the mount command.
 
 Example client mount command: ``mount 10.0.0.12:/sd-access /mnt/fxt {options}``
 
 ### Create the local path
 
-The local path for the mount command is up to you. You can set any path structure you want as part of the virtual namespace. Design a namespace and local path that is convenient for your client workflow. 
+The local path for the mount command is up to you. You can set any path structure you want as part of the virtual namespace. Design a namespace and local path that is convenient for your client workflow.
 
 For more information about the client-facing namespace, read the Cluster Configuration Guide's [namespace overview](https://azure.github.io/Avere/legacy/ops_guide/4_7/html/gns_overview.html).
 
 In addition to the paths, include the [mount command options](#use-recommended-mount-command-options) described below when mounting each client.
 
 ### Use recommended mount command options
 
-To ensure a seamless client mount, pass these settings and arguments in your mount command: 
+To ensure a seamless client mount, pass these settings and arguments in your mount command:
 
 ``mount -o hard,nointr,proto=tcp,mountproto=tcp,retry=30 ${VSERVER_IP_ADDRESS}:/${NAMESPACE_PATH} ${LOCAL_FILESYSTEM_MOUNT_POINT}``
 
 | Required settings | |
---- | --- 
-``hard`` | Soft mounts to the Azure FXT Edge Filer cluster are associated with application failures and possible data loss. 
+--- | ---
+``hard`` | Soft mounts to the Azure FXT Edge Filer cluster are associated with application failures and possible data loss.
 ``proto=netid`` | This option supports appropriate handling of NFS network errors.
 ``mountproto=netid`` | This option supports appropriate handling of network errors for mount operations.
 ``retry=n`` | Set ``retry=30`` to avoid transient mount failures. (A different value is recommended in foreground mounts.)
 
 | Preferred settings  | |
---- | --- 
+--- | ---
 ``nointr``            | If your clients use older OS kernels (before April 2008) that support this option, use it. The option "intr" is the default.
 
 ## Next steps
@@ -105,4 +105,4 @@ After you have mounted clients, you can test your workflow and get started with
 
 If you need to move data to a new cloud core filer, take advantage of the cache structure by using parallel data ingest. Some strategies are described in [Moving data to a vFXT cluster](https://docs.microsoft.com/azure/avere-vfxt/avere-vfxt-data-ingest). (Avere vFXT for Azure is a cloud-based product that uses caching technology very similar to the Azure FXT Edge Filer.)
 
-Read [Monitor Azure FXT Edge Filer hardware status](fxt-monitor.md) if you need to troubleshoot any hardware issues. 
+Read [Monitor Azure FXT Edge Filer hardware status](fxt-monitor.md) if you need to troubleshoot any hardware issues.

articles/fxt-edge-filer/index.yml

@@ -10,7 +10,7 @@ metadata:
   ms.topic: landing-page
   author: ronhogue
   ms.author: rohogue
-  ms.date: 03/11/2020 
+  ms.date: 03/20/2020 
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
 
@@ -41,15 +41,15 @@ landingContent:
           - text: 6 - Add back-end storage and configure the virtual namespace
             url: fxt-add-storage.md
           - text: 7 - Configure the cluster's network settings
-            url: fxt-configure-network.md            
+            url: fxt-configure-network.md
+          - text: Mount clients on the cluster
+            url: fxt-mount-clients.md
 
   # Card
   - title: Manage
     linkLists:
       - linkListType: how-to-guide
         links:
-          - text: Mount clients on the cluster
-            url: fxt-mount-clients.md
           - text: Monitor hardware status
             url: fxt-monitor.md
           - text: Safely power off hardware

articles/fxt-edge-filer/toc.yml

@@ -22,11 +22,11 @@
     href: fxt-add-storage.md
   - name: 7 - Configure the cluster's network settings
     href: fxt-configure-network.md
+  - name: 8 - Mount clients
+    href: fxt-mount-clients.md
 
 - name: How-to guides
   items:
-  - name: Mount clients 
-    href: fxt-mount-clients.md
   - name: Monitor the Azure FXT Edge Filer hardware
     href: fxt-monitor.md
   - name: Safely power off a hardware node