Skip to content

Commit 403f99f

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into nsg
2 parents 16462f3 + 8c12b57 commit 403f99f

15 files changed

+106
-64
lines changed

articles/azure-databricks/TOC.yml

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,16 @@
3737
- name: Language guides
3838
items:
3939
- name: Python
40-
href: /azure/databricks/languages/python
41-
maintainContext: true
42-
- name: Koalas
43-
href: /azure/databricks/languages/koalas
44-
maintainContext: true
40+
items:
41+
- name: Python overview
42+
href: /azure/databricks/languages/python
43+
maintainContext: true
44+
- name: Koalas
45+
href: /azure/databricks/languages/koalas
46+
maintainContext: true
4547
- name: R
4648
items:
47-
- name: R guide
49+
- name: R overview
4850
href: /azure/databricks/spark/latest/sparkr/index
4951
maintainContext: true
5052
- name: SparkR overview
@@ -281,9 +283,6 @@
281283
- name: Databricks Runtime
282284
href: /azure/databricks/runtime/dbr
283285
maintainContext: true
284-
- name: Databricks Runtime with Conda
285-
href: /azure/databricks/runtime/conda
286-
maintainContext: true
287286
- name: Databricks Runtime for Machine Learning
288287
href: /azure/databricks/runtime/mlruntime
289288
maintainContext: true
@@ -307,6 +306,9 @@
307306
- name: Get workspace, cluster, notebook, and job identifiers
308307
href: /azure/databricks/workspace/workspace-details
309308
maintainContext: true
309+
- name: Migrate to per-workspace URLs
310+
href: /azure/databricks/workspace/migrate-workspace-urls
311+
maintainContext: true
310312
- name: Clusters
311313
items:
312314
- name: Clusters overview
@@ -452,9 +454,6 @@
452454
- name: Azure Data Lake Storage
453455
href: /azure/databricks/data/data-sources/azure/azure-datalake
454456
maintainContext: true
455-
- name: Azure Data Lake Storage credential passthrough
456-
href: /azure/databricks/data/data-sources/azure/adls-passthrough
457-
maintainContext: true
458457
- name: Cosmos DB
459458
href: /azure/databricks/data/data-sources/azure/cosmosdb-connector
460459
maintainContext: true
@@ -1027,7 +1026,7 @@
10271026
href: /azure/databricks/security/access-control/pool-acl
10281027
maintainContext: true
10291028
- name: Jobs access control
1030-
href: /azure/databricks/security/access-control/jobs-acl
1029+
href: /azure/databricks/security/access-control/job-acl
10311030
maintainContext: true
10321031
- name: Table access control
10331032
items:
@@ -1110,7 +1109,7 @@
11101109
- name: Provision users and groups using SCIM
11111110
href: /azure/databricks/administration-guide/users-groups/scim/index
11121111
maintainContext: true
1113-
- name: Configure SCIM provisioning for AAD
1112+
- name: Configure SCIM provisioning for Azure AD
11141113
href: /azure/databricks/administration-guide/users-groups/scim/aad
11151114
maintainContext: true
11161115
- name: Manage access control
@@ -1139,9 +1138,6 @@
11391138
- name: Conditional access
11401139
href: /azure/databricks/administration-guide/access-control/conditional-access
11411140
maintainContext: true
1142-
- name: Enable Azure Data Lake Storage credential passthrough
1143-
href: /azure/databricks/administration-guide/access-control/credential-passthrough
1144-
maintainContext: true
11451141
- name: Manage workspace objects and behavior
11461142
items:
11471143
- name: Manage workspaces overview
@@ -1619,21 +1615,35 @@
16191615
maintainContext: true
16201616
- name: Authentication
16211617
items:
1622-
- name: Personal access tokens
1618+
- name: Azure Databricks personal access tokens
16231619
href: /azure/databricks/dev-tools/api/latest/authentication
16241620
maintainContext: true
1625-
- name: Azure Active Directory (AAD) tokens
1621+
- name: Azure Active Directory tokens
16261622
items:
1627-
- name: AAD token authentication overview
1623+
- name: Azure AD token authentication overview
16281624
href: /azure/databricks/dev-tools/api/latest/aad/index
16291625
maintainContext: true
1630-
- name: Get an AAD token using the AAD Authentication Library
1626+
- name: Get an Azure AD token using the Azure AD Authentication Library
16311627
href: /azure/databricks/dev-tools/api/latest/aad/app-aad-token
16321628
maintainContext: true
1633-
- name: Get an AAD token using a service principal
1629+
- name: Get an Azure AD token using a service principal
16341630
href: /azure/databricks/dev-tools/api/latest/aad/service-prin-aad-token
16351631
maintainContext: true
1636-
- name: Troubleshoot AAD access tokens
1632+
- name: Troubleshoot Azure AD access tokens
1633+
href: /azure/databricks/dev-tools/api/latest/aad/troubleshoot-aad-token
1634+
maintainContext: true
1635+
- name: Azure Active Directory (Azure AD) tokens
1636+
items:
1637+
- name: Azure AD token authentication overview
1638+
href: /azure/databricks/dev-tools/api/latest/aad/index
1639+
maintainContext: true
1640+
- name: Get an Azure AD token using the AAD Authentication Library
1641+
href: /azure/databricks/dev-tools/api/latest/aad/app-aad-token
1642+
maintainContext: true
1643+
- name: Get an Azure AD token using a service principal
1644+
href: /azure/databricks/dev-tools/api/latest/aad/service-prin-aad-token
1645+
maintainContext: true
1646+
- name: Troubleshoot Azure AD access tokens
16371647
href: /azure/databricks/dev-tools/api/latest/aad/troubleshoot-aad-token
16381648
maintainContext: true
16391649
- name: Clusters
@@ -1666,7 +1676,7 @@
16661676
- name: SCIM API (Users)
16671677
href: /azure/databricks/dev-tools/api/latest/scim/scim-users
16681678
- name: SCIM API (Groups)
1669-
href: /azure/databricks/dev-tools/api/latest/scim/scim-groups
1679+
href: /azure/databricks/dev-tools/api/latest/scim/scim-group
16701680
maintainContext: true
16711681
- name: Secrets
16721682
href: /azure/databricks/dev-tools/api/latest/secrets
@@ -1760,6 +1770,9 @@
17601770
- name: Platform release notes
17611771
href: /azure/databricks/release-notes/product/index
17621772
maintainContext: true
1773+
- name: May 2020
1774+
href: /azure/databricks/release-notes/product/2020/may
1775+
maintainContext: true
17631776
- name: April 2020
17641777
href: /azure/databricks/release-notes/product/2020/april
17651778
maintainContext: true
@@ -1851,12 +1864,21 @@
18511864
- name: Runtime releases
18521865
href: /azure/databricks/release-notes/runtime/releases
18531866
maintainContext: true
1867+
- name: Databricks Runtime 7.0 Genomics (Beta)
1868+
href: /azure/databricks/release-notes/runtime/7.0genomics
1869+
maintainContext: true
18541870
- name: Databricks Runtime 7.0 ML (Beta)
18551871
href: /azure/databricks/release-notes/runtime/7.0ml
18561872
maintainContext: true
18571873
- name: Databricks Runtime 7.0 (Beta)
18581874
href: /azure/databricks/release-notes/runtime/7.0
18591875
maintainContext: true
1876+
- name: Databricks Runtime 6.6 Genomics (Beta)
1877+
href: /azure/databricks/release-notes/runtime/6.6genomics
1878+
maintainContext: true
1879+
- name: Databricks Runtime 6.6 (Beta)
1880+
href: /azure/databricks/release-notes/runtime/6.6
1881+
maintainContext: true
18601882
- name: Databricks Runtime 6.5
18611883
href: /azure/databricks/release-notes/runtime/6.5
18621884
maintainContext: true
@@ -1902,27 +1924,18 @@
19021924
- name: Databricks Runtime 6.0
19031925
href: /azure/databricks/release-notes/runtime/6.0
19041926
maintainContext: true
1905-
- name: Databricks Runtime 6.0 with Conda
1906-
href: /azure/databricks/release-notes/runtime/6.0conda
1907-
maintainContext: true
19081927
- name: Databricks Runtime 6.0 ML
19091928
href: /azure/databricks/release-notes/runtime/6.0ml
19101929
maintainContext: true
19111930
- name: Databricks Runtime 5.5
19121931
href: /azure/databricks/release-notes/runtime/5.5
19131932
maintainContext: true
1914-
- name: Databricks Runtime 5.5 with Conda
1915-
href: /azure/databricks/release-notes/runtime/5.5conda
1916-
maintainContext: true
19171933
- name: Databricks Runtime 5.5 ML
19181934
href: /azure/databricks/release-notes/runtime/5.5ml
19191935
maintainContext: true
19201936
- name: Databricks Runtime 5.4
19211937
href: /azure/databricks/release-notes/runtime/5.4
19221938
maintainContext: true
1923-
- name: Databricks Runtime 5.4 with Conda
1924-
href: /azure/databricks/release-notes/runtime/5.4conda
1925-
maintainContext: true
19261939
- name: Databricks Runtime 5.4 ML
19271940
href: /azure/databricks/release-notes/runtime/5.4ml
19281941
maintainContext: true
@@ -1938,21 +1951,12 @@
19381951
- name: Databricks Runtime 5.2
19391952
href: /azure/databricks/release-notes/runtime/5.2
19401953
maintainContext: true
1941-
- name: Databricks Runtime 5.2 ML
1942-
href: /azure/databricks/release-notes/runtime/5.2ml
1943-
maintainContext: true
19441954
- name: Databricks Runtime 5.1
19451955
href: /azure/databricks/release-notes/runtime/5.1
19461956
maintainContext: true
1947-
- name: Databricks Runtime 5.1 ML
1948-
href: /azure/databricks/release-notes/runtime/5.1ml
1949-
maintainContext: true
19501957
- name: Databricks Runtime 5.0
19511958
href: /azure/databricks/release-notes/runtime/5.0
19521959
maintainContext: true
1953-
- name: Databricks Runtime 5.0 ML
1954-
href: /azure/databricks/release-notes/runtime/5.0ml
1955-
maintainContext: true
19561960
- name: Databricks Runtime 4.3
19571961
href: /azure/databricks/release-notes/runtime/4.3
19581962
maintainContext: true
@@ -1962,9 +1966,6 @@
19621966
- name: Databricks Runtime 4.1
19631967
href: /azure/databricks/release-notes/runtime/4.1
19641968
maintainContext: true
1965-
- name: Databricks Runtime 4.1 ML
1966-
href: /azure/databricks/release-notes/runtime/4.1ml
1967-
maintainContext: true
19681969
- name: Databricks Runtime 4.0
19691970
href: /azure/databricks/release-notes/runtime/4.0
19701971
maintainContext: true

