Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update documents to reflect change to Microsoft Entra ID #1665

Merged
merged 49 commits into from
Feb 27, 2024

Conversation

craddm
Copy link
Contributor

@craddm craddm commented Nov 10, 2023

✅ Checklist

  • You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
  • You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
  • Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).
  • You have marked this pull request as a draft and added '[WIP]' to the title if needed (if you're not yet ready to merge).
  • You have formatted your code using appropriate automated tools (for example ./tests/AutoFormat_Powershell.ps1 -TargetPath <path to file or directory> for Powershell).

⤴️ Summary

Updates references to Azure Active Directory in the documents to the new name - Microsoft Entra ID, following guidance at https://learn.microsoft.com/en-us/entra/fundamentals/how-to-rename-azure-ad

Note that in some places the old name remains in place, as changes have not taken place at Microsoft's end as yet.

TODO

  • [ ] Update graphics with new Entra ID logo
  • [ ] Check over places in the code that should also be changed, particularly where that code is directly mentioned in the documentation

🌂 Related issues

Closes #1634

🔬 Tests

Built docs locally

@craddm craddm modified the milestone: Release 4.2.0 Jan 22, 2024
@craddm craddm marked this pull request as ready for review February 22, 2024 14:00
Copy link
Member

@JimMadge JimMadge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some inconsistency with the terms used here.

I've added suggestions assuming there are two things called,

  • Microsoft Entra ID, and
  • Microsoft Entra Connect

docs/source/roles/system_manager/migrate_an_shm.md Outdated Show resolved Hide resolved
docs/source/deployment/deploy_shm.md Outdated Show resolved Hide resolved
docs/source/deployment/deploy_shm.md Outdated Show resolved Hide resolved
docs/source/deployment/deploy_shm.md Outdated Show resolved Hide resolved
docs/source/deployment/deploy_shm.md Outdated Show resolved Hide resolved
docs/source/roles/system_manager/migrate_an_shm.md Outdated Show resolved Hide resolved
@craddm
Copy link
Contributor Author

craddm commented Feb 22, 2024

Some inconsistency with the terms used here.

I've added suggestions assuming there are two things called,

  • Microsoft Entra ID, and
  • Microsoft Entra Connect

Not checked each comment yet, but no, this isn't quite the case - see https://learn.microsoft.com/en-us/entra/fundamentals/how-to-rename-azure-ad

@JimMadge
Copy link
Member

Some inconsistency with the terms used here.
I've added suggestions assuming there are two things called,

  • Microsoft Entra ID, and
  • Microsoft Entra Connect

Not checked each comment yet, but no, this isn't quite the case - see https://learn.microsoft.com/en-us/entra/fundamentals/how-to-rename-azure-ad

Let's use this opportunity to follow Microsoft's rules then.

Seems like the summary is,

  • "Microsoft Entra ID" is the product e.g. Microsoft Entra ID P1
  • "Microsoft Entra" is the feature e.g. Microsoft Entra tenant, Microsoft Entra domain

@craddm
Copy link
Contributor Author

craddm commented Feb 22, 2024

Not checked each comment yet, but no, this isn't quite the case - see https://learn.microsoft.com/en-us/entra/fundamentals/how-to-rename-azure-ad

Let's use this opportunity to follow Microsoft's rules then.

Seems like the summary is,

  • "Microsoft Entra ID" is the product e.g. Microsoft Entra ID P1
  • "Microsoft Entra" is the feature e.g. Microsoft Entra tenant, Microsoft Entra domain

I get a bit confused about which is classed as which, sometimes - hence the inconsistencies!

@JimMadge
Copy link
Member

I've resolved suggestions I think changed things which were already correct. So, I think the remaining unresolved suggestions are "real".

@JimMadge
Copy link
Member

@craddm Are you happy with the remaining two suggestions? If so, I think this is ready to merge after committing those.

@craddm
Copy link
Contributor Author

craddm commented Feb 27, 2024

I can't see anything left unresolved now

@JimMadge JimMadge merged commit 44d4e60 into alan-turing-institute:develop Feb 27, 2024
11 checks passed
@craddm craddm deleted the entra-id branch April 4, 2024 12:56
@JimMadge JimMadge mentioned this pull request May 9, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update docs to use Microsoft Entra
2 participants