Merge branch 'master' into master

Author: Lauragra

.openpublishing.publish.config.json

@@ -23,13 +23,15 @@
     }
   ],
   "notification_subscribers": [
-    "[email protected]"
+    "[email protected]",
+    "[email protected]",
+    "[email protected]"
   ],
   "branches_to_filter": [],
+  "git_repository_branch_open_to_public_contributors": "master",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": false,
   "contribution_branch_mappings": {},
-  "git_repository_branch_open_to_public_contributors": "master",
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
@@ -55,4 +57,4 @@
       "nuget_feed": "https://www.myget.org/F/op/api/v2"
     }
   ]
-}
+}

docs/apis/communication-site-creation-rest.md

@@ -38,7 +38,10 @@ body:
 }
 ```
 
-Note: New in this API is the concept of SiteDesignID. Much like the in-product site creation flow, the SiteDesignID parameter maps to the included site designs. They are:
+> [!IMPORTANT]
+> lcid parameter is not currently supported with this API. You can currently only create English sites. 
+
+New in this API is the concept of SiteDesignID. Much like the in-product site creation flow, the SiteDesignID parameter maps to the included site designs. They are:
 
 - Topic: null
 - Showcase: 6142d2a0-63a5-4ba0-aede-d9fefca2c767

docs/apis/rest/determine-sharepoint-rest-service-endpoint-uris.md

@@ -1,4 +1,4 @@
----
+---
 title: Determine SharePoint REST service endpoint URIs
 ms.date: 09/25/2017
 ms.prod: sharepoint
@@ -8,15 +8,16 @@ ms.prod: sharepoint
 # Determine SharePoint REST service endpoint URIs
 Learn general guidelines for determining SharePoint REST endpoint URIs from the signature of the corresponding client object model APIs.
 
- **Before you start**
+**Before you start**
 
 -  [Get to know the SharePoint REST service](get-to-know-the-sharepoint-rest-service.md)
 -  [Navigate the SharePoint data structure represented in the REST service](navigate-the-sharepoint-data-structure-represented-in-the-rest-service.md)
 
- **Next steps**
+**Next steps**
 
 -  [Use OData query operations in SharePoint REST requests](use-odata-query-operations-in-sharepoint-rest-requests.md)
 
+
 ## SharePoint REST endpoint URI structure
 Before you can access a SharePoint resource using the REST service, you first have to figure out the URI endpoint that points to that resource. Whenever possible, the URI for these REST endpoints closely mimics the API signature of the resource in the SharePoint client object model. For example:
 
@@ -27,6 +28,7 @@ List.GetByTitle(listname).GetItems()
 ```
 
  *REST endpoint:* 
+
 ```
  http://server/site/_api/lists/getbytitle('listname')/items
 ```
@@ -36,6 +38,7 @@ In some cases, however, the endpoint URI differs from the corresponding client o
 The following figure shows the general syntax structure of SharePoint REST URIs. 
 
 **SharePoint REST URI syntax structure**
+
 ![SharePoint REST request syntax](../../images/REST_OverallSyntax.png)
 
 Some endpoints for SharePoint resources deviate from this syntax structure:
@@ -51,6 +54,7 @@ Some endpoints for SharePoint resources deviate from this syntax structure:
 
 
 ## Determine SharePoint REST service endpoints
+
 To construct a REST endpoint for a SharePoint resource, follow these steps: 
 
 1. Start with the REST service reference:
@@ -68,10 +72,12 @@ To construct a REST endpoint for a SharePoint resource, follow these steps:
      `http://server/site/_api/web/lists/getbytitle('listname')`
 
 ### Reference the SharePoint REST service in your endpoint URI
+
 Use  `_api` to denote the SharePoint REST service in your endpoint URIs. The REST service is part of the client.svc web service. However, to make REST URI construction easier and to shorten the base REST URI path, the REST service uses `_api` to abstract away the need to explicitly reference the client.svc web service. The REST service still recognizes and accepts URIs that reference the client.svc web service. For example, you can use `http://server/site/_vti_bin/client.svc/web/lists` instead of `http://server/site/_api/web/lists`. However, using  `_api` is the preferred convention. URLs have a 256 character limit, so using `_api` shortens the base URI, leaving more characters for use in constructing the rest of the URL.
 
 
 ### Specify entry points for the SharePoint REST service
+
 The main entry points for the REST service represent the site collection and site of the specified context. In this way, these entry points correspond to the  **ClientContext.Site** property and **ClientContext.Web** property in the client object models.
 
 To access a specific site collection, use the following construction:
@@ -94,9 +100,9 @@ In addition to  `/site` and `/web`, the REST service includes several other acce
 |Search|http:// _server/site_/_api/search|
 
 ### Navigate to the specific resources you want to access
