Skip to content

Commit 0e8f52b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into fix-headings
2 parents 99d2625 + 6be230d commit 0e8f52b

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

articles/active-directory-domain-services/join-windows-vm.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,11 @@ With the VM created and an RDP connection establish, now let's join the Windows
150150
1. To complete the process to join to the Azure AD DS managed domain, restart the VM.
151151

152152
> [!TIP]
153-
> You can also domain-join a VM using PowerShell with the [Add-Computer][add-computer] cmdlet. The following example joins the *CONTOSO* domain and then restarts the VM. When prompted, enter the credentials for a user that belongs to the *Azure AD DC administrators* group:
153+
> You can domain-join a VM using PowerShell with the [Add-Computer][add-computer] cmdlet. The following example joins the *CONTOSO* domain and then restarts the VM. When prompted, enter the credentials for a user that belongs to the *Azure AD DC administrators* group:
154154
>
155155
> `Add-Computer -DomainName CONTOSO -Restart`
156+
>
157+
> To domain-join a VM without connecting to it and manually configuring the connection, you can also explore the use of the [Set-AzVmAdDomainExtension][set-azvmaddomainextension] Azure PowerShell cmdlet.
156158
157159
Once the Windows Server VM has restarted, any policies applied in the Azure AD DS managed domain are be pushed to the VM. You can also now sign in to the Windows Server VM using appropriate domain credentials.
158160

@@ -228,3 +230,4 @@ To administer your Azure AD DS managed domain, configure a management VM using t
228230
[add-computer]: /powershell/module/microsoft.powershell.management/add-computer
229231
[jit-access]: ../security-center/security-center-just-in-time.md
230232
[azure-bastion]: ../bastion/bastion-create-host-portal.md
233+
[set-azvmaddomainextension]: /powershell/module/az.compute/set-azvmaddomainextension

articles/cosmos-db/faq.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ Key/value (table), columnar, document, and graph data models are all natively su
2626

2727
Azure Cosmos DB has a schema agnostic indexing engine capable of automatically indexing all the data it ingests without requiring any schema or secondary indexes from the developer. The engine relies on a set of logical index layouts (inverted, columnar, tree) which decouple the storage layout from the index and query processing subsystems. Cosmos DB also has the ability to support a set of wire protocols and APIs in an extensible manner and translate them efficiently to the core data model (1) and the logical index layouts (2) making it uniquely capable of supporting more than one data model natively.
2828

29+
### Can I use multiple APIs to access my data?
30+
31+
Azure Cosmos DB is Microsoft's globally distributed, multi-model database service. Where multi-model means Azure Cosmos DB supports multiple APIs and multiple data models, different APIs use different data formats for storage and wire protocol. For example, SQL uses JSON, MongoDB uses BSON, Table uses EDM, Cassandra uses CQL, Gremlin uses GraphSON. As a result, we recommend using the same API for all access to the data in a given account.
32+
33+
Each API operates independently, except the Gremlin and SQL API, which are interoperable.
34+
2935
### Is Azure Cosmos DB HIPAA compliant?
3036

3137
Yes, Azure Cosmos DB is HIPAA-compliant. HIPAA establishes requirements for the use, disclosure, and safeguarding of individually identifiable health information. For more information, see the [Microsoft Trust Center](https://www.microsoft.com/en-us/TrustCenter/Compliance/HIPAA).

includes/virtual-machines-managed-disks-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ Every VM contains a temporary disk, which is not a managed disk. The temporary d
7272

7373
## Managed disk snapshots
7474

75-
A managed disk snapshot is a read-only crash-consistent full copy of a managed disk that is stored as a standard managed disk by default. With snapshots, you can back up your managed disks at any point in time. These snapshots exist independent of the source disk and can be used to create new managed disks. They are billed based on the used size. For example, if you create a snapshot of a managed disk with provisioned capacity of 64 GiB and actual used data size of 10 GiB, that snapshot is billed only for the used data size of 10 GiB.
75+
A managed disk snapshot is a read-only crash-consistent full copy of a managed disk that is stored as a standard managed disk by default. With snapshots, you can back up your managed disks at any point in time. These snapshots exist independent of the source disk and can be used to create new managed disks.
76+
77+
Snapshots are billed based on the used size. For example, if you create a snapshot of a managed disk with provisioned capacity of 64 GiB and actual used data size of 10 GiB, that snapshot is billed only for the used data size of 10 GiB. You can see the used size of your snapshots by looking at the [Azure usage report](https://docs.microsoft.com/en-us/azure/billing/billing-understand-your-bill). For example, if the used data size of a snapshot is 10 GiB, the usage report will show 10 GiB/(31 days x 24 hours) = 0.013441 GiB as the consumed quantity.
7678

7779
To learn more about how to create snapshots with managed disks, see the following resources:
7880

0 commit comments

Comments
 (0)