Merge pull request #83916 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)

Author: huypub

articles/active-directory/develop/msal-logging.md

@@ -66,7 +66,7 @@ class Program
                       .Build();
 
     AuthenticationResult result = application.AcquireTokenInteractive(scopes)
-                                             .ExecuteAsnc();
+                                             .ExecuteAsync().Result;
   }
  }
  ```

articles/active-directory/fundamentals/active-directory-faq.md

@@ -65,6 +65,7 @@ Additionally, Azure AD paid services like Enterprise Mobility + Security complem
 **Q: How do I leave a tenant when I am added as a collaborator?**
 
 **A:** When you are added to another organization's tenant as a collaborator, you can use the "tenant switcher" in the upper right to switch between tenants.  Currently, there is no way to leave the inviting organization, and Microsoft is working on providing this functionality.  Until this feature is available, you can ask the inviting organization to remove you from their tenant.
+
 ---
 **Q: How can I connect my on-premises directory to Azure AD?**
 

articles/analysis-services/analysis-services-scale-out.md

@@ -68,7 +68,7 @@ To learn more, see [Monitor server metrics](analysis-services-monitor.md).
 
 ### In Azure portal
 
-1. In the portal, click **Scale-out**. Use the slider to select the number of query replica servers. The number of replicas you choose is in addition to your existing server.
+1. In the portal, click **Scale-out**. Use the slider to select the number of query replica servers. The number of replicas you choose is in addition to your existing server.  
 
 2. In **Separate the processing server from the querying pool**, select yes to exclude your processing server from query servers. Client [connections](#connections) using the default connection string (without `:rw`) are redirected to replicas in the query pool. 
 
@@ -138,6 +138,10 @@ For SSMS, SSDT, and connection strings in PowerShell, Azure Function apps, and A
 
 ![Server names](media/analysis-services-scale-out/aas-scale-out-name.png)
 
+## Scale up \ down vs. Scale out
+
+You can change server's pricing tier on server with multiple replicas. The same pricing tier applies to all replicas. Scale up and scale down operation will first bring down all replicas all at once then bring up all replicas on the new pricing tier.
+
 ## Troubleshoot
 
 **Issue:** Users get error **Cannot find server '\<Name of the server>' instance in connection mode 'ReadOnly'.**

articles/azure-monitor/platform/template-workspace-configuration.md

@@ -181,7 +181,6 @@ The following template sample illustrates how to:
         "description": "Number of days of retention. Workspaces in the legacy Free pricing tier can only have 7 days."
       }
     },
-    {
     "immediatePurgeDataOn30Days": {
       "type": "bool",
       "metadata": {
@@ -565,4 +564,4 @@ The Azure quickstart template gallery includes several templates for Log Analyti
 
 * [Deploy Windows agent to Azure VMs using Resource Manager template](../../virtual-machines/extensions/oms-windows.md).
 
-* [Deploy Linux agent to Azure VMs using Resource Manager template](../../virtual-machines/extensions/oms-linux.md).
+* [Deploy Linux agent to Azure VMs using Resource Manager template](../../virtual-machines/extensions/oms-linux.md).

articles/backup/backup-instant-restore-capability.md

@@ -100,4 +100,4 @@ If the recovery type is “snapshot and vault”, restore will be automatically
 The new model does not allow deleting the restore point (Tier2) unless the snapshot (Tier1) is deleted. We recommend scheduling restore point (Tier2) retention period greater than the snapshot retention period.
 
 ### Why is my snapshot existing even after the set retention period in backup policy?
-If the recovery point has snapshot and that is the latest RP available, it is retained until the time there is a next successful backup. This is as per the designed GC policy today that mandates at least one latest RP to be always present in case all backups further on fail due to an issue in the VM. In normal scenarios, RPs are cleaned up in maximum of 24 hours after their expiry.
+If the recovery point has snapshot and that is the latest RP available, it is retained until the time there is a next successful backup. This is as per the designed "garbage collection" (GC) policy today that mandates at least one latest RP to be always present in case all backups further on fail due to an issue in the VM. In normal scenarios, RPs are cleaned up in maximum of 24 hours after their expiry.

articles/blockchain/service/connect-truffle.md

@@ -24,6 +24,8 @@ Truffle is a blockchain development environment you can use to connect to an Azu
 * [Create an Azure Blockchain member](create-member.md)
 * Install [Truffle](https://github.com/trufflesuite/truffle). Truffle requires several tools to be installed including [Node.js](https://nodejs.org), [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
 * Install [Python 2.7.15](https://www.python.org/downloads/release/python-2715/). Python is needed for Web3.
+* Install [Visual Studio Code](https://code.visualstudio.com/download).
+* Install [Visual Studio Code Solidity extension](https://marketplace.visualstudio.com/items?itemName=JuanBlanco.solidity).
 
 ## Create Truffle project
 
@@ -49,39 +51,52 @@ Truffle is a blockchain development environment you can use to connect to an Azu
     ```
 
     You may receive npm warnings during installation.
