Manual conflict resolution

Author: VesaJuvonen

docs/declarative-customization/column-formatting.md

@@ -435,7 +435,7 @@ To compare a date/time field value against another date constant, use the `Date(
 
 ## Create clickable actions
 
-You can use column formatting to provide hyperlinks that go to other web pages, or start custom functionality. This functionality is limited to static links that can be paramaterized with values from fields in the list. You can't use column formatting to output links to protocols other than `http://`, `https://`, or `mailto:`.
+You can use column formatting to provide hyperlinks that go to other webpages, or start custom functionality. This functionality is limited to static links that can be paramaterized with values from fields in the list. You can't use column formatting to output links to protocols other than `http://`, `https://`, or `mailto:`.
 
 ### Turn field values into hyperlinks (basic)
 

docs/features/hub-site/hub-site-overview.md

@@ -21,7 +21,7 @@ For more information about creating hub sites, see [Create SharePoint hub sites
 
 - You can create up to 50 hub sites for an organization. 
 
-- If you set up [SharePoint Multi-Geo](https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/multigeo-introduction) for your organization, only sites within the same geographical ___location can be associated with a hub site. 
+- If you set up [SharePoint Multi-Geo](../../solution-guidance/multigeo-introduction.md) for your organization, only sites within the same geographical ___location can be associated with a hub site. 
 
 - When users associate their sites with a hub site, it doesn't impact the permissions of either the hub site or the associated sites. It's important to ensure that all users you allow to associate sites to the hub site have permission to the hub site. 
 

docs/general-development/access-sharepoint-from-mobile-and-native-device-apps.md

@@ -76,4 +76,4 @@ You can build these apps on the ASP.NET platform or a non-Microsoft stack. If yo
 These apps **gain authorized access to SharePoint data by using access tokens** that are issued by the Azure Control Service (ACS) in compliance with the OAuth Authentication Code flow. For more, see [Authorization Code OAuth flow for SharePoint Add-ins](http://msdn.microsoft.com/library/e89e91c7-ea39-49b9-af5a-7f047a7e2ab7%28Office.15%29.aspx).
 
 > [!IMPORTANT]
-> Azure Access Control (ACS), a service of Azure Active Directory (Azure AD), will be retired on November 7, 2018. This retirement does not impact SharePoint add-in model which is using `https://accounts.accesscontrol.windows.net` hostname, which is not impacted by this retirement. See more details on this from [Impact of Azure Access Control retirement for SharePoint add-ins](https://dev.office.com/blogs/impact-of-azure-access-control-deprecation-for-sharepoint-add-ins).
+> Azure Access Control (ACS), a service of Azure Active Directory (Azure AD), will be retired on November 7, 2018. This retirement does not impact the SharePoint Add-in model, which uses the `https://accounts.accesscontrol.windows.net` hostname (which is not impacted by this retirement). For more information, see [Impact of Azure Access Control retirement for SharePoint Add-ins](https://dev.office.com/blogs/impact-of-azure-access-control-deprecation-for-sharepoint-add-ins).

docs/general-development/accessing-a-schema.md

@@ -31,7 +31,7 @@ This topic shows one example of how you can access and look at a schema for the
 http://myserver/_vti_bin/ExcelRest.aspx/Docs/Documents/sampleWorkbook.xlsx/model/Ranges('Sheet1!A1|H3')?$format=atom
 ```
 
-Right-click the Web page, and then click **View Source**.
+Right-click the webpage, and then click **View Source**.
 
 
 

docs/general-development/advanced-scenarios-and-additional-samples.md

@@ -8,7 +8,7 @@ ms.assetid: 110bcc88-2b55-4d80-ab5c-dc3b9658e48d
 
 # Advanced Scenarios and Additional Samples
 
-This topic describes some advanced REST scenarios and additional samples. It provides links to Web pages where you can get more detailed information.
+This topic describes some advanced REST scenarios and additional samples. It provides links to webpages where you can get more detailed information.
 
 
 

docs/general-development/authentication-authorization-and-security-in-sharepoint.md

@@ -177,7 +177,7 @@ The role manager is optional. If a custom authentication system does not support
 
 
 
-In ASP.NET membership and role passive sign-in, the sign-in happens by redirecting the client to a web page where the ASP.NET log-in controls are hosted. After the identity object that represents a user identity is created, SharePoint converts it to a  [ClaimsIdentity](https://msdn.microsoft.com/library/Microsoft.IdentityModel.Claims.ClaimsIdentity.aspx) object (which represents a claims-based representation of a user).
+In ASP.NET membership and role passive sign-in, the sign-in happens by redirecting the client to a webpage where the ASP.NET log-in controls are hosted. After the identity object that represents a user identity is created, SharePoint converts it to a  [ClaimsIdentity](https://msdn.microsoft.com/library/Microsoft.IdentityModel.Claims.ClaimsIdentity.aspx) object (which represents a claims-based representation of a user).
 
 > [!NOTE]
 > For more information about signing into SharePoint, see  [Incoming claims: Signing into SharePoint](incoming-claims-signing-into-sharepoint.md). 

docs/general-development/bdc-model-schema-reference-for-sharepoint.md

@@ -160,7 +160,7 @@ By default, the Business Data Connectivity (BDC) service provides actions such a
 
 
 
-Actions travel with an external content type. That is, after you define an action for an external content type, the action appears everywhere you display that external content type—whether in an external list or Business Data Web Part or in an External Data column. 
+Actions travel with an external content type. That is, after you define an action for an external content type, the action appears everywhere you display that external content type—whether in an external list or Business Data web part or in an External Data column. 
 
 
 

docs/general-development/build-reusable-components-for-sharepoint.md

@@ -7,11 +7,11 @@ ms.assetid: bb4467e2-57f0-4cf1-91b8-4d3d8d2358cb
 
 
 # Build reusable components for SharePoint
-Learn about some of the most important reusable components you can build in SharePoint, including Web Parts, workflows, custom lists, and more.
+Learn about some of the most important reusable components you can build in SharePoint, including web parts, workflows, custom lists, and more.
 ## Reusable components in SharePoint
 <a name="SP15Reusecomp_Reusable"> </a>
 
-Using SharePoint, you can build a variety of components, such as lists, Web Parts, and content types, which you can reuse in various apps, sites, and solutions. This section summarizes some of the most common reusable components that you can build in SharePoint. Future updates to this documentation will contain information about additional components you can build.
+Using SharePoint, you can build a variety of components, such as lists, web parts, and content types, which you can reuse in various apps, sites, and solutions. This section summarizes some of the most common reusable components that you can build in SharePoint. Future updates to this documentation will contain information about additional components you can build.
 
 
 > [!NOTE]
@@ -21,7 +21,7 @@ Using SharePoint, you can build a variety of components, such as lists, Web Part
 
 
 
-- **Web Parts** are the most common way to extend SharePoint. Learning to build Web Parts is a great way to start SharePoint development. For more information, see [SharePoint Developer Building Blocks: Technologies for Creating SharePoint Applications](http://msdn.microsoft.com/library/138422cf-c140-466a-bcd8-cacba51ef886%28Office.15%29.aspx#bb2_WebParts).
+- **Web Parts** are the most common way to extend SharePoint. Learning to build web parts is a great way to start SharePoint development. For more information, see [SharePoint Developer Building Blocks: Technologies for Creating SharePoint Applications](http://msdn.microsoft.com/library/138422cf-c140-466a-bcd8-cacba51ef886%28Office.15%29.aspx#bb2_WebParts).
 
 
 - **Custom lists** in SharePoint sites provide locations to store data. Data manipulation in SharePoint lists is a widely used practice. You can use lists to contain data that you access programmatically. For more information, see [Building Block: Lists and Document Libraries](http://msdn.microsoft.com/library/16da8f64-f53b-4490-8636-db0e4d7a6912%28Office.15%29.aspx).

docs/general-development/build-sites-for-sharepoint.md

@@ -83,7 +83,7 @@ Page layouts are used by individual pages of a certain type. They are populated
 ## Client-side rendering controls
 <a name="SP15_BuildSitesForSP2013_ClientSideRendering"> </a>
 
-All new controls in SharePoint are rendered. Data is written to the controls in a client-side JSON array, and you can display content using JavaScript, CSS, and templates. As a designer or developer, you have control over how content is rendered on the page, and you can use various design techniques to get the look and behaviors you want on your published pages by using features like the  [Content Search Web Part in SharePoint](content-search-web-part-in-sharepoint.md) and display templates.
+All new controls in SharePoint are rendered. Data is written to the controls in a client-side JSON array, and you can display content using JavaScript, CSS, and templates. As a designer or developer, you have control over how content is rendered on the page, and you can use various design techniques to get the look and behaviors you want on your published pages by using features like the  [Content Search web part in SharePoint](content-search-web-part-in-sharepoint.md) and display templates.
 
 
 
@@ -114,7 +114,7 @@ SharePoint offers the following new content publishing features that enable you
 
 ### Catalogs
 
-SharePoint introduces catalogs, which you can use to publish content across site collections. Cross-site publishing features depend on catalogs. You can use them to reuse content across your sites and across the boundary between your intranet sites and Internet sites. For predefined search queries, catalogs are flagged in search. You can surface content stored in catalogs across site collections by using the  [Content Search Web Part in SharePoint](content-search-web-part-in-sharepoint.md).
+SharePoint introduces catalogs, which you can use to publish content across site collections. Cross-site publishing features depend on catalogs. You can use them to reuse content across your sites and across the boundary between your intranet sites and Internet sites. For predefined search queries, catalogs are flagged in search. You can surface content stored in catalogs across site collections by using the  [Content Search web part in SharePoint](content-search-web-part-in-sharepoint.md).
 
 
 

docs/general-development/choose-the-right-api-set-in-sharepoint.md

@@ -20,7 +20,7 @@ You can choose from several sets of APIs to access the SharePoint platform. Whic
 
 
 
-- **The type of application.** The possibilities include, but are not limited to, the following, which are not mutually exclusive categories: an SharePoint Add-in, a Web Part on a SharePoint page, a Silverlight application running on either a client computer or a client mobile device, an ASP.NET application exposed in SharePoint by an IFrame, JavaScript running in a SharePoint site page, a SharePoint application page, a Microsoft .NET Framework application running on a client computer, a Windows PowerShell script, and a timer job running on a SharePoint server.
+- **The type of application.** The possibilities include, but are not limited to, the following, which are not mutually exclusive categories: an SharePoint Add-in, a web part on a SharePoint page, a Silverlight application running on either a client computer or a client mobile device, an ASP.NET application exposed in SharePoint by an IFrame, JavaScript running in a SharePoint site page, a SharePoint application page, a Microsoft .NET Framework application running on a client computer, a Windows PowerShell script, and a timer job running on a SharePoint server.
 
 
 - **Your existing skills.** To a surprising degree, you can create applications in SharePoint without needing to learn a lot about SharePoint programming. You can jump right into SharePoint development if you already have experience in any of the following programming models:
@@ -93,13 +93,13 @@ The following table provides guidance on which set of APIs to use for a selected
 |Create a timer job  <br/> |Server object model  <br/> |
 |Create an extension of Central Administration  <br/> |Server object model  <br/> |
 |Create consistent branding across an entire SharePoint farm  <br/> |Server object model  <br/> |
-|Create a custom Web Part, application page, or ASP.NET user control  <br/> |Server object model  <br/> **Important:** If the functionality you want to offer customers is not oriented to SharePoint administration at a scope broader than site collection, we recommend that, instead of using the server object model, you create an SharePoint Add-in that includes a remote ASP.NET web application with custom Web Parts and user controls as needed. See the top two rows of this table.           |
+|Create a custom web part, application page, or ASP.NET user control  <br/> |Server object model  <br/> **Important:** If the functionality you want to offer customers is not oriented to SharePoint administration at a scope broader than site collection, we recommend that, instead of using the server object model, you create an SharePoint Add-in that includes a remote ASP.NET web application with custom web parts and user controls as needed. See the top two rows of this table.           |
 
 
 ## Server object model
 <a name="ServerOM"> </a>
 
-The largest set of APIs is in the server object model of managed classes. At the level of SharePoint Foundation 2013, this object model includes classes and members that enable programmatic control of the basic site and list structure of SharePoint Foundation. Most of these classes are in the  [Microsoft.SharePoint](https://msdn.microsoft.com/library/Microsoft.SharePoint.aspx) namespace. In addition, you can extend almost every SharePoint Foundation component by using the server object model, including workflows, alerts, Web Parts, basic search, and Microsoft Business Connectivity Services (BCS). The server object model also includes an extensive set of APIs enable extensions of the administration and security system of SharePoint Foundation, including backup, farm health and diagnostics, logging, farm and web application management, upgrade, deployment, caching, and Windows PowerShell customization.
+The largest set of APIs is in the server object model of managed classes. At the level of SharePoint Foundation 2013, this object model includes classes and members that enable programmatic control of the basic site and list structure of SharePoint Foundation. Most of these classes are in the  [Microsoft.SharePoint](https://msdn.microsoft.com/library/Microsoft.SharePoint.aspx) namespace. In addition, you can extend almost every SharePoint Foundation component by using the server object model, including workflows, alerts, web parts, basic search, and Microsoft Business Connectivity Services (BCS). The server object model also includes an extensive set of APIs enable extensions of the administration and security system of SharePoint Foundation, including backup, farm health and diagnostics, logging, farm and web application management, upgrade, deployment, caching, and Windows PowerShell customization.