merging

Author: 00Kai0

CODEOWNERS

@@ -20,7 +20,7 @@
 /specification/containerservice/ @yangl900
 /specification/cosmos-db/ @dmakwana @MehaKaushik @wmengmsft @shurd
 /specification/customer-insights/ @tjlvtao
-/specification/datafactory/ @zhangyd2015
+/specification/datafactory/ @shawnxzq
 /specification/datalake-analytics/ @ro-joowan
 /specification/datalake-store/ @ro-joowan
 /specification/datamigration/ @hitenjava

custom-words.txt

@@ -148,6 +148,7 @@ atascada
 attestationcollateral
 audiodata
 Auditd
+australiacentral
 australiaeast
 australiasoutheast
 authenticatable
@@ -287,7 +288,9 @@ bot's
 botservice
 boundingbox
 boundingzoom
+brazileast
 brazilsouth
+brazilsoutheast
 BRCPF
 browsable
 bruceper
@@ -571,7 +574,7 @@ diagnosticcontext
 diarization
 dicom
 Dicom
-DICOM 
+DICOM
 dicomservice
 dicomservices
 digitaltwins
@@ -726,6 +729,7 @@ fileurl
 findsimilars
 findsquare
 firmwares
+Flexera
 fluentd
 forceclosehandles
 forestsummary
@@ -734,6 +738,8 @@ FPGA
 fqdn
 FQDNs
 Français
+francecentral
+francesouth
 freebsd
 freeflow
 frontdoor
@@ -767,6 +773,8 @@ geojson
 georegions
 georeplication
 geospatial
+germanynorth
+germanywestcentral
 GETACLSTATUS
 getactivationkey
 getactivesessions
@@ -1170,6 +1178,7 @@ Mibps
 microservices
 microsofttranslator
 migratemysql
+migrateproject
 migratetoaad
 Miliseconds
 mincoordinates
@@ -1194,6 +1203,7 @@ monitoringconfiguration
 monitoringconfigurations
 Monospace
 mountainview
+Movere
 MPNS
 MRAN
 mrenclave
@@ -1212,6 +1222,7 @@ msixpackages
 MSIXpackages
 MSLISTSTATUS
 MSMCAZR
+msrp
 MSTI
 mucho
 multiapi
@@ -1307,6 +1318,8 @@ Nonsupported
 nopublicipaddresses
 northcentralus
 northeurope
+norwayeast
+norwaywest
 nostore
 notebookapis
 notificationchannels
@@ -1636,6 +1649,7 @@ reseller
 reservationorders
 resetapikey
 resetconnection
+resetdocs
 resetvpnclientsharedkey
 Resolvability
 resourcegraph
@@ -1837,6 +1851,8 @@ sorani
 sortorder
 soundex
 sourcecontrols
+southafricanorth
+southafricawest
 southcentralus
 southeastasia
 southindia
@@ -1952,7 +1968,10 @@ svpn
 swappable
 swappiness
 Swappiness
+swedensouth
 switchprotection
+switzerlandnorth
+switzerlandwest
 Sybase
 Syncer
 syncfunctiontriggers
@@ -2057,11 +2076,15 @@ typeahead
 typedefs
 Typeless
 typeperf
+uaecentral
+uaenorth
+uaesouth
 udid
 udids
 UEBA
 UEFI
 Uint
+uknorth
 uksouth
 ukwest
 Ulaanbaatar

specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json

@@ -86,6 +86,7 @@
           "description": "The role of the administrator."
         }
       },
+      "type": "object",
       "description": "Classic Administrator properties."
     },
     "ClassicAdministrator": {
@@ -108,6 +109,7 @@
           "description": "Properties for the classic administrator."
         }
       },
+      "type": "object",
       "description": "Classic Administrators"
     },
     "ClassicAdministratorListResult": {
@@ -124,6 +126,7 @@
           "description": "The URL to use for getting the next set of results."
         }
       },
+      "type": "object",
       "description": "ClassicAdministrator list result information."
     }
   },

specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json

@@ -142,6 +142,7 @@
           "description": "The resource type operations."
         }
       },
+      "type": "object",
       "description": "Resource Type"
     },
     "ProviderOperation": {
@@ -172,6 +173,7 @@
           "description": "The dataAction flag to specify the operation type."
         }
       },
+      "type": "object",
       "description": "Operation"
     },
     "ProviderOperationsMetadata": {
@@ -207,6 +209,7 @@
           "description": "The provider operations."
         }
       },
+      "type": "object",
       "description": "Provider Operations metadata"
     },
     "ProviderOperationsMetadataListResult": {
@@ -223,6 +226,7 @@
           "description": "The URL to use for getting the next set of results."
         }
       },
+      "type": "object",
       "description": "Provider operations metadata list"
     }
   },
@@ -233,6 +237,7 @@
       "required": true,
       "type": "string",
       "description": "The namespace of the resource provider.",
+      "x-ms-skip-url-encoding": true,
       "x-ms-parameter-location": "method"
     }
   }

specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json

@@ -661,6 +661,7 @@
       "required": true,
       "type": "string",
       "description": "The namespace of the resource provider.",
+      "x-ms-skip-url-encoding": true,
       "x-ms-parameter-location": "method"
     }
   }

specification/authorization/resource-manager/Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json

@@ -88,7 +88,7 @@
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "#/parameters/ResourceProviderNamespaceParameter"
+            "$ref": "../2020-10-01-preview/common-types.json#/parameters/ResourceProviderNamespaceParameter"
           },
           {
             "name": "parentResourcePath",
@@ -404,6 +404,7 @@
           "description": "Returns role definition with the specific type."
         }
       },
+      "type": "object",
       "description": "Role Definitions filter"
     },
     "RoleDefinitionProperties": {
@@ -436,6 +437,7 @@
           "description": "Role definition assignable scopes."
         }
       },
+      "type": "object",
       "description": "Role definition properties."
     },
     "RoleDefinition": {
@@ -461,6 +463,7 @@
           "description": "Role definition properties."
         }
       },
+      "type": "object",
       "description": "Role definition."
     },
     "RoleDefinitionListResult": {
@@ -477,6 +480,7 @@
           "description": "The URL to use for getting the next set of results."
         }
       },
+      "type": "object",
       "description": "Role definition list operation result."
     },
     "PermissionGetResult": {
@@ -493,6 +497,7 @@
           "description": "The URL to use for getting the next set of results."
         }
       },
+      "type": "object",
       "description": "Permissions information."
     },
     "Permission": {
@@ -526,18 +531,11 @@
           "description": "Denied Data actions."
         }
       },
+      "type": "object",
       "description": "Role definition permissions."
     }
   },
   "parameters": {
-    "ResourceProviderNamespaceParameter": {
-      "name": "resourceProviderNamespace",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "description": "The namespace of the resource provider.",
-      "x-ms-parameter-location": "method"
-    },
     "FilterParameter": {
       "name": "$filter",
       "in": "query",