Skip to content

Commit 0234771

Browse files
authored
Merge pull request #41889 from MicrosoftDocs/FromPublicRepo
From public repo
2 parents 3714457 + 2eb4159 commit 0234771

File tree

8 files changed

+19
-20
lines changed

8 files changed

+19
-20
lines changed

articles/active-directory/develop/active-directory-authentication-libraries.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ The Azure Active Directory Authentication Library (ADAL) v1.0 enables applicatio
4343
| iOS, macOS |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc/releases) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc) |[iOS app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-ios) | [Reference](https://cocoadocs.org/docsets/ADAL/)|
4444
| Android |ADAL |[The Central Repository](http://search.maven.org/remotecontent?filepath=com/microsoft/aad/adal/) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-android) |[Android app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-android) | [JavaDocs](http://javadoc.io/doc/com.microsoft.aad/adal/)|
4545
| Node.js |ADAL |[npm](https://www.npmjs.com/package/adal-node) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-nodejs) | [Node.js web app](https://github.com/Azure-Samples/active-directory-node-webapp-openidconnect)| |
46-
| Java |ADAL4J |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-java) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-java) |[Java web app](https://github.com/Azure-Samples/active-directory-java-webapp-openidconnect) | |
47-
| Python |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[Python web app](https://github.com/Azure-Samples/active-directory-python-webapp-graphapi) | [Reference](http://adal-python.readthedocs.io/en/latest/) |
46+
| Java |ADAL4J |[Maven](http://search.maven.org/#search%7Cga%7C1%7Ca%3Aadal4j%20g%3Acom.microsoft.azure) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-java) |[Java web app](https://github.com/Azure-Samples/active-directory-java-webapp-openidconnect) | |
47+
| Python |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[Python web app](https://github.com/Azure-Samples/active-directory-python-webapp-graphapi) | |
4848

4949
## Microsoft-supported Server Libraries
5050

articles/cosmos-db/mongodb-migrate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ ms.custom: mvc
2222

2323
To migrate data from MongoDB to an Azure Cosmos DB account for use with the API for MongoDB, you must:
2424

25-
* Download either *mongoimport.exe* or *mongorestore.exe* from the [MongoDB Download Center](https://www.mongodb.com/download-center).
25+
* Download the community server from the [MongoDB Download Center](https://www.mongodb.com/download-center) and install it.
26+
* Use the mongoimport.exe or mongorestore.exe file that are installed in the "installation folder/bin" directory.
2627
* Get your [API for MongoDB connection string](connect-mongodb-account.md).
2728

2829
If you are importing data from MongoDB and plan to use it with the Azure Cosmos DB SQL API, you should use the [Data Migration tool](import-data.md) to import data.

articles/cosmos-db/programming.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -775,12 +775,12 @@ Here, the input to the stored procedure is passed in the request body. The input
775775

776776
{
777777
name: 'TestDocument',
778-
book: Autumn of the Patriarch,
779-
id: V7tQANV3rAkDAAAAAAAAAA==,
778+
book: 'Autumn of the Patriarch',
779+
id: 'V7tQANV3rAkDAAAAAAAAAA==',
780780
ts: 1407830727,
781-
self: dbs/V7tQAA==/colls/V7tQANV3rAk=/docs/V7tQANV3rAkDAAAAAAAAAA==/,
782-
etag: 6c006596-0000-0000-0000-53e9cac70000,
783-
attachments: attachments/,
781+
self: 'dbs/V7tQAA==/colls/V7tQANV3rAk=/docs/V7tQANV3rAkDAAAAAAAAAA==/',
782+
etag: '6c006596-0000-0000-0000-53e9cac70000',
783+
attachments: 'attachments/',
784784
Price: 200
785785
}
786786

@@ -793,12 +793,11 @@ Triggers, unlike stored procedures, cannot be executed directly. Instead they ar
793793
x-ms-documentdb-pre-trigger-include: validateDocumentContents
794794
x-ms-documentdb-post-trigger-include: bookCreationPostTrigger
795795

796-
797796
{
798797
"name": "newDocument",
799-
title”: “The Wizard of Oz,
800-
author”: “Frank Baum,
801-
pages: 92
798+
"title": "The Wizard of Oz",
799+
"author": "Frank Baum",
800+
"pages": 92
802801
}
803802

804803

articles/cosmos-db/sql-api-java-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ All the samples in this tutorial are included in the [todo](https://github.com/A
737737
3. In Eclipse, on the **File** menu, click **Import**.
738738
4. In the **Import** window, click **Git**, click **Projects from Git**, and then click **Next**.
739739
5. On the **Select Repository Source** screen, click **Clone URI**.
740-
6. On the **Source Git Repository** screen, in the **URI** box, enter https://github.com/Azure-Samples/java-todo-app.git, and then click **Next**.
740+
6. On the **Source Git Repository** screen, in the **URI** box, enter https://github.com/Azure-Samples/documentdb-java-todo-app.git, and then click **Next**.
741741
7. On the **Branch Selection** screen, ensure that **master** is selected, and then click **Next**.
742742
8. On the **Local Destination** screen, click **Browse** to select a folder where the repository can be copied, and then click **Next**.
743743
9. On the **Select a wizard to use for importing projects** screen, ensure that **Import existing projects** is selected, and then click **Next**.

articles/cosmos-db/unique-keys.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ private static async Task CreateCollectionIfNotExistsAsync(string dataBase, stri
8787
UniqueKeys =
8888
new Collection<UniqueKey>
8989
{
90-
new UniqueKey { Paths = new Collection<string> { "/firstName" , "/lastName" , "/email" }}
91-
new UniqueKey { Paths = new Collection<string> { "/address/zipCode" } },
92-
90+
new UniqueKey { Paths = new Collection<string> { "/firstName" , "/lastName" , "/email" } },
91+
new UniqueKey { Paths = new Collection<string> { "/address/zipCode" } }
9392
}
9493
};
9594
await client.CreateDocumentCollectionAsync(

articles/service-fabric/service-fabric-docker-compose.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Start-ServiceFabricComposeDeploymentUpgrade -DeploymentName TestContainerApp -Co
6262
After upgrade is accepted, the upgrade progress could be tracked using the following command:
6363

6464
```powershell
65-
Get-ServiceFabricComposeDeploymentUpgrade -Deployment TestContainerApp
65+
Get-ServiceFabricComposeDeploymentUpgrade -DeploymentName TestContainerApp
6666
```
6767

6868
### Use Azure Service Fabric CLI (sfctl)

articles/service-fabric/service-fabric-overview-microservices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Introduction to microservices on Azure| Microsoft Docs
33
description: An overview of why building cloud applications with a microservices approach is important for modern application development and how Azure Service Fabric provides a platform to achieve this.
44
services: service-fabric
@@ -159,7 +159,7 @@ It is important to emphasize again that you can **start and stop at any of these
159159
- Cost reduction either due to consolidation and removal of existing hardware or running applications at higher density.
160160
- Consistent deployment contract between development and operations.
161161

162-
Cost reductions are understandable, and within Microsoft, large numbers of existing applications are being containerized simply to save millions of dollars. Consistent deployment is harder to evaluate, but equally as important. It says that developers can still be free to choose the technology that suites them, however the operations will only accept a single way to deploy and manage these applications. It alleviates the operations from having to deal with the complexity of many different technologies or forcing developers to only choose certain ones. Essentially every application is containerized into self-contained deployment images.
162+
Cost reductions are understandable, and within Microsoft, large numbers of existing applications are being containerized simply to save millions of dollars. Consistent deployment is harder to evaluate, but equally as important. It says that developers can still be free to choose the technology that suits them, however the operations will only accept a single way to deploy and manage these applications. It alleviates the operations from having to deal with the complexity of many different technologies or forcing developers to only choose certain ones. Essentially every application is containerized into self-contained deployment images.
163163

164164
Many organizations stop here. They already have the benefits of containers and Service Fabric provides the complete management experience from deployment, upgrades, versioning, rollbacks, health monitoring etc.
165165

includes/cosmos-db-emulator-docdb-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ ms.author: sngun
1919
ms.custom: "include file"
2020
---
2121

22-
You can [Try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/) without an Azure subscription, free of charge and commitments. Or, you can use the [Azure Cosmos DB Emulator](https://docs.microsoft.com/azure/cosmos-db/local-emulator) with a URI of https://localhost:8081. The Primary Key is provided in [Authentating requests](../articles/cosmos-db/local-emulator.md#authenticating-requests).
22+
You can [Try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/) without an Azure subscription, free of charge and commitments. Or, you can use the [Azure Cosmos DB Emulator](https://docs.microsoft.com/azure/cosmos-db/local-emulator) with a URI of https://localhost:8081. The Primary Key is provided in [Authenticating requests](../articles/cosmos-db/local-emulator.md#authenticating-requests).

0 commit comments

Comments
 (0)