articles/key-vault/general/about-keys-secrets-certificates.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Refer to the JOSE specifications for relevant data types for keys, encryption, a
4242

4343
Objects stored in Key Vault are versioned whenever a new instance of an object is created. Each version is assigned a unique identifier and URL. When an object is first created, it's given a unique version identifier and marked as the current version of the object. Creation of a new instance with the same object name gives the new object a unique version identifier, causing it to become the current version.
4444

45-
Objects in Key Vault can be addressed using the current identifier or a version-specific identifier. For example, given a Key with the name `MasterKey`, performing operations with the current identifier causes the system to use the latest available version. Performing operations with the version-specific identifier causes the system to use that specific version of the object.
45+
Objects in Key Vault can be addressed by specifing a version or by omitting version for operations on current version of the object. For example, given a Key with the name `MasterKey`, performing operations without specifing a version causes the system to use the latest available version. Performing operations with the version-specific identifier causes the system to use that specific version of the object.
4646

4747
Objects are uniquely identified within Key Vault using a URL. No two objects in the system have the same URL, regardless of geo-location. The complete URL to an object is called the Object Identifier. The URL consists of a prefix that identifies the Key Vault, object type, user provided Object Name, and an Object Version. The Object Name is case-insensitive and immutable. Identifiers that don't include the Object Version are referred to as Base Identifiers.
4848