+    
+## Configure Truffle project
 
-1. Launch Truffle's interactive development console.
+To configure the Truffle project, you need some transaction node information from the Azure portal.
 
-    ``` bash
-    truffle develop
-    ```
+### Transaction node endpoint addresses
 
-    Truffle creates a local development blockchain and provides an interactive console.
+1. In the Azure portal, navigate to each transaction node and select **Transaction nodes > Connection strings**.
+1. Copy and save the endpoint URL from **HTTPS (Access key 1)** for each transaction node. You need the endpoint addresses for the smart contract configuration file later in the tutorial.
 
-## Connect to transaction node
+    ![Transaction endpoint address](./media/send-transaction/endpoint.png)
 
-Use *Web3* to connect to the transaction node. You can get the *Web3* connection string from the Azure portal.
+### Edit configuration file
 
-1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Navigate to your Azure Blockchain Service member. Select **Transaction nodes** and the default transaction node link.
+1. Launch Visual Studio Code and open the Truffle project directory folder using the **File > Open Folder** menu.
+1. Open the Truffle configuration file `truffle-config.js`.
+1. Replace the contents of the file with the following configuration information. Add a variable containing the endpoint address. Replace the angle bracket with values you collected from previous sections.
 
-    ![Select default transaction node](./media/connect-truffle/transaction-nodes.png)
+    ``` javascript
+    var defaultnode = "<default transaction node connection string>";   
+    var Web3 = require("web3");
+    
+    module.exports = {
+      networks: {
+        defaultnode: {
+          provider: new Web3.providers.HttpProvider(defaultnode),
+          network_id: "*"
+        }
+      }
+    }
+    ```
 
-1. Select **Sample Code > Web3**.
-1. Copy the JavaScript from **HTTPS (Access key 1)**. You need the code for Truffle's interactive development console.
+1. Save the changes to `truffle-config.js`.
 
-    ![Web3 code](./media/connect-truffle/web3-code.png)
+## Connect to transaction node
 
-1. Paste the JavaScript code from the previous step into the Truffle interactive development console. The code creates a web3 object that is connected to your Azure Blockchain Service transaction node.
+Use *Web3* to connect to the transaction node.
 
-    Example output:
+1. Use the Truffle console to connect to the default transaction node.
 
-    ```bash
-    truffle(develop)> var Web3 = require("Web3");
-    truffle(develop)> var provider = new Web3.providers.HttpProvider("https://myblockchainmember.blockchain.azure.com:3200/hy5FMu5TaPR0Zg8GxiPwned");
-    truffle(develop)> var web3 = new Web3(provider);
+    ``` bash
+    truffle console --network defaultnode
     ```
 
+    Truffle connects to the default transaction node and provides an interactive console.
+
     You can call methods on the **web3** object to interact with your transaction node.
 
 1. Call the **getBlockNumber** method to return the current block number.
@@ -93,7 +108,7 @@ Use *Web3* to connect to the transaction node. You can get the *Web3* connection
     Example output:
 
     ```bash
-    truffle(develop)> web3.eth.getBlockNumber();
+    truffle(defaultnode)> web3.eth.getBlockNumber();
     18567
     ```
 1. Exit the Truffle development console.
@@ -109,4 +124,4 @@ In this quickstart, you created a Truffle project to connect to your Azure Block
 Try the next tutorial to use Truffle to send a transaction to your consortium blockchain network.
 
 > [!div class="nextstepaction"]
-> [Send a transaction](send-transaction.md)
+> [Send a transaction](send-transaction.md)

articles/blockchain/service/send-transaction.md

@@ -68,31 +68,17 @@ You can continue with the tutorial while the nodes are being provisioned. When p
     cd truffledemo
     ```
 
