Skip to content

Commit

Permalink
Removed forced localization and updated docs.microsoft to learn.micro… (
Browse files Browse the repository at this point in the history
  • Loading branch information
lukemurraynz authored Feb 27, 2025
1 parent f54bb7e commit 6a7b5e4
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ See [DEVELOPER.md](DEVELOPER.md) for information on how to build and test the pr

This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft
trademarks or logos is subject to and must follow
[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general).
[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/legal/intellectualproperty/trademarks/usage/general).
Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
Any use of third-party trademarks or logos are subject to those third-party's policies.
6 changes: 3 additions & 3 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).

If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://learn.microsoft.com/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.

## Reporting Security Issues

**Please do not report security vulnerabilities through public GitHub issues.**

Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).

If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/msrc/pgp-key-msrc).

You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).

Expand All @@ -36,6 +36,6 @@ We prefer all communications to be in English.

## Policy

Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/msrc/cvd).

<!-- END MICROSOFT SECURITY.MD BLOCK -->
8 changes: 4 additions & 4 deletions docs/content/accelerator/userguide/0_planning.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Learn about the Azure landing zones architecture and the accelerator.
You should understand these terms before you start:

* Infrastructure as Code (IaC): Infrastructure as Code (IaC) is the process of managing and provisioning computing infrastructure through machine-readable definition files, rather than through physical hardware configuration or interactive configuration tools. This is a key component of the accelerator.
* Platform Landing Zone: Understand the scope of the Platform Landing Zone [here](https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/landing-zone/).
* Platform Landing Zone: Understand the scope of the Platform Landing Zone [here](https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/).
* Bootstrap or Bootstrap Module: The IaC module that sets up the version control system, continuous delivery pipeline, required Azure resources, etc. The bootstrap happens before the Platform Landing Zone is deployed.
* Starter or Starter Module: This is a pre-configured IaC module that can be used to deploy a specific platform landing zone configuration.
* Accelerator PowerShell Module: The PowerShell module that is used to deploy the bootstrap. Find it here: [https://www.powershellgallery.com/packages/ALZ](https://www.powershellgallery.com/packages/ALZ).
Expand All @@ -30,9 +30,9 @@ You should have a good understanding of the following technologies and concepts:

* Terraform Workflow: Understand the standard write, init, plan and apply workflow. [Learning path](https://aka.ms/tf/fundamentals)
* Terraform HCL (HashiCorp Configuration Language): Understand the basics of HCL. [Learning path](https://aka.ms/tf/labs)
* DevOps: Understand the fundamentals of DevOps. [Learning path](https://learn.microsoft.com/en-us/training/modules/introduction-to-devops/)
* Continuous Integration and Delivery: Understand the basics of CI/CD. [Learning path](https://learn.microsoft.com/en-us/training/modules/explain-devops-continous-delivery-quality/)
* git version control: Understand the fundamentals of git. [Learning path](https://learn.microsoft.com/en-us/training/modules/intro-to-git/)
* DevOps: Understand the fundamentals of DevOps. [Learning path](https://learn.microsoft.com/training/modules/introduction-to-devops/)
* Continuous Integration and Delivery: Understand the basics of CI/CD. [Learning path](https://learn.microsoft.com/training/modules/explain-devops-continous-delivery-quality/)
* git version control: Understand the fundamentals of git. [Learning path](https://learn.microsoft.com/training/modules/intro-to-git/)

## 2 - Download the checklist

Expand Down
4 changes: 2 additions & 2 deletions docs/content/accelerator/userguide/1_prerequisites/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Phase 1 of the accelerator is to setup your prerequisites. Follow the steps belo

You'll need to install the following tools before getting started.

* PowerShell 7.4 (or newer): [Follow the instructions for your operating system](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell)
* Azure CLI 2.55.0 (or newer): [Follow the instructions for your operating system](https://learn.microsoft.com/en-us/cli/azure/install-azure-cli)
- PowerShell 7.4 (or newer): [Follow the instructions for your operating system](https://learn.microsoft.com/powershell/scripting/install/installing-powershell)
- Azure CLI 2.55.0 (or newer): [Follow the instructions for your operating system](https://learn.microsoft.com/cli/azure/install-azure-cli)
* Git (any supported version): [Follow the instructions for your opersating system](https://git-scm.com/downloads).

{{< hint type=note >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ We recommend setting up 3 subscriptions for Azure landing zones. These are manag
- Identity: This is used to deploy the identity resources, such as Azure AD and Microsoft Entra Domain Services (formerly Azure AD DS) .
- Connectivity: This is used to deploy the hub networking resources, such as virtual networks and firewalls.

You can read more about the management, identity and connectivity subscriptions in the [Landing Zone docs](https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/landing-zone/deploy-landing-zones-with-terraform).
You can read more about the management, identity and connectivity subscriptions in the [Landing Zone docs](https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/deploy-landing-zones-with-terraform).

To create the subscriptions you will need access to a billing agreement. The following links detail the permissions required for each type of agreement:

- [Enterprise Agreement (EA)](https://learn.microsoft.com/en-us/azure/cost-management-billing/manage/create-enterprise-subscription)
- [Microsoft Customer Agreement (MCA)](https://learn.microsoft.com/en-us/azure/cost-management-billing/manage/create-subscription)
- [Enterprise Agreement (EA)](https://learn.microsoft.com/azure/cost-management-billing/manage/create-enterprise-subscription)
- [Microsoft Customer Agreement (MCA)](https://learn.microsoft.com/azure/cost-management-billing/manage/create-subscription)

Once you have the access required, create the three subscriptions following your desired naming convention.

Expand Down
2 changes: 1 addition & 1 deletion docs/content/accelerator/userguide/3_deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The Bicep option outputs a `deploy-local.ps1` file that you can use to deploy th
If you set the `grant_permissions_to_current_user` input to `false` in the bootstrap, you will need to set permissions on your management group, subscriptions and storage account before the commands will succeed.
{{< /hint >}}

1. Ensure you have the latest versions of the [AZ PowerShell Module](https://learn.microsoft.com/en-us/powershell/azure/install-azure-powershell) and [Bicep](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/install) installed.
1. Ensure you have the latest versions of the [AZ PowerShell Module](https://learn.microsoft.com/powershell/azure/install-azure-powershell) and [Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install) installed.
1. Open a new PowerShell Core (pwsh) terminal or use the one you already have open.
1. Navigate to the directory shown in the `module_output_directory_path` output from the bootstrap.
1. Login to Azure using `Connect-AzAccount -TenantId 00000000-0000-0000-0000-000000000000 -SubscriptionId 00000000-0000-0000-0000-000000000000`.
Expand Down
4 changes: 2 additions & 2 deletions docs/content/bootstrap/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ You can read more about the management, identity and connectivity subscriptions
To create the subscriptions you will need access to a billing agreement.
The following links detail the permissions required for each type of agreement:

- [Enterprise Agreement (EA)](https://learn.microsoft.com/en-us/azure/cost-management-billing/manage/create-enterprise-subscription)
- [Microsoft Customer Agreement (MCA)](https://learn.microsoft.com/en-us/azure/cost-management-billing/manage/create-subscription)
- [Enterprise Agreement (EA)](https://learn.microsoft.com/azure/cost-management-billing/manage/create-enterprise-subscription)
- [Microsoft Customer Agreement (MCA)](https://learn.microsoft.com/azure/cost-management-billing/manage/create-subscription)

Once you have the access required, create the three subscriptions following your desired naming convention.

Expand Down

0 comments on commit 6a7b5e4

Please sign in to comment.