@@ -58,7 +58,7 @@ Where:
5858
|-|-|
5959
|`keyvault-name`|The name for a key vault in the Microsoft Azure Key Vault service.<br /><br /> Key Vault names are selected by the user and are globally unique.<br /><br /> Key Vault name must be a 3-24 character string, containing only 0-9, a-z, A-Z, and -.|
6060
|`object-type`|The type of the object, "keys", "secrets", or 'certificates'.|
61-
|`object-name`|An `object-name` is a user provided name for and must be unique within a Key Vault. The name must be a 1-127 character string, containing only 0-9, a-z, A-Z, and -.|
61+
|`object-name`|An `object-name` is a user provided name for and must be unique within a Key Vault. The name must be a 1-127 character string, starting with a letter and containing only 0-9, a-z, A-Z, and -.|
6262
|`object-version`|An `object-version` is a system-generated, 32 character string identifier that is optionally used to address a unique version of an object.|
6363

6464
## Next steps
@@ -67,4 +67,4 @@ Where:
6767
- [About secrets](../secrets/about-secrets.md)
6868
- [About certificates](../certificates/about-certificates.md)
6969
- [Authentication, requests, and responses](../general/authentication-requests-and-responses.md)
70-
- [Key Vault Developer's Guide](../general/developers-guide.md)
70+
- [Key Vault Developer's Guide](../general/developers-guide.md)

articles/key-vault/general/group-permissions-for-apps.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ Id : 1cef38c4-388c-45a9-b5ae-3d88375e166a
104104
...
105105
```
106106

107+
> [!WARNING]
108+
> Azure Ad Groups does not support Managed Identities. Only service and user principals are supported.
109+
107110
#### Users
108111

109112
You can also add an individual user to an key vault's access control policy. **We do not recommend this.** We instead encourage you to add users to an Azure AD group, and add the group on the policies.

articles/spatial-anchors/concepts/anchor-relationships-way-finding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ You can continue this procedure for more anchors and more sessions over time.
6868

6969
### Verify anchor connections
7070

71-
The app can verify that two anchors are connected by issuing a query for nearby anchors. When the query's result contains the target anchor, the anchor connection is verified. If the anchors aren't connected, the app can try to connect them again.
71+
The app can verify that two anchors are connected by issuing a query for nearby anchors, which you do by setting the `NearAnchorCriteria` on a `CloudSpatialAnchorWatcher`. When the query's result contains the target anchor, the anchor connection is verified. If the anchors aren't connected, the app can try to connect them again.
7272

7373
Here are some reasons why anchors might fail to connect:
7474

articles/spatial-anchors/concepts/guidelines-effective-anchor-experiences.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ ms.service: azure-spatial-anchors
1313

1414
# Create an effective anchor experience by using Azure Spatial Anchors
1515

16-
This article provides guidelines and considerations to help you effectively create and locate anchors by using Spatial Anchors.
16+
This article provides guidelines and considerations to help you effectively create and locate anchors by using Azure Spatial Anchors.
17+
18+
## Anchor improvement over time
19+
20+
With Azure Spatial Anchors, each time you locate anchors, we attempt to improve the quality of future locate operations. We do this by using the environment data collected to augment the visual information on the anchors we are looking for. This process runs under the hood and is an offline optimization run by the Azure Spatial Anchors service to optimize for your environment. The additional data gathered during each operation builds a stronger understanding of the environment. This improves quality and allows you to better locate anchors through environment change, time passing, and for users looking at anchors from different angles and perspectives.
1721

1822
## Good anchors
1923

20-
Spatial Anchors helps you create good anchors. It's important to invest time in either educating or guiding users in your user experience (UX) to create good anchors. By investing in creating good anchors up front, you help end users to reliably find anchors:
24+
While Azure Spatial Anchors does attempt to improve the quality of anchors over time, it is also important to invest time in either educating or guiding users in your user experience (UX) to create good anchors. By investing in creating good anchors up front, you help end users to reliably find anchors:
2125

2226
- Across different devices.
2327
- At various times.
@@ -96,7 +100,7 @@ Visual tracking systems rely on the visual features in an environment. The more
96100

97101
Follow the general guidelines in this section to build a UX that encourages a useful scan of the environment.
98102

99-
First, if the user doesn't locate an anchor within a few seconds, the app should encourage users to move the device to capture more perspectives. The app can also encourage users to move themselves around the environment to scan for the anchor from more perspectives. The more feature perspectives that the device sees, the better.
103+
First, if the user doesn't locate an anchor within a few seconds, the app should encourage users to move the device to capture more perspectives. The app can also encourage users to move themselves around the environment to scan for the anchor from more perspectives. The more feature perspectives that the device sees, the better, as it will increase the likelihood that an anchor is located, and it will also collect more environment data that will be used to improve the quality of the anchor.
100104

101105
For target scenarios, ask the user to move around the target to view it from different perspectives. In other words, ask the user to capture the target from new perspectives until the anchor is located.
102106

articles/spatial-anchors/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ These precise points of interest are referred to as Spatial Anchors.
2525

2626
Some example use cases enabled by Spatial Anchors include:
2727

28-
- [Multi-user experiences](tutorials/tutorial-share-anchors-across-devices.md). Spatial Anchors makes it easy for people in the same place to participate in multi-user mixed reality applications. For example, two people can start a game of mixed reality chess by placing a virtual chess board on a table. Then, by pointing their device at the table, they can view and interact with the virtual chess board together.
28+
- [Multi-user experiences](tutorials/tutorial-share-anchors-across-devices.md). Azure Spatial Anchors makes it easy for people in the same place to participate in multi-user mixed reality applications. For example, two people can start a game of mixed reality chess by placing a virtual chess board on a table. Then, by pointing their device at the table, they can view and interact with the virtual chess board together.
2929

3030
- [Way-finding](concepts/anchor-relationships-way-finding.md). Developers can also connect Spatial Anchors together creating relationships between them. For example, an app may include an experience that has two or more points of interest that a user must interact with to complete a task. Those points of interest can be created in a connected fashion. Later, when the user is completing the multi-step task, the app can ask for anchors that are nearby the current one to direct the user towards the next step in the task.
3131

@@ -36,7 +36,7 @@ sections provide information about getting started with building apps using Azur
3636

3737
## Next steps
3838

39-
Create your first app with Spatial Anchors.
39+
Create your first app with Azure Spatial Anchors.
4040

4141
> [!div class="nextstepaction"]
4242
> [Unity (HoloLens)](quickstarts/get-started-unity-hololens.md)

0 commit comments

Comments
 (0)