Skip to content

Commit a925cc2

Browse files
authored
Merge pull request #174188 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents bd664ad + be8a6e0 commit a925cc2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

articles/aks/concepts-sustainable-software-engineering.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 03/29/2021
88

99
# Sustainable software engineering principles in Azure Kubernetes Service (AKS)
1010

11-
The sustainable software engineering principles are a set of competencies to help you define, build, and run sustainable applications. The overall goal is to reduce your carbon footprint of every aspect of your application. [The Principles of Sustainable Software Engineering][principles-sse] has an overview of the principles of sustainable software engineering.
11+
The sustainable software engineering principles are a set of competencies to help you define, build, and run sustainable applications. The overall goal is to reduce the carbon footprint in every aspect of your application. [The Principles of Sustainable Software Engineering][principles-sse] has an overview of the principles of sustainable software engineering.
1212

1313
Sustainable software engineering is a shift in priorities and focus. In many cases, the way most software is designed and run highlights fast performance and low latency. Meanwhile, sustainable software engineering focuses on reducing as much carbon emission as possible. Consider:
1414

@@ -19,7 +19,7 @@ Before applying sustainable software engineering principles to your application,
1919

2020
## Measure and optimize
2121

22-
To lower the carbon footprint of your AKS clusters, you need understand how your cluster's resources are being used. [Azure Monitor][azure-monitor] provides details on your cluster's resource usage, such as memory and CPU usage. This data informs your decision to reduce the carbon footprint of your cluster and observes the effect of your changes.
22+
To lower the carbon footprint of your AKS clusters, you need to understand how your cluster's resources are being used. [Azure Monitor][azure-monitor] provides details on your cluster's resource usage, such as memory and CPU usage. This data informs your decision to reduce the carbon footprint of your cluster and observes the effect of your changes.
2323

2424
You can also install the [Microsoft Sustainability Calculator][sustainability-calculator] to see the carbon footprint of all your Azure resources.
2525

@@ -98,4 +98,4 @@ Learn more about the features of AKS mentioned in this article:
9898
[node-sizing]: use-multiple-node-pools.md#specify-a-vm-size-for-a-node-pool
9999
[sustainability-calculator]: https://azure.microsoft.com/blog/microsoft-sustainability-calculator-helps-enterprises-analyze-the-carbon-emissions-of-their-it-infrastructure/
100100
[system-pools]: use-system-pools.md
101-
[principles-sse]: /learn/modules/sustainable-software-engineering-overview/
101+
[principles-sse]: /learn/modules/sustainable-software-engineering-overview/

articles/azure-resource-manager/management/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ landingContent:
7878
- text: .NET
7979
url: /dotnet/api/microsoft.azure.management.resourcemanager
8080
- text: Java
81-
url: /java/api/com.microsoft.azure.management.resources
81+
url: /java/api/com.azure.resourcemanager.resources
8282
- text: Python
8383
url: /python/api/overview/azure/resources
8484

articles/azure-sql/migration-guides/managed-instance/sql-server-to-managed-instance-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ By default, Azure Database Migration Service supports migrating only SQL logins.
165165

166166
After you restart the service, Windows user or group logins appear in the list of logins available for migration. For any Windows user or group logins that you migrate, you're prompted to provide the associated domain name. Service user accounts (accounts with the domain name NT AUTHORITY) and virtual user accounts (accounts with the domain name NT SERVICE) are not supported. To learn more, see [How to migrate Windows users and groups in a SQL Server instance to Azure SQL Managed Instance using T-SQL](../../managed-instance/migrate-sql-server-users-to-instance-transact-sql-tsql-tutorial.md).
167167

168-
Alternatively, you can use the [PowerShell utility](https://github.com/microsoft/DataMigrationTeam/tree/master/IP%20and%20Scripts/MoveLogins) specially designed by Microsoft data migration architects. The utility uses PowerShell to create a T-SQL script to re-create logins and select database users from the source to the target.
168+
Alternatively, you can use the [PowerShell utility](https://www.microsoft.com/download/details.aspx?id=103111) specially designed by Microsoft data migration architects. The utility uses PowerShell to create a T-SQL script to re-create logins and select database users from the source to the target.
169169

170170
The PowerShell utility automatically maps Windows Server Active Directory accounts to Azure AD accounts, and it can do a UPN lookup for each login against the source Active Directory instance. The utility scripts custom server and database roles, along with role membership and user permissions. Contained databases are not yet supported, and only a subset of possible SQL Server permissions are scripted.
171171

0 commit comments

Comments
 (0)