Merge pull request #3557 from MicrosoftDocs/master636976002051862432

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: gewarren

docs/code-quality/annotating-structs-and-classes.md

@@ -1,6 +1,6 @@
 ---
 title: Annotating Structs and Classes
-ms.date: 11/04/2016
+ms.date: 06/28/2019
 ms.topic: "conceptual"
 f1_keywords:
   - "_Field_size_bytes_part_"
@@ -26,6 +26,7 @@ ms.workload:
   - "multiple"
 ---
 # Annotating Structs and Classes
+
 You can annotate struct and class members by using annotations that act like invariants—they are presumed to be true at any function call or function entry/exit that involves the enclosing structure as a parameter or a result value.
 
 ## Struct and Class Annotations
@@ -70,6 +71,39 @@ You can annotate struct and class members by using annotations that act like inv
     min(pM->nSize, sizeof(MyStruct))
     ```
 
+## Example
+
+```cpp
+#include <sal.h>
+// For FIELD_OFFSET macro
+#include <windows.h>
+
+// This _Struct_size_bytes_ is equivalent to what below _Field_size_ means.
+_Struct_size_bytes_(FIELD_OFFSET(MyBuffer, buffer) + bufferSize * sizeof(int))
+struct MyBuffer
+{
+    static int MaxBufferSize;
+    
+    _Field_z_
+    const char* name;
+    
+    int firstField;
+
+    // ... other fields
+
+    _Field_range_(1, MaxBufferSize)
+    int bufferSize;
+    _Field_size_(bufferSize)        // Prefered way - easier to read and maintain.
+    int buffer[0];
+};
+```
+
+Notes for this example:
+
+- `_Field_z_` is equivalent to `_Null_terminated_`.  `_Field_z_` for the name field specifies that the name field is a null-terminated string.
+- `_Field_range_` for `bufferSize` specifies that the value of `bufferSize` should be within 1 and `MaxBufferSize` (both inclusive).
+- The end results of the `_Struct_size_bytes_` and `_Field_size_` annotations are equivalent. For structures or classes that have a similar layout, `_Field_size_` is easier to read and maintain, because it has fewer references and calculations than the equivalent `_Struct_size_bytes_` annotation. `_Field_size_` doesn’t require conversion to the byte size. If byte size is the only option, for example, for a void pointer field, `_Field_size_bytes_` can be used. If both `_Struct_size_bytes_` and `_Field_size_` exist, both will be available to tools. It is up to the tool what to do if the two annotations disagree.
+
 ## See Also
 
 - [Using SAL Annotations to Reduce C/C++ Code Defects](../code-quality/using-sal-annotations-to-reduce-c-cpp-code-defects.md)

docs/index.yml

@@ -163,11 +163,11 @@ additionalContent:
             - text: Web development
               url: /aspnet/
             - text: Azure development and management
-              url: azure/index.yml
+              url: /visualstudio/azure
             - text: Python
-              url: python/index.yml
+              url: /visualstudio/python
             - text: Node.js
-              url: javascript/index.yml
+              url: /visualstudio/javascript
             - text: Data storage and processing
               url: data-tools/index.md
             - text: Data science

docs/vs-2015/modeling/uml-use-case-diagrams-guidelines.md

@@ -164,11 +164,11 @@ In Visual Studio, you can draw a *use case diagram* to summarize who uses your a
 
  ![Use case showing many to many multiplicity](../modeling/media/uml-ucguidemulti2.png "UML_UCGuideMulti2")  
 
-- To state that several actors of the same class can take part in a single occurrence of a use case, set the multiplicity at the actor end of the association to **1..\\***.  
+- To state that several actors of the same class can take part in a single occurrence of a use case, set the multiplicity at the actor end of the association to **1..\***.  
 
    In the illustration, one or more restaurants can take part in fulfilling the same meal order.  
 
-- To show that each actor can participate at the same time in several occurrences of a use case, set the multiplicity at the use case end of the association to **\\***.  
+- To show that each actor can participate at the same time in several occurrences of a use case, set the multiplicity at the use case end of the association to **\***.  
 
    In the illustration, each restaurant can work on fulfilling more than one order at a time.  
 
@@ -184,11 +184,11 @@ In Visual Studio, you can draw a *use case diagram* to summarize who uses your a
 
    - **1** to state that exactly one instance of this role participates in each link.  
 
-   - **1..\\*** to state that one or more instance of this role participate in each link.  
+   - **1..\*** to state that one or more instance of this role participate in each link.  
 
    - **0..1** to state that participation is optional.  
 
-   - **\\*** to state that zero or more instances of this role participate in the link.  
+   - **\*** to state that zero or more instances of this role participate in the link.  
 
 > [!NOTE]
 > Many teams do not place multiplicity information on use case diagrams, leaving the multiplicities at the default value of 1. Instead, they provide the information in separate descriptions of the use cases. In this case, all the multiplicities in the use case diagrams will be hidden.  

mac/2017/asp-net-core.md

@@ -229,7 +229,7 @@ Make sure to complete all four steps successfully to ensure that .NET Core is in
 
 This guide gave an introduction to ASP.NET Core. It describes what it is, when to use it, and provided information on using it in Visual Studio for Mac.
 For more information on the next steps from here, refer to the following guides:
-- [ASP.NET Core](/aspnet/core/?view=aspnetcore-2.1#build-web-ui-and-web-apis-using-aspnet-core-mvc) docs.
+- [ASP.NET Core](/aspnet/core/#build-web-apis-and-web-ui-using-aspnet-core-mvc) docs.
 - [Creating Backend Services for Native Mobile Applications](/aspnet/core/mobile/native-mobile-backend), which shows how to build a REST service using ASP.NET Core for a Xamarin.Forms app.
 - [ASP.NET Core hands-on lab](https://github.com/Microsoft/vs4mac-labs/tree/master/Web/Getting-Started).
 

mac/configurations.md

@@ -17,7 +17,7 @@ Each platform has specific configurations for its build.
 
 ## Solution configurations
 
-Akin to project configurations, solution configurations are used to create custom configurations for an entire project. By using the **Configuration Mappings** tab under the **Build > Configurations** item, you can assign a target configuration for each solution item, as illustrated in the following image:
+Akin to project configurations, solution configurations are used to create custom configurations for an entire project. By using the **Configuration Mappings** tab under the **Build > Configurations** item, you can assign a target configuration for each solution item, as illustrated in the following image:
 
 ![Configuration Mapping Options](media/projects-and-solutions-image3.png)
 
@@ -31,7 +31,7 @@ In Visual Studio for Mac, instead of setting a startup project, you can set a _r
 
 ![Run Configuration drop-down](media/projects-and-solutions-image8.png)
 
-A run configuration is a set of execution options with a name and several configurations that are defined in a project for different purposes. Run configurations are defined at the project level, and a default will be created automatically for each executable project, although it is possible to add as many as needed. Certain project types automatically generate additional run configurations. For example, watchOS projects may generate  _Glance and Notification configurations._
+A run configuration is a set of execution options with a name and several configurations that are defined in a project for different purposes. Run configurations are defined at the project level, and a default will be created automatically for each executable project, although it is possible to add as many as needed. Certain project types automatically generate additional run configurations. For example, watchOS projects may generate  _Glance and Notification configurations._
 
 Configurations can be shared with other developers (in which case the configurations will be stored in the .csproj file) or kept locally (in which case they will be stored in a .user file).
 
@@ -64,4 +64,4 @@ The following list provides some examples of data that could be included in run
 
 ## See also
 
-- [Understand build configurations (Visual Studio on Windows)](/visualstudio/ide/understanding-build-configurations)
+- [Understand build configurations (Visual Studio on Windows)](/visualstudio/ide/understanding-build-configurations)

subscriptions/subscriber-benefits.md

@@ -2,18 +2,19 @@
 title: Visual Studio Subscriptions - Subscriber Benefits
 author: evanwindom
 ms.author: jaunger
-manager: evelynp
-ms.date: 02/12/2018
+manager: lank
+ms.date: 06/28/2019
 ms.topic: conceptual
 description:  Learn about the benefits included in your Visual Studio subscription
 searchscope: VS Subscription
 ---
 
 # Benefits included in your Visual Studio subscription
 
-Visual Studio subscriptions offer the most comprehensive set of resources for you to create, deploy, and manage great applications on your preferred platforms and devices, including Windows, iOS, Android, and Linux.  The specific benefits will vary based on the type of subscription you have.  To provide the maximum value for subscribers, the benefits provided change periodically as we make adjustments to focus on the newest and most useful technologies, training materials, and partner benefits available.
+Visual Studio subscriptions (formerly known as MSDN subscriptions) offer the most comprehensive set of resources for you to create, deploy, and manage great applications on your preferred platforms and devices, including Windows, iOS, Android, and Linux.  The specific benefits will vary based on the type of subscription you have.  To provide the maximum value for subscribers, the benefits provided change periodically as we make adjustments to focus on the newest and most useful technologies, training materials, and partner benefits available.
 
-Benefits are grouped into three categories:
+
+Benefits are grouped into three categories in the [subscriber portal](https://my.visualstudio.com/benefits?wt.mc_id=o~msft~docs:).
 
 ## Tools
 The Tools category provides access to a wide variety of benefits, including flagship benefits such as the [Visual Studio IDE](vs-ide-benefit.md), [Azure DevOps Services](vs-azure-devops.md), and [Azure](vs-azure.md).  Depending on your subscription level, you'll also see Windows and Office 365 Developer accounts, Visual Studio App Center, and benefits from partners such as WhiteSource Bolt and ModernRequirements.
@@ -25,7 +26,7 @@ To help you continuously enhance your skillset and keep up with the latest techn
 - Microsoft Azure for .Net Developers, and other great content from Pluralsight
 - Data Science for Developers from DataCamp
 - Designing Database Solutions for SQL Server from Microsoft Virtual Academy
-- LinkedIn Learning bring you access to the people, insights, and skills you need to excel.
+- LinkedIn Learning brings you access to the people, insights, and skills you need to excel.
 
 ## Support
 As a Visual Studio subscriber, you also have access to various types of support in case you have a question or need technical assistance.