Skip to content

Commit 4e56da8

Browse files
cephalincephalin
committed
merge tutorials phase 2
1 parent 836d838 commit 4e56da8

File tree

176 files changed

+694
-2820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+694
-2820
lines changed

‎.openpublishing.redirection.json‎

Lines changed: 136 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7194,7 +7194,17 @@
71947194
},
71957195
{
71967196
"source_path": "articles/app-service/containers/tutorial-ruby-mysql-app.md",
7197-
"redirect_url": "/azure/app-service/containers/tutorial-ruby-postgres-app",
7197+
"redirect_url": "/azure/app-service/tutorial-ruby-postgres-app",
7198+
"redirect_document_id": false
7199+
},
7200+
{
7201+
"source_path": "articles/app-service/containers/tutorial-ruby-postgres-app.md",
7202+
"redirect_url": "/azure/app-service/tutorial-ruby-postgres-app",
7203+
"redirect_document_id": false
7204+
},
7205+
{
7206+
"source_path": "articles/app-service/containers/tutorial-multi-container-app.md",
7207+
"redirect_url": "/azure/app-service/tutorial-multi-container-app",
71987208
"redirect_document_id": false
71997209
},
72007210
{
@@ -8613,7 +8623,7 @@
86138623
},
86148624
{
86158625
"source_path": "articles/app-service-web/app-service-web-get-started-python-cli-nodejs.md",
8616-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8626+
"redirect_url": "/azure/app-service/quickstart-python",
86178627
"redirect_document_id": false
86188628
},
86198629
{
@@ -8633,7 +8643,7 @@
86338643
},
86348644
{
86358645
"source_path": "articles/app-service-web/app-service-web-nodejs-sails-cli-nodejs.md",
8636-
"redirect_url": "/azure/app-service/containers/tutorial-nodejs-mongodb-app",
8646+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
86378647
"redirect_document_id": false
86388648
},
86398649
{
@@ -8693,12 +8703,17 @@
86938703
},
86948704
{
86958705
"source_path": "articles/app-service/app-service-linux-readme.md",
8696-
"redirect_url": "/azure/app-service/containers/app-service-linux-intro",
8706+
"redirect_url": "/azure/app-service/overview#app-service-on-linux",
86978707
"redirect_document_id": false
86988708
},
86998709
{
87008710
"source_path": "articles/app-service-web/app-service-linux-ci-cd.md",
8701-
"redirect_url": "/azure/app-service/containers/app-service-linux-ci-cd",
8711+
"redirect_url": "/azure/app-service/deploy-ci-cd-custom-container",
8712+
"redirect_document_id": false
8713+
},
8714+
{
8715+
"source_path": "articles/app-service/containers/app-service-linux-ci-cd.md",
8716+
"redirect_url": "/azure/app-service/deploy-ci-cd-custom-container",
87028717
"redirect_document_id": false
87038718
},
87048719
{
@@ -8708,27 +8723,47 @@
87088723
},
87098724
{
87108725
"source_path": "articles/app-service-web/app-service-linux-faq.md",
8711-
"redirect_url": "/azure/app-service/containers/app-service-linux-faq",
8726+
"redirect_url": "/azure/app-service/faq-app-service-linux",
8727+
"redirect_document_id": false
8728+
},
8729+
{
8730+
"source_path": "articles/app-service/containers/app-service-linux-faq.md",
8731+
"redirect_url": "/azure/app-service/faq-app-service-linux",
87128732
"redirect_document_id": false
87138733
},
87148734
{
87158735
"source_path": "articles/app-service-web/app-service-linux-intro.md",
8716-
"redirect_url": "/azure/app-service/containers/app-service-linux-intro",
8736+
"redirect_url": "/azure/app-service/overview#app-service-on-linux",
8737+
"redirect_document_id": false
8738+
},
8739+
{
8740+
"source_path": "articles/app-service/containers/app-service-linux-intro.md",
8741+
"redirect_url": "/azure/app-service/overview#app-service-on-linux",
87178742
"redirect_document_id": false
87188743
},
87198744
{
87208745
"source_path": "articles/app-service-web/app-service-linux-ssh-support.md",
8721-
"redirect_url": "/azure/app-service/containers/app-service-linux-ssh-support",
8746+
"redirect_url": "/azure/app-service/configure-linux-open-ssh-session",
8747+
"redirect_document_id": false
8748+
},
8749+
{
8750+
"source_path": "articles/app-service/containers/app-service-linux-ssh-support.md",
8751+
"redirect_url": "/azure/app-service/configure-linux-open-ssh-session",
87228752
"redirect_document_id": false
87238753
},
87248754
{
87258755
"source_path": "articles/app-service-web/app-service-linux-using-ruby.md",
8726-
"redirect_url": "/azure/app-service/containers/quickstart-ruby",
8756+
"redirect_url": "/azure/app-service/quickstart-ruby",
87278757
"redirect_document_id": false
87288758
},
87298759
{
87308760
"source_path": "articles/app-service-web/app-service-linux-ruby-get-started.md",
8731-
"redirect_url": "/azure/app-service/containers/quickstart-ruby",
8761+
"redirect_url": "/azure/app-service/quickstart-ruby",
8762+
"redirect_document_id": false
8763+
},
8764+
{
8765+
"source_path": "articles/app-service/containers/quickstart-ruby.md",
8766+
"redirect_url": "/azure/app-service/quickstart-ruby",
87328767
"redirect_document_id": false
87338768
},
87348769
{
@@ -8738,12 +8773,22 @@
87388773
},
87398774
{
87408775
"source_path": "articles/app-service-web/app-service-web-tutorial-docker-python-postgresql-app.md",
8741-
"redirect_url": "/azure/app-service/containers/tutorial-python-postgresql-app",
8776+
"redirect_url": "/azure/app-service/tutorial-python-postgresql-app",
87428777
"redirect_document_id": false
87438778
},
87448779
{
87458780
"source_path": "articles/app-service/containers/tutorial-docker-python-postgresql-app.md",
8746-
"redirect_url": "/azure/app-service/containers/tutorial-python-postgresql-app",
8781+
"redirect_url": "/azure/app-service/tutorial-python-postgresql-app",
8782+
"redirect_document_id": false
8783+
},
8784+
{
8785+
"source_path": "articles/app-service/containers/tutorial-python-postgresql-app.md",
8786+
"redirect_url": "/azure/app-service/tutorial-python-postgresql-app",
8787+
"redirect_document_id": false
8788+
},
8789+
{
8790+
"source_path": "articles/app-service/containers/tutorial-troubleshoot-monitor.md",
8791+
"redirect_url": "/azure/app-service/tutorial-troubleshoot-monitor",
87478792
"redirect_document_id": false
87488793
},
87498794
{
@@ -8833,7 +8878,7 @@
88338878
},
88348879
{
88358880
"source_path": "articles/app-service-web/storage-nodejs-use-table-storage-web-site.md",
8836-
"redirect_url": "/azure/app-service/app-service-web-tutorial-nodejs-mongodb-app",
8881+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
88378882
"redirect_document_id": false
88388883
},
88398884
{
@@ -8903,37 +8948,37 @@
89038948
},
89048949
{
89058950
"source_path": "articles/app-service-web/web-sites-python-create-deploy-bottle-app.md",
8906-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8951+
"redirect_url": "/azure/app-service/quickstart-python",
89078952
"redirect_document_id": false
89088953
},
89098954
{
89108955
"source_path": "articles/app-service-web/web-sites-python-create-deploy-django-app.md",
8911-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8956+
"redirect_url": "/azure/app-service/quickstart-python",
89128957
"redirect_document_id": false
89138958
},
89148959
{
89158960
"source_path": "articles/app-service-web/web-sites-python-create-deploy-flask-app.md",
8916-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8961+
"redirect_url": "/azure/app-service/quickstart-python",
89178962
"redirect_document_id": false
89188963
},
89198964
{
89208965
"source_path": "articles/app-service-web/web-sites-python-ptvs-bottle-table-storage.md",
8921-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8966+
"redirect_url": "/azure/app-service/quickstart-python",
89228967
"redirect_document_id": false
89238968
},
89248969
{
89258970
"source_path": "articles/app-service-web/web-sites-python-ptvs-django-mysql.md",
8926-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8971+
"redirect_url": "/azure/app-service/quickstart-python",
89278972
"redirect_document_id": false
89288973
},
89298974
{
89308975
"source_path": "articles/app-service-web/web-sites-python-ptvs-django-sql.md",
8931-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8976+
"redirect_url": "/azure/app-service/quickstart-python",
89328977
"redirect_document_id": false
89338978
},
89348979
{
89358980
"source_path": "articles/app-service-web/web-sites-python-ptvs-flask-table-storage.md",
8936-
"redirect_url": "/azure/app-service/containers/quickstart-python",
8981+
"redirect_url": "/azure/app-service/quickstart-python",
89378982
"redirect_document_id": false
89388983
},
89398984
{
@@ -9243,7 +9288,17 @@
92439288
},
92449289
{
92459290
"source_path": "articles/app-service-web/app-service-web-get-started-python.md",
9246-
"redirect_url": "/azure/app-service/containers/quickstart-python",
9291+
"redirect_url": "/azure/app-service/quickstart-python",
9292+
"redirect_document_id": false
9293+
},
9294+
{
9295+
"source_path": "articles/app-service/app-service-web-get-started-python.md",
9296+
"redirect_url": "/azure/app-service/quickstart-python",
9297+
"redirect_document_id": false
9298+
},
9299+
{
9300+
"source_path": "articles/app-service/containers/quickstart-python.md",
9301+
"redirect_url": "/azure/app-service/quickstart-python",
92479302
"redirect_document_id": false
92489303
},
92499304
{
@@ -9326,24 +9381,69 @@
93269381
"redirect_url": "/azure/app-service/configure-ssl-bindings",
93279382
"redirect_document_id": false
93289383
},
9384+
{
9385+
"source_path": "articles/app-service/app-service-web-tutorial-auth-aad.md",
9386+
"redirect_url": "/azure/app-service/tutorial-auth-aad",
9387+
"redirect_document_id": false
9388+
},
9389+
{
9390+
"source_path": "articles/app-service/containers/tutorial-auth-aad.md",
9391+
"redirect_url": "/azure/app-service/tutorial-auth-aad",
9392+
"redirect_document_id": false
9393+
},
93299394
{
93309395
"source_path": "articles/app-service-web/app-service-web-tutorial-dotnet-sqldatabase.md",
9331-
"redirect_url": "/azure/app-service/app-service-web-tutorial-dotnet-sqldatabase",
9396+
"redirect_url": "/azure/app-service/tutorial-dotnetcore-sqldb-app",
9397+
"redirect_document_id": false
9398+
},
9399+
{
9400+
"source_path": "articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md",
9401+
"redirect_url": "/azure/app-service/tutorial-dotnetcore-sqldb-app",
9402+
"redirect_document_id": false
9403+
},
9404+
{
9405+
"source_path": "articles/app-service/containers/tutorial-dotnetcore-sqldb-app.md",
9406+
"redirect_url": "/azure/app-service/tutorial-dotnetcore-sqldb-app",
93329407
"redirect_document_id": false
93339408
},
93349409
{
93359410
"source_path": "articles/app-service-web/app-service-web-tutorial-java-mysql.md",
9336-
"redirect_url": "/azure/app-service/containers/tutorial-java-spring-cosmosdb",
9411+
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
9412+
"redirect_document_id": false
9413+
},
9414+
{
9415+
"source_path": "articles/app-service/containers/tutorial-java-spring-cosmosdb.md",
9416+
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
93379417
"redirect_document_id": false
93389418
},
93399419
{
93409420
"source_path": "articles/app-service-web/app-service-web-tutorial-nodejs-mongodb-app.md",
9341-
"redirect_url": "/azure/app-service/app-service-web-tutorial-nodejs-mongodb-app",
9421+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
9422+
"redirect_document_id": false
9423+
},
9424+
{
9425+
"source_path": "articles/app-service/app-service-web-tutorial-nodejs-mongodb-app.md",
9426+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
9427+
"redirect_document_id": false
9428+
},
9429+
{
9430+
"source_path": "articles/app-service/containers/tutorial-nodejs-mongodb-app.md",
9431+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
93429432
"redirect_document_id": false
93439433
},
93449434
{
93459435
"source_path": "articles/app-service-web/app-service-web-tutorial-php-mysql.md",
9346-
"redirect_url": "/azure/app-service/app-service-web-tutorial-php-mysql",
9436+
"redirect_url": "/azure/app-service/tutorial-php-mysql-app",
9437+
"redirect_document_id": false
9438+
},
9439+
{
9440+
"source_path": "articles/app-service/app-service-web-tutorial-php-mysql.md",
9441+
"redirect_url": "/azure/app-service/tutorial-php-mysql-app",
9442+
"redirect_document_id": false
9443+
},
9444+
{
9445+
"source_path": "articles/app-service/containers/tutorial-php-mysql-app.md",
9446+
"redirect_url": "/azure/app-service/tutorial-php-mysql-app",
93479447
"redirect_document_id": false
93489448
},
93499449
{
@@ -9923,7 +10023,7 @@
992310023
},
992410024
{
992510025
"source_path": "articles/app-service-web/web-sites-nodejs-debug.md",
9926-
"redirect_url": "/azure/app-service/app-service-web-tutorial-nodejs-mongodb-app",
10026+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
992710027
"redirect_document_id": false
992810028
},
992910029
{
@@ -10041,14 +10141,9 @@
1004110141
"redirect_url": "https://github.com/Azure/azure-webjobs-sdk/wiki",
1004210142
"redirect_document_id": false
1004310143
},
10044-
{
10045-
"source_path": "articles/app-service/app-service-web-get-started-python.md",
10046-
"redirect_url": "/azure/app-service/containers/quickstart-python",
10047-
"redirect_document_id": false
10048-
},
1004910144
{
1005010145
"source_path": "articles/app-service/app-service-web-tutorial-python-postgresql.md",
10051-
"redirect_url": "/azure/app-service/containers/tutorial-python-postgresql-app",
10146+
"redirect_url": "/azure/app-service/tutorial-python-postgresql-app",
1005210147
"redirect_document_id": false
1005310148
},
1005410149
{
@@ -10153,7 +10248,7 @@
1015310248
},
1015410249
{
1015510250
"source_path": "articles/app-service-web/app-service-web-nodejs-sails.md",
10156-
"redirect_url": "/azure/app-service/app-service-web-tutorial-nodejs-mongodb-app",
10251+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
1015710252
"redirect_document_id": false
1015810253
},
1015910254
{
@@ -12943,7 +13038,7 @@
1294313038
},
1294413039
{
1294513040
"source_path": "articles/app-service-web/web-sites-dotnet-store-data-mongodb-vm.md",
12946-
"redirect_url": "/azure/app-service/app-service-web-tutorial-nodejs-mongodb-app",
13041+
"redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",
1294713042
"redirect_document_id": false
1294813043
},
1294913044
{
@@ -29468,7 +29563,12 @@
2946829563
},
2946929564
{
2947029565
"source_path": "articles/app-service-web/app-service-linux-choose-deployment-type.md",
29471-
"redirect_url": "/azure/app-service/containers/choose-deployment-type",
29566+
"redirect_url": "/azure/app-service/overview#app-service-on-linux",
29567+
"redirect_document_id": false
29568+
},
29569+
{
29570+
"source_path": "articles/app-service/containers/choose-deployment-type.md",
29571+
"redirect_url": "/azure/app-service/overview#app-service-on-linux",
2947229572
"redirect_document_id": false
2947329573
},
2947429574
{
@@ -36748,7 +36848,7 @@
3674836848
},
3674936849
{
3675036850
"source_path": "articles/nodejs-specify-node-version-azure-apps.md",
36751-
"redirect_url": "/azure/app-service/containers/app-service-linux-intro",
36851+
"redirect_url": "/azure/app-service/overview",
3675236852
"redirect_document_id": false
3675336853
},
3675436854
{

‎articles/app-service/app-service-authentication-how-to.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ This article shows you how to customize the built-in [authentication and authori
1212

1313
To get started quickly, see one of the following tutorials:
1414

15-
* [Tutorial: Authenticate and authorize users end-to-end in Azure App Service (Windows)](app-service-web-tutorial-auth-aad.md)
16-
* [Tutorial: Authenticate and authorize users end-to-end in Azure App Service for Linux](containers/tutorial-auth-aad.md)
15+
* [Tutorial: Authenticate and authorize users end-to-end in Azure App Service](tutorial-auth-aad.md)
1716
* [How to configure your app to use Azure Active Directory login](configure-authentication-provider-aad.md)
1817
* [How to configure your app to use Facebook login](configure-authentication-provider-facebook.md)
1918
* [How to configure your app to use Google login](configure-authentication-provider-google.md)
@@ -276,5 +275,4 @@ If either of the other levels don't provide the authorization you need, or if yo
276275
## Next steps
277276

278277
> [!div class="nextstepaction"]
279-
> [Tutorial: Authenticate and authorize users end-to-end (Windows)](app-service-web-tutorial-auth-aad.md)
280-
> [Tutorial: Authenticate and authorize users end-to-end (Linux)](containers/tutorial-auth-aad.md)
278+
> [Tutorial: Authenticate and authorize users end-to-end](tutorial-auth-aad.md)

‎articles/app-service/app-service-web-get-started-dotnet.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ In this quickstart, you used Visual Studio to create and deploy an ASP.NET Core
144144
Advance to the next article to learn how to create a .NET Core app and connect it to a SQL Database:
145145

146146
> [!div class="nextstepaction"]
147-
> [ASP.NET Core with SQL Database](app-service-web-tutorial-dotnetcore-sqldb.md)
147+
> [ASP.NET Core with SQL Database](tutorial-dotnetcore-sqldb-app.md)
148148
149149
> [!div class="nextstepaction"]
150150
> [Configure ASP.NET Core app](configure-language-dotnetcore.md)

‎articles/app-service/app-service-web-get-started-nodejs.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ You can view log output (calls to `console.log`) from the app directly in the VS
154154
Congratulations, you've successfully completed this quickstart!
155155
156156
> [!div class="nextstepaction"]
157-
> [Tutorial: Node.js app with MongoDB](app-service-web-tutorial-nodejs-mongodb-app.md)
157+
> [Tutorial: Node.js app with MongoDB](tutorial-nodejs-mongodb-app.md)
158158
159159
> [!div class="nextstepaction"]
160160
> [Configure Node.js app](configure-language-nodejs.md)

‎articles/app-service/app-service-web-get-started-php.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Once deployment has completed, return to the browser window that opened during t
192192
## Next steps
193193

194194
> [!div class="nextstepaction"]
195-
> [PHP with MySQL](app-service-web-tutorial-php-mysql.md)
195+
> [PHP with MySQL](tutorial-php-mysql-app.md)
196196
197197
> [!div class="nextstepaction"]
198198
> [Configure PHP app](configure-language-php.md)

0 commit comments

Comments
 (0)