Merge pull request #13982 from MicrosoftDocs/repo_sync_working_branch

Albertyang0 · web-flow · commit c8ca54113a27 · 2025-06-09T14:58:48.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch main)
diff --git a/docs/sharepoint/creating-an-association-between-entities.md b/docs/sharepoint/creating-an-association-between-entities.md
@@ -9,10 +9,10 @@ dev_langs:
   - "VB"
   - "CSharp"
 helpviewer_keywords:
-  - "BDC [SharePoint development in Visual Studio], create an assocation"
+  - "BDC [SharePoint development in Visual Studio], create an association"
   - "Business Data Connectivity service [SharePoint development in Visual Studio], associations between entities"
   - "BDC [SharePoint development in Visual Studio], associations between entities"
-  - "Business Data Connectivity service [SharePoint development in Visual Studio], create an assocation"
+  - "Business Data Connectivity service [SharePoint development in Visual Studio], create an association"
   - "Business Data Connectivity service [SharePoint development in Visual Studio], associate external content types"
   - "Business Data Connectivity service [SharePoint development in Visual Studio], relate entities"
   - "BDC [SharePoint development in Visual Studio], relate entities"
diff --git a/docs/sharepoint/how-to-create-an-association-between-entities.md b/docs/sharepoint/how-to-create-an-association-between-entities.md
@@ -9,10 +9,10 @@ dev_langs:
   - "VB"
   - "CSharp"
 helpviewer_keywords:
-  - "BDC [SharePoint development in Visual Studio], create an assocation"
+  - "BDC [SharePoint development in Visual Studio], create an association"
   - "Business Data Connectivity service [SharePoint development in Visual Studio], associations between entities"
   - "BDC [SharePoint development in Visual Studio], associations between entities"
-  - "Business Data Connectivity service [SharePoint development in Visual Studio], create an assocation"
+  - "Business Data Connectivity service [SharePoint development in Visual Studio], create an association"
   - "Business Data Connectivity service [SharePoint development in Visual Studio], associate external content types"
   - "Business Data Connectivity service [SharePoint development in Visual Studio], relate entities"
   - "BDC [SharePoint development in Visual Studio], relate entities"
diff --git a/docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_OutlookDemo/cpp/MainFrm.cpp b/docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_OutlookDemo/cpp/MainFrm.cpp
@@ -592,7 +592,7 @@ void CMainFrame::SetWorkSpace(CWorkspaceObj* pWorkSpace)
 
 void CMainFrame::OnViewFoldersPopup()
 {
-	// First, calulate popup window rectangle.
+	// First, calculate popup window rectangle.
 	// Top left corner need to be under the caption's button:
 	CRect rectButton = m_wndCaption.GetButtonRect();
 	m_wndCaption.ClientToScreen(&rectButton);

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ void CMainFrame::SetWorkSpace(CWorkspaceObj* pWorkSpace)`
`592`	`592`
`593`	`593`	`void CMainFrame::OnViewFoldersPopup()`
`594`	`594`	`{`
`595`		`- // First, calulate popup window rectangle.`
	`595`	`+ // First, calculate popup window rectangle.`
`596`	`596`	`// Top left corner need to be under the caption's button:`
`597`	`597`	`CRect rectButton = m_wndCaption.GetButtonRect();`
`598`	`598`	`m_wndCaption.ClientToScreen(&rectButton);`