Merge remote-tracking branch 'abpframework/dev' into Translate

docs/en/Multi-Tenancy.md

@@ -98,7 +98,7 @@ The first thing for a multi-tenant application is to determine the current tenan
 
 ##### Custom Tenant Resolvers
 
-You can add your custom tenant resolver to **TenantResolveOptions** in your module's ConfigureServices method as like below:
+You can add your custom tenant resolver to **AbpTenantResolveOptions** in your module's ConfigureServices method as like below:
 
 ````C#
 using Microsoft.Extensions.DependencyInjection;
@@ -112,7 +112,7 @@ namespace MyCompany.MyProject
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<TenantResolveOptions>(options =>
+            Configure<AbpTenantResolveOptions>(options =>
             {
                 options.TenantResolvers.Add(new MyCustomTenantResolveContributor());
             });
@@ -323,7 +323,7 @@ services.Configure<AbpAspNetCoreMultiTenancyOptions>(options =>
 
 ##### Domain Tenant Resolver
 
-In a real application, most of times you will want to determine current tenant either by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). If so, you can configure TenantResolveOptions to add a domain tenant resolver.
+In a real application, most of times you will want to determine current tenant either by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). If so, you can configure AbpTenantResolveOptions to add a domain tenant resolver.
 
 ###### Example: Add a subdomain resolver
 
@@ -340,7 +340,7 @@ namespace MyCompany.MyProject
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<TenantResolveOptions>(options =>
+            Configure<AbpTenantResolveOptions>(options =>
             {
                 //Subdomain format: {0}.mydomain.com (adding as the highest priority resolver)
                 options.TenantResolvers.Insert(0, new DomainTenantResolver("{0}.mydomain.com"));

docs/zh-Hans/Multi-Tenancy.md

@@ -99,7 +99,7 @@ Volo.Abp.MultiTenancy只提供了用于确定当前租户的抽象(称为租户
 
 ##### 自定义租户解析器
 
-你可以像下面这样,在你模块的ConfigureServices方法中将自定义解析器并添加到 **TenantResolveOptions**中:
+你可以像下面这样,在你模块的ConfigureServices方法中将自定义解析器并添加到 **AbpTenantResolveOptions**中:
 
 ````C#
 using Microsoft.Extensions.DependencyInjection;
@@ -113,7 +113,7 @@ namespace MyCompany.MyProject
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<TenantResolveOptions>(options =>
+            Configure<AbpTenantResolveOptions>(options =>
             {
                 options.TenantResolvers.Add(new MyCustomTenantResolveContributor());
             });
@@ -323,7 +323,7 @@ services.Configure<AbpAspNetCoreMultiTenancyOptions>(options =>
 
 ##### 域名租户解析器
 
-实际项目中,大多数情况下你想通过子域名(如mytenant1.mydomain.com)或全域名(如mytenant.com)中确定当前租户.如果是这样,你可以配置TenantResolveOptions添加一个域名租户解析器.
+实际项目中,大多数情况下你想通过子域名(如mytenant1.mydomain.com)或全域名(如mytenant.com)中确定当前租户.如果是这样,你可以配置AbpTenantResolveOptions添加一个域名租户解析器.
 
 ###### 例子:添加子域名解析器
 
@@ -340,7 +340,7 @@ namespace MyCompany.MyProject
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<TenantResolveOptions>(options =>
+            Configure<AbpTenantResolveOptions>(options =>
             {
                 //子域名格式: {0}.mydomain.com (作为最高优先级解析器添加)
                 options.TenantResolvers.Insert(0, new DomainTenantResolver("{0}.mydomain.com"));