Skip to content

Commit 3394591

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into faqClean
2 parents 95dd8c4 + bcc79b4 commit 3394591

File tree

54 files changed

+1353
-910
lines changed

Some content is hidden

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

54 files changed

+1353
-910
lines changed

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,11 @@
13951395
"redirect_url": "/azure/azure-resource-manager/managed-applications/cli-samples",
13961396
"redirect_document_id": false
13971397
},
1398+
{
1399+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/cli-samples.md",
1400+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1401+
"redirect_document_id": false
1402+
},
13981403
{
13991404
"source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
14001405
"redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",
@@ -1585,6 +1590,11 @@
15851590
"redirect_url": "/azure/azure-resource-manager/managed-applications/powershell-samples",
15861591
"redirect_document_id": false
15871592
},
1593+
{
1594+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/powershell-samples.md",
1595+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1596+
"redirect_document_id": false
1597+
},
15881598
{
15891599
"source_path_from_root": "/articles/managed-applications/publish-managed-app-definition-quickstart.md",
15901600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1889,6 +1899,26 @@
18891899
"source_path_from_root": "/articles/xplat-cli-azure-resource-manager.md",
18901900
"redirect_url": "/azure/azure-resource-manager/management/manage-resources-cli",
18911901
"redirect_document_id": false
1902+
},
1903+
{
1904+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample.md",
1905+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1906+
"redirect_document_id": false
1907+
},
1908+
{
1909+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-create-definition.md",
1910+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1911+
"redirect_document_id": false
1912+
},
1913+
{
1914+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-poweshell-sample-create-application.md",
1915+
"redirect_url": "/azure/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart",
1916+
"redirect_document_id": false
1917+
},
1918+
{
1919+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
1920+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1921+
"redirect_document_id": false
18921922
}
18931923
]
18941924
}

articles/azure-resource-manager/managed-applications/cli-samples.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

articles/azure-resource-manager/managed-applications/powershell-samples.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

articles/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-create-definition.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

articles/azure-resource-manager/managed-applications/scripts/managed-application-poweshell-sample-create-application.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

articles/azure-resource-manager/managed-applications/toc.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
href: tutorial-create-managed-app-with-custom-provider.md
2020
- name: Samples
2121
items:
22-
- name: Azure CLI
23-
items:
24-
- name: Overview
25-
href: cli-samples.md
26-
- name: Create managed application
27-
href: scripts/managed-application-define-create-cli-sample.md
28-
- name: Azure PowerShell
29-
href: powershell-samples.md
3022
- name: Managed application solutions
3123
href: sample-projects.md
3224
- name: Concepts

articles/container-apps/TOC.yml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,14 @@
99
- name: Quickstarts
1010
expanded: true
1111
items:
12-
- name: With a sample container image
12+
- name: Deploy from an existing container image
1313
expanded: true
1414
items:
1515
- name: Azure portal
1616
href: quickstart-portal.md
1717
- name: Command line
1818
href: get-started.md
19-
- name: With an existing container image
20-
expanded: true
21-
items:
22-
- name: Azure portal
23-
href: get-started-existing-container-image-portal.md
24-
- name: Command line
25-
href: get-started-existing-container-image.md
26-
- name: With code on your local machine
19+
- name: Deploy an app from code
2720
expanded: true
2821
items:
2922
- name: Command line
@@ -157,21 +150,26 @@
157150
- name: Plan for disaster recovery
158151
href: disaster-recovery.md
159152
- name: Tutorials
160-
items:
161-
- name: Communicate between microservices
162-
href: communicate-between-microservices.md
163-
- name: Microservices with Dapr using the CLI
164-
href: microservices-dapr.md
165-
- name: Microservices with Dapr using ARM or Bicep
166-
href: microservices-dapr-azure-resource-manager.md
167-
- name: Deploy a Dapr application using GitHub Actions
168-
href: dapr-github-actions.md
169-
- name: Event-driven work using Dapr Bindings
170-
href: microservices-dapr-bindings.md
171-
- name: Microservices communication using Dapr Publish and Subscribe
172-
href: microservices-dapr-pubsub.md
173-
- name: Microservices communication using Dapr Service Invocation
174-
href: microservices-dapr-service-invoke.md
153+
expanded: true
154+
items:
155+
- name: Create and deploy a container app using the CLI
156+
href: tutorial-deploy-first-app-cli.md
157+
- name: Build a multiple app scenario
158+
expanded: true
159+
items:
160+
- name: 1. Deploy a backend microservice app
161+
href: tutorial-code-to-cloud.md
162+
- name: 2. Deploy a frontend microservice app
163+
href: communicate-between-microservices.md
164+
- name: Deploy microservices with Dapr
165+
expanded: true
166+
items:
167+
- name: Microservices with Dapr using the CLI
168+
href: microservices-dapr.md
169+
- name: Microservices with Dapr using ARM or Bicep
170+
href: microservices-dapr-azure-resource-manager.md
171+
- name: Deploy a Dapr application using GitHub Actions
172+
href: dapr-github-actions.md
175173
- name: Background processing
176174
href: background-processing.md
177175
- name: Create an Azure Files storage mount

0 commit comments

Comments
 (0)