-1. Launch Truffle's interactive development console.
+1. Use the Truffle console to connect to the default transaction node.
 
     ``` bash
-    truffle develop
+    truffle console --network defaultnode
     ```
 
-    Truffle creates a local development blockchain and provides an interactive console.
+    Truffle connects to the default transaction node and provides an interactive console.
 
 ## Create Ethereum account
 
-Use Web3 to connect to the default transaction node and create an Ethereum account. You can get the Web3 connection string from the Azure portal.
-
-1. In the Azure portal, navigate to the default transaction node and select **Transaction nodes > Sample code > Web3**.
-1. Copy the JavaScript from **HTTPS (Access key 1)**
-    ![Web3 sample code](./media/send-transaction/web3-code.png)
-
-1. Paste the Web3 JavaScript code for the default transaction node into the Truffle interactive development console. The code creates a Web3 object that is connected to your Azure Blockchain Service transaction node.
-
-    ```bash
-    truffle(develop)> var Web3 = require("Web3");
-    truffle(develop)> var provider = new Web3.providers.HttpProvider("https://myblockchainmember.blockchain.azure.com:3200/hy5FMu5TaPR0Zg8GxiPwned");
-    truffle(develop)> var web3 = new Web3(provider);
-    ```
-
-    You can call methods on the Web3 object to interact with your transaction node.
+Use Web3 to connect to the default transaction node and create an Ethereum account. You can call methods on the Web3 object to interact with your transaction node.
 
 1. Create a new account on the default transaction node. Replace the password parameter with your own strong password.
 
@@ -156,21 +142,21 @@ You can get the public key from the transaction node list. Copy the public key f
           })(),
     
           network_id: "*",
-          gas: 0,
           gasPrice: 0,
           from: myAccount
         },
         alpha: {
           provider: new Web3.providers.HttpProvider(alpha),
           network_id: "*",
-          gas: 0,
-          gasPrice: 0
         },
         beta: {
           provider: new Web3.providers.HttpProvider(beta),
           network_id: "*",
-          gas: 0,
-          gasPrice: 0
+        }
+      },
+      compilers: {
+        solc: {
+          evmVersion: "byzantium"
         }
       }
     }

articles/storage/blobs/storage-quickstart-blobs-powershell.md

@@ -35,7 +35,7 @@ Set the container name, then create the container by using [New-AzStorageContain
 
 ```powershell
 $containerName = "quickstartblobs"
-new-AzStoragecontainer -Name $containerName -Context $ctx -Permission blob
+New-AzStorageContainer -Name $containerName -Context $ctx -Permission blob
 ```
 
 ## Upload blobs to the container
@@ -48,13 +48,13 @@ The following examples upload *Image001.jpg* and *Image002.png* from the *D:\\_T
 
 ```powershell
 # upload a file
-set-AzStorageblobcontent -File "D:\_TestImages\Image001.jpg" `
+Set-AzStorageBlobContent -File "D:\_TestImages\Image001.jpg" `
   -Container $containerName `
   -Blob "Image001.jpg" `
   -Context $ctx 
 
 # upload another file
-set-AzStorageblobcontent -File "D:\_TestImages\Image002.png" `
+Set-AzStorageBlobContent -File "D:\_TestImages\Image002.png" `
   -Container $containerName `
   -Blob "Image002.png" `
   -Context $ctx
@@ -78,13 +78,13 @@ This example downloads the blobs to *D:\\_TestImages\Downloads* on the local dis
 
 ```powershell
 # download first blob
-Get-AzStorageblobcontent -Blob "Image001.jpg" `
+Get-AzStorageBlobContent -Blob "Image001.jpg" `
   -Container $containerName `
   -Destination "D:\_TestImages\Downloads\" `
   -Context $ctx 
 
 # download another blob
-Get-AzStorageblobcontent -Blob "Image002.png" `
+Get-AzStorageBlobContent -Blob "Image002.png" `
   -Container $containerName `
   -Destination "D:\_TestImages\Downloads\" `
   -Context $ctx

articles/storage/files/storage-how-to-create-file-share.md

@@ -80,7 +80,7 @@ To prepare to use PowerShell, download and install the Azure PowerShell cmdlets.
 
 3. **Create the file share**
     ```azurecli
-    az storage share create --name files --quota 2048 --connection-string $current_env_conn_string 1 > /dev/null
+    az storage share create --name files --quota 2048 --connection-string $current_env_conn_string > /dev/null
     ```
 
 ## Next steps