Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into 1471191-fix-broken-external-links

Author: john-par

docs/analysis-services/server-properties/memory-properties.md

@@ -1,6 +1,6 @@
 ---
 title: "Analysis Services Memory Properties | Microsoft Docs"
-ms.date: 01/15/2018
+ms.date: 03/15/2019
 ms.prod: sql
 ms.technology: analysis-services
 ms.custom: 
@@ -52,14 +52,12 @@ The following properties apply to both tabular and multidimensional modes unless
  Specifies a memory threshold after which the instance aggressively terminates active user sessions to reduce memory usage. All terminated sessions will receive an error about being canceled by memory pressure. The default value, zero (0), means the **HardMemoryLimit** will be set to a midway value between **TotalMemoryLimit** and the total physical memory of the system; if the physical memory of the system is larger than the virtual address space of the process, then virtual address space will be used instead to calculate **HardMemoryLimit**.  
 
 **QueryMemoryLimit**   
-Azure Analysis Services only. An advanced property to control how much memory can be used by temporary results during a query. Applies only to DAX measures and queries. It does not account for general memory allocations used by the query. Specified in percentage, the default value is determined by your plan. 
+Azure Analysis Services only. An advanced property to control how much memory can be used by temporary results during a query. Applies only to DAX measures and queries. It does not account for general memory allocations used by the query. Specified in percentage up to 100. Beyond that, it's in bytes. Setting a value of 0 means no limit is specified. For Azure Analysis, the default value is determined by your plan. 
 
 |Plan  |Default  |
 |---------|---------|
 |D1     |   80      |
-|All other plans     |    20     |
-
-This property can be changed. Setting a value of 0 means no limit is specified.
+|All other plans     |    20     | 
 
  **VirtualMemoryLimit**  
   An advanced property that you should not change, except under the guidance of [!INCLUDE[msCoName](../../includes/msconame-md.md)] support.  

docs/analysis-services/server-properties/olap-properties.md

@@ -1,6 +1,6 @@
 ---
 title: "Analysis Services OLAP Properties | Microsoft Docs"
-ms.date: 06/07/2018
+ms.date: 03/15/2019
 ms.prod: sql
 ms.technology: analysis-services
 ms.custom: 
@@ -11,7 +11,7 @@ author: minewiskan
 manager: kfile
 ---
 # OLAP Properties
-[!INCLUDE[ssas-appliesto-sqlas](../../includes/ssas-appliesto-sqlas.md)]
+[!INCLUDE[ssas-appliesto-sqlas-all-aas](../../includes/ssas-appliesto-sqlas-all-aas.md)]
 
   [!INCLUDE[ssASnoversion](../../includes/ssasnoversion-md.md)] supports the OLAP server properties listed in the following tables. For more information about additional server properties and how to set them, see [Server Properties in Analysis Services](../../analysis-services/server-properties/server-properties-in-analysis-services.md).  
 
@@ -260,7 +260,10 @@ Approach for estimating dimension cache requirements:
 
  **MaxRolapOrConditions**  
  An advanced property that you should not change, except under the guidance of [!INCLUDE[msCoName](../../includes/msconame-md.md)] support.  
-  
+ 
+ **RowsetSerializationLimit**   
+ Applies to Azure Analysis Services. Limits the number of rows returned in a rowset to clients. Default value is -1, meaning no limit is applied. Applies to both DAX and MDX queries. It can be used to protect server resources from extensive data export. Queries submitted to the server that exceed the limit are cancelled and an error is returned.  
+
  **UseCalculationCacheRegistry**  
  An advanced property that you should not change, except under the guidance of [!INCLUDE[msCoName](../../includes/msconame-md.md)] support.  
 

docs/database-engine/configure-windows/server-memory-server-configuration-options.md

@@ -118,26 +118,29 @@ To enable the lock pages in memory option:
 
 ## Providing the maximum amount of memory to SQL Server  
 Memory can be configured up to the process virtual address space limit in all [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] editions. For more information, see [Memory Limits for Windows and Windows Server Releases](/windows/desktop/Memory/memory-limits-for-windows-releases#physical_memory_limits_windows_server_2016).
-  
-## Examples  
-  
-### Example A  
- The following example sets the `max server memory` option to 4 GB:  
-  
-```sql  
-sp_configure 'show advanced options', 1;  
-GO  
-RECONFIGURE;  
-GO  
-sp_configure 'max server memory', 4096;  
-GO  
-RECONFIGURE;  
-GO  
-```  
-  
+
+## Examples
+
+### Example A. Set the max server memory option to 4 GB.
+ The following example sets the `max server memory` option to 4 GB.  Note that although `sp_configure` specifies the name of the option as `max server memory (MB)`, the example demonstrates omitting the `(MB)`.
+
+```sql
+sp_configure 'show advanced options', 1;
+GO
+RECONFIGURE;
+GO
+sp_configure 'max server memory', 4096;
+GO
+RECONFIGURE;
+GO
+```
+This will output a statement similar to:
+
+> Configuration option 'max server memory (MB)' changed from 2147483647 to 4096. Run the RECONFIGURE statement to install.
+
 ### Example B. Determining Current Memory Allocation  
  The following query returns information about currently allocated memory.  
-  
+
 ```sql  
 SELECT 
   physical_memory_in_use_kb/1024 AS sql_physical_memory_in_use_MB, 
@@ -152,6 +155,14 @@ SELECT
 	process_virtual_memory_low AS sql_process_virtual_memory_low
 FROM sys.dm_os_process_memory;  
 ```  
+
+### Example C. Determining value for 'max server memory (MB)'
+The following query returns information about the currently configured value and the value in use by SQL Server.  This query will return results regardless of whether 'show advanced options' is true.
+
+```sql
+SELECT c.value, c.value_in_use
+FROM sys.configurations c WHERE c.[name] = 'max server memory (MB)'
+```
 
 ## See Also  
  [Memory Management Architecture Guide](../../relational-databases/memory-management-architecture-guide.md)