Skip to content

Commit 0f49009

Browse files
authored
Merge pull request #203197 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 4b12f90 + be703e6 commit 0f49009

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

articles/confidential-ledger/overview.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: mbaldwin
1313

1414
Microsoft Azure confidential ledger (ACL) is a new and highly secure service for managing sensitive data records. It runs exclusively on hardware-backed secure enclaves, a heavily monitored and isolated runtime environment which keeps potential attacks at bay. Furthermore, Azure confidential ledger runs on a minimalistic Trusted Computing Base (TCB), which ensures that no one⁠—not even Microsoft⁠—is "above" the ledger.
1515

16-
As its name suggests, Azure confidential ledger utilizes the [Azure Confidential Computing platform](../confidential-computing/index.yml) and the [Confidential Consortium Framework](https://www.microsoft.com/research/project/confidential-consortium-framework) to provide a high integrity solution that is tamper-protected and evident. One ledger spans across three or more identical instances, each of which run in a dedicated, fully attested hardware-backed enclave. The ledger's integrity is maintained through a consensus-based blockchain.
16+
As its name suggests, Azure confidential ledger utilizes the [Azure Confidential Computing platform](../confidential-computing/index.yml) and the [Confidential Consortium Framework](https://ccf.dev) to provide a high integrity solution that is tamper-protected and evident. One ledger spans across three or more identical instances, each of which run in a dedicated, fully attested hardware-backed enclave. The ledger's integrity is maintained through a consensus-based blockchain.
1717

1818
Azure confidential ledger offers unique data integrity advantages, including immutability, tamper-proofing, and append-only operations. These features, which ensure that all records are kept intact, are ideal when critical metadata records must not be modified, such as for regulatory compliance and archival purposes.
1919

@@ -32,9 +32,9 @@ The confidential ledger is exposed through REST APIs which can be integrated int
3232

3333
## Ledger security
3434

35-
This section defines the security protections for the ledger. The ledger APIs use client certificate-based authentication. Currently, the ledger supports certificate-based authentication process with owner roles. We will be adding support for Azure Active Directory (AAD) based authentication and also role-based access (for example, owner, reader, and contributor).
35+
The ledger APIs support certificate-based authentication process with owner roles as well as Azure Active Directory (AAD) based authentication and also role-based access (for example, owner, reader, and contributor).
3636

37-
The data to the ledger is sent through TLS 1.2 connection and the TLS 1.2 connection terminates inside the hardware backed security enclaves (Intel® SGX enclaves). This ensures that no one can intercept the connection between a customer's client and the confidential ledger server nodes.
37+
The data to the ledger is sent through TLS 1.3 connection and the TLS 1.3 connection terminates inside the hardware backed security enclaves (Intel® SGX enclaves). This ensures that no one can intercept the connection between a customer's client and the confidential ledger server nodes.
3838

3939
### Ledger storage
4040

@@ -46,8 +46,7 @@ The Functional APIs allow direct interaction with your instantiated confidential
4646

4747
## Constraints
4848

49-
- Once a confidential ledger is created, you cannot change the ledger type.
50-
- Azure confidential ledger does not support standard Azure Disaster Recovery at this time. However, Azure confidential ledger offers built-in redundancy within the Azure region, as the confidential ledger runs on multiple independent nodes.
49+
- Once a confidential ledger is created, you cannot change the ledger type (private or public).
5150
- Azure confidential ledger deletion leads to a "hard delete", so your data will not be recoverable after deletion.
5251
- Azure confidential ledger names must be globally unique. Ledgers with the same name, irrespective of their type, are not allowed.
5352

@@ -56,9 +55,8 @@ The Functional APIs allow direct interaction with your instantiated confidential
5655
| Term | Definition |
5756
|--|--|
5857
| ACL | Azure confidential ledger |
59-
| Ledger | An immutable append record of transactions (also known as a Blockchain) |
60-
| Commit | A confirmation that a transaction has been locally committed to a node. A local commit by itself does not guarantee that a transaction is part of the ledger. |
61-
| Global commit | A confirmation that transaction was globally committed and is part of the ledger. |
58+
| Ledger | An immutable append-only record of transactions (also known as a Blockchain) |
59+
| Commit | A confirmation that a transaction has been appended to the ledger. |
6260
| Receipt | Proof that the transaction was processed by the ledger. |
6361

6462
## Next steps

articles/dns/private-dns-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure DNS Private Zones provide name resolution within a virtual network and bet
1717

1818
In this scenario, you have a virtual network in Azure that has many resources in it, including virtual machines. Your requirement is to resolve any resources in the virtual network using a specific domain name (DNS zone). You also need the naming resolution to be private and not accessible from the internet. Lastly, you need Azure to automatically register VMs into the DNS zone.
1919

20-
This scenario is shown below. We have a virtual network named "A" containing two VMs (VNETA-VM1 and VNETA-VM2). Each VM has a private IP associated. Once you've create a private zone, for example `contoso.com` and link virtual network "A" as a registration virtual network. Azure DNS will automatically create two A records in the zone referencing the two VMs. DNS queries from VNETA-VM1 can now resolve `VNETA-VM2.contoso.com` and will receive a DNS response that contains the private IP address of VNETA-VM2.
20+
This scenario is shown below. We have a virtual network named "A" containing two VMs (VNETA-VM1 and VNETA-VM2). Each VM has a private IP associated. Once you've created a private zone, for example, `contoso.com`, and link virtual network "A" as a registration virtual network, Azure DNS will automatically create two A records in the zone referencing the two VMs. DNS queries from VNETA-VM1 can now resolve `VNETA-VM2.contoso.com` and will receive a DNS response that contains the private IP address of VNETA-VM2.
2121
You can also do a reverse DNS query (PTR) for the private IP of VNETA-VM1 (10.0.0.1) from VNETA-VM2. The DNS response will contain the name VNETA-VM1, as expected.
2222

2323
![Single Virtual network resolution](./media/private-dns-scenarios/single-vnet-resolution.png)

articles/iot-hub-device-update/device-update-raspberry-pi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Here are two examples for the `du-config.json` and the `du-diagnostics-config.js
154154
ssh raspberrypi3 -l root
155155
```
156156

157-
1. Create or open the `du-config.jso` file for editing by using:
157+
1. Create or open the `du-config.json` file for editing by using:
158158

159159
```bash
160160
nano /adu/du-config.json

articles/service-bus-messaging/service-bus-faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ sections:
6060
6161
See the following table for the outbound TCP ports you need to open to use these protocols to communicate with Azure Service Bus:
6262
63-
| Protocol | Port | Details |
63+
| Protocol | Ports | Details |
6464
| -------- | ----- | ------- |
65-
| AMQP | 5671 | AMQP with TLS. See [AMQP protocol guide](service-bus-amqp-protocol-guide.md) |
65+
| AMQP | 5671, 5672 | AMQP with TLS. See [AMQP protocol guide](service-bus-amqp-protocol-guide.md) |
6666
| HTTPS | 443 | This port is used for the HTTP/REST API and for AMQP-over-WebSockets |
6767
6868
The HTTPS port is generally required for outbound communication also when AMQP is used over port 5671, because several management operations performed by the client SDKs and the acquisition of tokens from Azure Active Directory (when used) run over HTTPS.

articles/virtual-machines/windows/build-image-with-packer.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ $sp.AppId
5656
To authenticate to Azure, you also need to obtain your Azure tenant and subscription IDs with [Get-AzSubscription](/powershell/module/az.accounts/get-azsubscription):
5757

5858
```powershell
59-
Get-AzSubscription
59+
$subName = "mySubscriptionName"
60+
$sub = Get-AzSubscription -SubscriptionName $subName
6061
```
6162

6263

0 commit comments

Comments
 (0)