Merge branch 'v1.11' into issue_3476

daprdocs/content/en/contributing/docs-contrib/contributing-docs.md

@@ -39,11 +39,11 @@ Style and tone conventions should be followed throughout all Dapr documentation
 
 ## Diagrams and images
 
-Diagrams and images are invaluable visual aids for documentation pages. Diagrams are kept in a [Dapr Diagrams Deck](https://github.com/dapr/docs/tree/v1.10/daprdocs/static/presentations), which includes guidance on style and icons. 
+Diagrams and images are invaluable visual aids for documentation pages. Diagrams are kept in a [Dapr Diagrams Deck](https://github.com/dapr/docs/tree/v1.11/daprdocs/static/presentations), which includes guidance on style and icons. 
 
 As you create diagrams for your documentation:
 
-- Save them as high-res PNG files into the [images folder](https://github.com/dapr/docs/tree/v1.10/daprdocs/static/images).
+- Save them as high-res PNG files into the [images folder](https://github.com/dapr/docs/tree/v1.11/daprdocs/static/images).
 - Name your PNG files using the convention of a concept or building block so that they are grouped.
   - For example: `service-invocation-overview.png`. 
   - For more information on calling out images using shortcode, see the [Images guidance](#images) section below.
@@ -458,4 +458,4 @@ Steps to add a language:
 
 ## Next steps
 
-Get started by copying and working from one of [the Dapr doc templates]({{< ref docs-templates >}}).
+Get started by copying and working from one of [the Dapr doc templates]({{< ref docs-templates >}}).

daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md

@@ -1,15 +1,15 @@
 ---
 type: docs
-title: "SQL Server"
-linkTitle: "SQL Server"
-description: Detailed information on the SQL Server state store component
+title: "Microsoft SQL Server & Azure SQL"
+linkTitle: "Microsoft SQL Server & Azure SQL"
+description: Detailed information on the Microsoft SQL Server and Azure SQL state store component
 aliases:
   - "/operations/components/setup-state-store/supported-state-stores/setup-sqlserver/"
 ---
 
 ## Component format
 
-To setup SQL Server state store create a component of type `state.sqlserver`. See [this guide]({{< ref "howto-get-save-state.md#step-1-setup-a-state-store" >}}) on how to create and apply a state store configuration.
+To set up Microsoft SQL Server and Azure SQL state stores, create a component of type `state.sqlserver`. See [this guide]({{< ref "howto-get-save-state.md#step-1-setup-a-state-store" >}}) on how to create and apply a state store configuration.
 
 
 ```yaml
@@ -66,11 +66,11 @@ If you wish to use SQL server as an [actor state store]({{< ref "state_api.md#co
 | cleanupIntervalInSeconds | N | Interval, in seconds, to clean up rows with an expired TTL. Default: `3600` (i.e. 1 hour). Setting this to values <=0 disables the periodic cleanup. | `1800`, `-1`
 
 
-## Create Azure SQL instance
+## Create a Microsoft SQL Server/Azure SQL instance
 
 [Follow the instructions](https://docs.microsoft.com/azure/azure-sql/database/single-database-create-quickstart?view=azuresql&tabs=azure-portal) from the Azure documentation on how to create a SQL database.  The database must be created before Dapr consumes it.
 
-**Note: SQL Server state store also supports SQL Server running on VMs and in Docker.**
+> Note: Microsoft SQL Server/Azure SQL state store also supports SQL Server running on VMs and in Docker.**
 
 In order to setup SQL Server as a state store, you need the following properties:
 

daprdocs/data/components/state_stores/azure.yaml

@@ -20,7 +20,7 @@
     etag: true
     ttl: true
     query: true
-- component: Azure SQL Server
+- component: Microsoft SQL Server
   link: setup-sqlserver
   state: Stable
   version: v1