fixed conflict

Author: rwike77

articles/active-directory/develop/includes/libraries/libraries-daemon.md

@@ -0,0 +1,20 @@
+| Language / framework | Project on<br/>GitHub                                                                 | Package                                                                                | Getting<br/>started                           | Sign in users                                            | Access web APIs                                                 | Generally available (GA) *or*<br/>Public preview<sup>1</sup> |
+|----------------------|---------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------|:---------------------------------------------:|:--------------------------------------------------------:|:---------------------------------------------------------------:|:------------------------------------------------------------:|
+| .NET                 | [MSAL.NET](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet)    | [Microsoft.Identity.Client](https://www.nuget.org/packages/Microsoft.Identity.Client/) | [Quickstart](../../console-app-quickstart.md?pivots=devlang-dotnet-core) | ![Library cannot request ID tokens for user sign-in.][n] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| Java                 | [MSAL4J](https://github.com/AzureAD/microsoft-authentication-library-for-java)        | [msal4j](https://javadoc.io/doc/com.microsoft.azure/msal4j/latest/index.html)          | —                                             | ![Library cannot request ID tokens for user sign-in.][n] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| Node               | [MSAL Node](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node) | [msal-node](https://www.npmjs.com/package/@azure/msal-node)  | [Quickstart](../../console-app-quickstart.md?pivots=devlang-nodejs)  | ![Library cannot request ID tokens for user sign-in.][n] | ![Library can request access tokens for protected web APIs.][y] | GA  |
+| Python               | [MSAL Python](https://github.com/AzureAD/microsoft-authentication-library-for-python) | [msal-python](https://github.com/AzureAD/microsoft-authentication-library-for-python)  | [Quickstart](../../console-app-quickstart.md?pivots=devlang-python)  | ![Library cannot request ID tokens for user sign-in.][n] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+<!--
+|PHP| [The PHP League oauth2-client](https://oauth2-client.thephpleague.com/usage/) | [League\OAuth2](https://oauth2-client.thephpleague.com/) | ![Green check mark.][n] | ![X indicating no.][n] | ![Green check mark.][y] | -- |
+-->
+
+<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
+
+<!--Image references-->
+
+[y]: ../../../develop/media/common/yes.png
+[n]: ../../../develop/media/common/no.png
+
+<!--Reference-style links -->
+
+[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/

articles/active-directory/develop/includes/libraries/libraries-desktop.md

@@ -0,0 +1,23 @@
+| Language / framework | Project on<br/>GitHub                                                                                     | Package                                                                               | Getting<br/>started                        | Sign in users                                         | Access web APIs                                                 | Generally available (GA) *or*<br/>Public preview<sup>1</sup> |
+|----------------------|-----------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------|:------------------------------------------:|:-----------------------------------------------------:|:---------------------------------------------------------------:|:------------------------------------------------------------:|
+| Electron             | [MSAL Node.js](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node) | [msal-node](https://www.npmjs.com/package/@azure/msal-node)                    | —                                          | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | Public preview                                               |
+| Java                 | [MSAL4J](https://github.com/AzureAD/microsoft-authentication-library-for-java)                            | [msal4j](https://mvnrepository.com/artifact/com.microsoft.azure/msal4j)               | —                                          | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| macOS (Swift/Obj-C)  | [MSAL for iOS and macOS](https://github.com/AzureAD/microsoft-authentication-library-for-objc)            | [MSAL](https://cocoapods.org/pods/MSAL)                                               | [Tutorial](../../tutorial-v2-ios.md)             | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| UWP                  | [MSAL.NET](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet)                        | [Microsoft.Identity.Client](https://www.nuget.org/packages/Microsoft.Identity.Client) | [Tutorial](../../tutorial-v2-windows-uwp.md)     | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| WPF                  | [MSAL.NET](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet)                        | [Microsoft.Identity.Client](https://www.nuget.org/packages/Microsoft.Identity.Client) | [Tutorial](../../tutorial-v2-windows-desktop.md) | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+<!--
+| Java | Scribe | [Scribe Java](https://mvnrepository.com/artifact/org.scribe/scribe) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
+| React Native | [React Native App Auth](https://github.com/FormidableLabs/react-native-app-auth/blob/main/docs/config-examples/azure-active-directory.md) | [react-native-app-auth](https://www.npmjs.com/package/react-native-app-auth) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
+-->
+
+<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
+
+<!--Image references-->
+
+[y]: ../../../develop/media/common/yes.png
+[n]: ../../../develop/media/common/no.png
+
+
+<!--Reference-style links -->
+
+[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/

articles/active-directory/develop/includes/libraries/libraries-mobile.md

@@ -0,0 +1,20 @@
+| Platform          | Project on<br/>GitHub                                                                          | Package                                                                               | Getting<br/>started                    | Sign in users                                         | Access web APIs                                                 | Generally available (GA) *or*<br/>Public preview<sup>1</sup> |
+|-------------------|------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------|:--------------------------------------:|:-----------------------------------------------------:|:---------------------------------------------------------------:|:------------------------------------------------------------:|
+| Android (Java)    | [MSAL Android](https://github.com/AzureAD/microsoft-authentication-library-for-android)        | [MSAL](https://mvnrepository.com/artifact/com.microsoft.identity.client/msal)         | [Quickstart](../../mobile-app-quickstart.md?pivots=devlang-android) | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| Android (Kotlin)  | [MSAL Android](https://github.com/AzureAD/microsoft-authentication-library-for-android)        | [MSAL](https://mvnrepository.com/artifact/com.microsoft.identity.client/msal)         | —                                      | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| iOS (Swift/Obj-C) | [MSAL for iOS and macOS](https://github.com/AzureAD/microsoft-authentication-library-for-objc) | [MSAL](https://cocoapods.org/pods/MSAL)                                               | [Tutorial](../../tutorial-v2-ios.md)         | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+| Xamarin (.NET)    | [MSAL.NET](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet)             | [Microsoft.Identity.Client](https://www.nuget.org/packages/Microsoft.Identity.Client) | —                                      | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA                                                           |
+<!--
+| React Native |[React Native App Auth](https://github.com/FormidableLabs/react-native-app-auth/blob/main/docs/config-examples/azure-active-directory.md) | [react-native-app-auth](https://www.npmjs.com/package/react-native-app-auth) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
+-->
+
+<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
+
+<!--Image references-->
+
+[y]: ../../../develop/media/common/yes.png
+[n]: ../../../develop/media/common/no.png
+
+<!--Reference-style links -->
+
+[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/

includes/active-directory-develop-libraries-spa.md renamed to articles/active-directory/develop/includes/libraries/libraries-spa.md

@@ -8,12 +8,12 @@ ms.author: henrymbugua
 
 | Language / framework | Project on<br/>GitHub                                                                                                                | Package                                                               |                                 Getting<br/>started                                  |                     Sign in users                     |                         Access web APIs                         | Generally available (GA) _or_<br/>Public preview<sup>1</sup> |
 | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------- | :----------------------------------------------------------------------------------: | :---------------------------------------------------: | :-------------------------------------------------------------: | :----------------------------------------------------------: |
-| Angular              | [MSAL Angular v2](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)<sup>2</sup>          | [msal-angular](https://www.npmjs.com/package/@azure/msal-angular)     |  [Tutorial](../articles/active-directory/develop/tutorial-v2-angular-auth-code.md)   | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
+| Angular              | [MSAL Angular v2](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)<sup>2</sup>          | [msal-angular](https://www.npmjs.com/package/@azure/msal-angular)     |  [Tutorial](../../tutorial-v2-angular-auth-code.md)   | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
 | Angular              | [MSAL Angular](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/msal-angular-v1/lib/msal-angular)<sup>3</sup> | [msal-angular](https://www.npmjs.com/package/@azure/msal-angular)     |                                          —                                           | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
 | AngularJS            | [MSAL AngularJS](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/maintenance/msal-angularjs)<sup>3</sup> | [msal-angularjs](https://www.npmjs.com/package/@azure/msal-angular) |                                          —                                           | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                        Public preview                        |
-| JavaScript           | [MSAL.js v2](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-browser)<sup>2</sup>               | [msal-browser](https://www.npmjs.com/package/@azure/msal-browser)     | [Tutorial](../articles/active-directory/develop/tutorial-v2-javascript-auth-code.md) | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
+| JavaScript           | [MSAL.js v2](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-browser)<sup>2</sup>               | [msal-browser](https://www.npmjs.com/package/@azure/msal-browser)     | [Tutorial](../../tutorial-v2-javascript-auth-code.md) | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
 | JavaScript           | [MSAL.js 1.0](/javascript/api/overview/msal-overview)<sup>3</sup>                 | [msal-core](https://www.npmjs.com/package/@azure/msal-core)           |                                          —                                           | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
-| React                | [MSAL React](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-react)<sup>2</sup>                 | [msal-react](https://www.npmjs.com/package/@azure/msal-react)         |        [Tutorial](../articles/active-directory/develop/tutorial-v2-react.md)         | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
+| React                | [MSAL React](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-react)<sup>2</sup>                 | [msal-react](https://www.npmjs.com/package/@azure/msal-react)         |        [Tutorial](../../single-page-app-tutorial-01-register-app.md)         | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] |                              GA                              |
 
 <!--
 | Vue | [Vue MSAL]( https://github.com/mvertopoulos/vue-msal) | [vue-msal]( https://www.npmjs.com/package/vue-msal) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
@@ -27,13 +27,13 @@ ms.author: henrymbugua
 
 <!--Image references-->
 
-[y]: ../articles/active-directory/develop/media/common/yes.png
-[n]: ../articles/active-directory/develop/media/common/no.png
+[y]: ../../../develop/media/common/yes.png
+[n]: ../../../develop/media/common/no.png
 
 <!--Reference-style links -->
 
 [aad-app-model-v2-overview]: v2-overview.md
 [microsoft-sdl]: https://www.microsoft.com/securityengineering/sdl/
 [preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
-[auth-code-flow]: ../articles/active-directory/develop/v2-oauth2-auth-code-flow.md
-[implicit-flow]: ../articles/active-directory/develop/v2-oauth2-implicit-grant-flow.md
+[auth-code-flow]: ../../v2-oauth2-auth-code-flow.md
+[implicit-flow]: ../../v2-oauth2-implicit-grant-flow.md