-From here, construct more specific REST endpoints by ''walking" the object model, using the names of the APIs from the client object model separated by a forward slash (/). The table below shows examples of client object model calls and the equivalent REST endpoint. 
+From here, construct more specific REST endpoints by "walking" the object model, using the names of the APIs from the client object model separated by a forward slash (/). The table below shows examples of client object model calls and the equivalent REST endpoint. 
 
-|**Client object model API **|**REST endpoint**|
+|**Client object model API**|**REST endpoint**|
 |:-----|:-----|
 |ClientContext.Web.Lists|http:// _server_/ _site_/_api/web/lists|
 |ClientContext.Web.Lists[guid]|http:// _server_/ _site_/_api/web/lists(' _guid_')|
@@ -185,7 +191,7 @@ If your REST URI terminates in a method call, you can use query string syntax to
 
  `http://<server>/<site>/_api/web/applyWebTemplate?template="STS#0"`
 
-the figure below shows the REST service syntax for parameters in query string. 
+The figure below shows the REST service syntax for parameters in query string. 
 
 **REST service syntax for parameters in query string**
 ![REST service syntax for parameters in query string](../../images/REST_parameterQuerySyntax.png)

docs/declarative-customization/column-formatting.md

@@ -74,29 +74,58 @@ The following image shows an example of conditional formatting applied to a numb
 
 ![Severity warning of 70 with orange background](../images/sp-columnformatting-conditionalbasic.png)
 
-This example customizes a number field to color that field yellow when its value is 70 or less. This example adds a style attribute to the parent `<div />` element, specifies a CSS class (`sp-field-severity--warning`) to apply to that item if the value inside the field is less than or equal to 70, and specifies no color if the value is outside that range (in which case it will use the default color for values in that list view). 
-Note: this example uses a binary operation with the less than operator, "<", nested inside the conditional operation indicated by the operator, "?". Another description of the section in the following example is: If @currentField <= 70 Then class = sp-field-severity--warning.
+This example uses the conditional operator `?` to apply a class (`sp-field-severity--warning`) to the parent `<div />` element when the  value in the current field is less than or equal to 70.  This causes the field to be highlighted when the value is less than or equal to 70, and appear normally if it's greater than 70.
 
 ```JSON
 {
-   "elmType": "div",
-   "txtContent": "@currentField",
-   "attributes": {
-      "class": {
-         "operator": "?",
-         "operands": [
-            {
-               "operator": "<=",
-               "operands": [
-                  "@currentField",
-                  70
-               ]
+    "$schema": "http://columnformatting.sharepointpnp.com/columnFormattingSchema.json",
+    "debugMode": true,
+    "elmType": "div",
+    "attributes": {
+       "class": {
+          "operator": "?",
+          "operands": [
+             {
+                "operator": "<=",
+                "operands": [
+                   "@currentField",
+                   70
+                ]
+             },
+             "sp-field-severity--warning",
+             ""
+          ]
+       }
+    },
+    "children": [
+        {
+            "elmType": "span",
+            "style": {
+                "display": "inline-block",
+                "padding": "0 4px"
             },
-            "sp-field-severity--warning",
-            ""
-         ]
-      }
-   }
+            "attributes": {
+                "iconName": {
+                    "operator": "?",
+                    "operands": [
+                        {
+                            "operator": "<=",
+                            "operands": [
+                                "@currentField",                  
+                                70
+                            ]
+                        },
+                        "Error",
+                        ""
+                    ]
+                }
+            }
+        },
+        {
+            "elmType": "span",
+            "txtContent": "@currentField"
+        }
+    ]
 }
 ```
 
@@ -433,7 +462,7 @@ You can use column formatting to render quick action links next to fields. The f
                         "@currentField.email",
                         "?subject=Task status&body=Hey, how is your task coming along?.\r\n---\r\n",
                         "@currentField.title",
-                        "\r\nClick this link for more info. https://msft.spoppe.com/sites/LincolnsFunHouse2/Lists/Conference%20Prep/DispForm.aspx?ID=",
+                        "\r\nClick this link for more info. http://contoso.sharepoint.com/sites/ConferencePrep/Tasks/Prep/DispForm.aspx?ID=",
                         "[$ID]"
                     ]
                 }
@@ -563,7 +592,7 @@ This example relies on two number fields, `Before` and `After`, for which the va
 
 ## Supported Column Types
 The following column types support column formatting:
-* Single line of text
+* Single line of text 
 * Number
 * Choice
 * Person or Group
@@ -572,7 +601,13 @@ The following column types support column formatting:
 * Picture
 * Date/Time
 * Lookup
- The Name and Title fields are also supported.
+* Title (in Lists)
+
+The following are not currently supported:
+* Managed Metadata
+* Filename (in Document Libraries)
+* Calculated
+* Retention Label
 
 ## Style guidelines