Skip to content

Commit

Permalink
fix #325 merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
AzureContentRest committed Oct 18, 2012
2 parents 14c200d + 36c8890 commit 4cb38f5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ITPro/Windows/LandingPages/other-resources.md
Expand Up @@ -4,7 +4,7 @@

<div chunk="../../Shared/Chunks/disclaimer.md" />

###[Active Directory on Windows Azure Virtual Machines](http://msdn.microsoft.com/en-us/library/windowsazure/jj156090.aspx)
###[Guidelines for Deploying Windows Server Active Directory on Windows Azure Virtual Machines](http://msdn.microsoft.com/en-us/library/windowsazure/jj156090.aspx)

Learn about the differences between deploying Windows Server Active Directory Domain Services (AD DS) and Active Directory Federations Services (AD FS) on-premises versus deploying on Windows Azure Virtual Machines. Understand the decisions that affect design and deployment that you have to make.

Expand Down

0 comments on commit 4cb38f5

Please sign in to comment.