Merge pull request #9006 from abpframework/auto-merge/rel-4-3/381

Merge branch dev with rel-4.3

docs/en/Modules/Cms-Kit.md

@@ -3,7 +3,7 @@
 This module provides CMS(Content Management System) capabilities for your application.
 
 * Provides a **page** management system to manage dynamic pages.
-* Provides a **blog** system to create blogs and publish posts.
+* Provides a [**blog**](cms-kit/Blog-System.md) system to create blogs and publish posts.
 * Provides a [**tag**](cms-kit/Tag-Management.md) system to tag any kind of resources, like blog posts.
 * Provides a [**comment**](cms-kit/Comment-System.md) system to add comments feature to any kind of resource, like blog posts, products, etc.
 * Provides a [**reaction**](cms-kit/Reaction-System.md) system to add reactions feature to any kind of resource, like blog posts or comments.

docs/en/Road-Map.md

@@ -6,7 +6,7 @@ This document provides a road map, release schedule and planned features for the
 
 ### v4.4
 
-This version will focus on **documentation** and **improvements** of current features. In addition, the following features are planned;
+This version will focus on **documentation** and **improvements** of current features. In addition, the following features are planned:
 
 * Publishing distributed events as transactional ([#6126](https://github.com/abpframework/abp/issues/6126))
 * Revisit the microservice demo solution ([#8385](https://github.com/abpframework/abp/issues/8385))
@@ -17,38 +17,31 @@ This version will focus on **documentation** and **improvements** of current fea
 
 **Planned release date**: End of Quarter 2, 2021.
 
-### v4.5
-
-We planned to focus on v5.0 after 4.4 release. However, we may release v4.5 if we see it necessary.
-
 ### v5.0
 
-This version will focus on .NET 6 and performance improvements.
+We planned to focus on the ABP Framework v5.0 after the 4.4 release. This version will focus on the following works:
 
-* Upgrading to .NET 6
-* .NET Trimming compatibility
-* Using source generators and reducing reflection usage
-* Performance improvements
-* Improving the abp.io platform
+* Upgrading to .NET 6.0 ([#9004](https://github.com/abpframework/abp/issues/9004))
+* Upgrading to Bootstrap 5.x ([#8922](https://github.com/abpframework/abp/issues/8922))
+* Alternative to IdentityServer4 ([#7221](https://github.com/abpframework/abp/issues/7221))
+* Dapr integration ([#2183](https://github.com/abpframework/abp/issues/2183))
+* Resource based authorization system ([#236](https://github.com/abpframework/abp/issues/236))
 * API Versioning system: finalize & document ([#497](https://github.com/abpframework/abp/issues/497))
+* Performance optimizations; Enabling .NET Trimming, using source generators and reducing reflection, etc.
+* Improving the abp.io platform and work more on contents and documents
 
 **Planned release date**: End of Quarter 4, 2021.
 
-> Note: v5.0 features will be more clear in the next months. We will consider to add new features from the *Backlog Items*.
-
 ## Backlog Items
 
 The *Next Versions* section above shows the main focus of the planned versions. However, in each release we add new features to the core framework and the [application modules](Modules/Index.md).
 
 Here, a list of major items in the backlog we are considering to work on in the next versions.
 
-* [#2183](https://github.com/abpframework/abp/issues/2183) / Dapr integration
 * [#2882](https://github.com/abpframework/abp/issues/2882) / Providing a gRPC integration infrastructure (while it is [already possible](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) to create or consume gRPC endpoints for your application, we plan to create endpoints for the [standard application modules](https://docs.abp.io/en/abp/latest/Modules/Index))
-* [#633](https://github.com/abpframework/abp/issues/633) / Realtime notification system
-* [#236](https://github.com/abpframework/abp/issues/236) / Resource based authorization system
 * [#1754](https://github.com/abpframework/abp/issues/1754) / Multi-lingual entities
 * [#57](https://github.com/abpframework/abp/issues/57) / Built-in CQRS infrastructure
-* [#336](https://github.com/abpframework/abp/issues/336) / Health Check abstraction
+* [#336](https://github.com/abpframework/abp/issues/336) / Health Check abstractions
 * [#2532](https://github.com/abpframework/abp/issues/2532), [#2564](https://github.com/abpframework/abp/issues/2465) / CosmosDB integration with EF Core and MongoDB API
 * [#4223](https://github.com/abpframework/abp/issues/4223) / WebHook system
 * [#162](https://github.com/abpframework/abp/issues/162) / Azure ElasticDB Integration for multitenancy

docs/en/String-Encryption.md

@@ -43,9 +43,9 @@ All encryption operations are included in `IStringEncryptionService`. You can in
 ```csharp
  public class MyService : DomainService
  {
-     public IStringEncryptionService StringEncryptionService { get; }
+     protected IStringEncryptionService StringEncryptionService { get; }
 
-     public MyAppService(IStringEncryptionService stringEncryptionService)
+     public MyService(IStringEncryptionService stringEncryptionService)
      {
          StringEncryptionService = stringEncryptionService;
      }
@@ -69,11 +69,14 @@ All encryption operations are included in `IStringEncryptionService`. You can in
 `IStringEncryptionService` methods has **passPharase** parameter with default value and it uses default PassPhrase when you don't pass passPhrase parameter. 
 
 ```csharp
-StringEncryptionService.Encrypt(value); // Default Pass Phrase
-StringEncryptionService.Encrypt(value, "MyCustomPassPhrase"); // Custom Pass Phrase
+// Default Pass Phrase
+var encryptedValue = StringEncryptionService.Encrypt(value);
+
+// Custom Pass Phrase
+var encryptedValue = StringEncryptionService.Encrypt(value, "MyCustomPassPhrase");
 
 // Encrypt & Decrypt have same parameters.
-StringEncryptionService.Decrypt(value, "MyCustomPassPhrase");
+var decryptedValue = StringEncryptionService.Decrypt(value, "MyCustomPassPhrase");
 ```
 
 ### Using Custom Salt
@@ -81,11 +84,14 @@ StringEncryptionService.Decrypt(value, "MyCustomPassPhrase");
 `IStringEncryptionService` methods has **salt** parameter with default value and it uses default Salt when you don't pass the parameter.
 
 ```csharp
-StringEncryptionService.Encrypt(value); // Default Salt
-StringEncryptionService.Encrypt(value, salt: Encoding.UTF8.GetBytes("MyCustomSalt")); // Custom Salt
+// Default Salt
+var encryptedValue = StringEncryptionService.Encrypt(value);
+
+// Custom Salt
+var encryptedValue = StringEncryptionService.Encrypt(value, salt: Encoding.UTF8.GetBytes("MyCustomSalt")); 
 
 // Encrypt & Decrypt have same parameters.
-StringEncryptionService.Decrypt(value,  salt: Encoding.UTF8.GetBytes("MyCustomSalt"));
+var decryptedValue = StringEncryptionService.Decrypt(value,  salt: Encoding.UTF8.GetBytes("MyCustomSalt"));
 ```
 
 ***
@@ -116,4 +122,4 @@ Configure<AbpStringEncryptionOptions>(opts =>
 
 - **Keysize:** This constant is used to determine the keysize of the encryption algorithm.
 
-  Default value: `256`
+  Default value: `256`