Merge pull request #20330 from abpframework/auto-merge/rel-8-3/2839

Merge branch dev with rel-8.3
abpframework · Jul 30, 2024 · 25c4630 · 25c4630
2 parents ad69629 + bf155c7
commit 25c4630
Show file tree

Hide file tree

Showing 36 changed files with 43 additions and 47 deletions.
diff --git a/framework/NuGet.md b/framework/NuGet.md
@@ -11,21 +11,21 @@ ABP offers an opinionated architecture to build enterprise software solutions wi
 
 🔗GitHub Repository: https://github.com/abpframework/abp
 
-🔗Samples: https://docs.abp.io/en/abp/latest/Samples/Index
+🔗Samples: https://abp.io/docs/latest/Samples/Index
 
 🔗Official Theme: https://www.LeptonTheme.com
 
-🔗Documentation: https://docs.abp.io
+🔗Documentation: https://abp.io/docs
 
-🔗Community: https://community.abp.io
+🔗Community: https://abp.io/community
 
-🔗Blog: https://blog.abp.io
+🔗Blog: https://abp.io/blog
 
 🔗Books: https://abp.io/books
 
 🔗Twitter: https://twitter.com/abpframework
 
-🔗Discord: https://community.abp.io/discord
+🔗Discord: https://abp.io/community/discord
 
 🔗Stackoverflow: https://stackoverflow.com/questions/tagged/abp
 
@@ -124,8 +124,6 @@ Support for open-source ABP Framework client-side packages is available at [GitH
 
 If you are building an enterprise-level application with pro support, extra tools like a code generator, fancy themes and a microservice template, time to invest in the commercial version! 
 
-To understand how it works, see [How it Works]( https://commercial.abp.io/how-it-works) page.
+To understand how it works, see [How it Works](https://abp.io/how-it-works) page.
 
-If you wonder why you should choose ABP Commercial, check out [Why ABP.IO Platform](https://docs.abp.io/en/commercial/latest/why-abp-io-platform) page.
-
-Official website:  [https://commercial.abp.io](https://commercial.abp.io/)
+If you wonder why you should choose ABP Commercial, check out [Why ABP.IO Platform](https://abp.io/docs/latest/others/why-abp-platform) page.
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliConsts.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliConsts.cs
@@ -6,7 +6,7 @@ public static class CliConsts
 
     public const string BranchPrefix = "branch@";
 
-    public const string DocsLink = "https://docs.abp.io";
+    public const string DocsLink = "https://abp.io/docs";
 
     public const string HttpClientName = "AbpHttpClient";
 

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs
@@ -139,7 +139,7 @@ public string GetUsageInfo()
         sb.AppendLine(@"  abp add-module ProductManagement --new -sp ..\Acme.BookStore.Web\Acme.BookStore.Web.csproj   Crates a new module named `ProductManagement` and adds it to your solution.");
         sb.AppendLine(@"  abp add-module ProductManagement --new --add-to-solution-file -sp ..\Acme.BookStore.Web\Acme.BookStore.Web.csproj   Crates a new module named `ProductManagement`, adds it to your solution & solution file.");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs
@@ -105,7 +105,7 @@ public string GetUsageInfo()
         sb.AppendLine("  abp add-package Volo.Abp.FluentValidation -p Acme.BookStore.Application    Adds the NuGet package to the given project.");
         sb.AppendLine("  abp add-package @abp/ng.theme.basic                                        Adds the NPM package to the given corresponding project.");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs
@@ -103,7 +103,7 @@ public string GetUsageInfo()
         sb.AppendLine("-n |--build-name <name>                                 (default: empty)");
         sb.AppendLine("-f | --force                                            (default: false)");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs
@@ -65,7 +65,7 @@ public string GetUsageInfo()
         sb.AppendLine("-f | --force                                            (default: false)");
         sb.AppendLine("-t | --project-type                                     (default: webassembly)");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CleanCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CleanCommand.cs
@@ -52,7 +52,7 @@ public string GetUsageInfo()
         sb.AppendLine("Usage:");
         sb.AppendLine("  abp clean");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ClearDownloadCacheCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ClearDownloadCacheCommand.cs
@@ -47,7 +47,7 @@ public string GetUsageInfo()
         sb.AppendLine("Usage:");
         sb.AppendLine("  abp clear-download-cache");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CliCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CliCommand.cs
@@ -152,7 +152,7 @@ public string GetUsageInfo()
 
     public string GetShortDescription()
     {
-        return "Update or remove ABP CLI. See https://docs.abp.io/en/abp/latest/CLI";
+        return "Update or remove ABP CLI. See https://abp.io/docs/latest/cli";
     }
 
     public static class Options

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GetSourceCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GetSourceCommand.cs
@@ -100,7 +100,7 @@ public string GetUsageInfo()
         sb.AppendLine("  abp get-source Volo.Blogging");
         sb.AppendLine("  abp get-source Volo.Blogging -o d:\\my-project");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs
@@ -86,7 +86,7 @@ public string GetUsageInfo()
         sb.AppendLine("");
         sb.AppendLine("    abp help <command>");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs
@@ -58,7 +58,7 @@ public string GetUsageInfo()
         sb.AppendLine("");
         sb.AppendLine("-wd|--working-directory <directory-path>                (default: empty)");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListModulesCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListModulesCommand.cs
@@ -67,7 +67,7 @@ public string GetUsageInfo()
         sb.AppendLine("Options:");
         sb.AppendLine("  --include-pro-modules                                           Includes commercial (pro) modules in the output.");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListTemplatesCommand.cs
@@ -94,7 +94,7 @@ public string GetUsageInfo()
         sb.AppendLine("Usage:");
         sb.AppendLine("  abp list-templates");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
@@ -183,7 +183,7 @@ public string GetUsageInfo()
         sb.AppendLine("  abp login john");
         sb.AppendLine("  abp login john -p 1234");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginInfoCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginInfoCommand.cs
@@ -57,7 +57,7 @@ public string GetUsageInfo()
         sb.AppendLine("Usage:");
         sb.AppendLine("  abp login-info");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -232,7 +232,7 @@ public string GetUsageInfo()
         sb.AppendLine("  abp new Acme.BookStore --theme basic");
         sb.AppendLine("  abp new Acme.BookStore --connection-string \"Server=myServerName\\myInstanceName;Database=myDatabase;User Id=myUsername;Password=myPassword\"");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs
@@ -347,16 +347,15 @@ protected void OpenThanksPage(UiFramework uiFramework, DatabaseProvider database
         uiFramework = uiFramework == UiFramework.NotSpecified || uiFramework == UiFramework.None ? UiFramework.Mvc : uiFramework;
         databaseProvider = databaseProvider == DatabaseProvider.NotSpecified ? DatabaseProvider.EntityFrameworkCore : databaseProvider;
 
-        var urlPrefix = commercial ? "commercial" : "www";
         var tieredYesNo = tiered ? "yes" : "no";
-        var url = $"https://{urlPrefix}.abp.io/project-created-success?ui={uiFramework:g}&db={databaseProvider:g}&tiered={tieredYesNo}";
+        var url = $"https://abp.io/project-created-success?ui={uiFramework:g}&db={databaseProvider:g}&tiered={tieredYesNo}&commercial={(commercial ? "yes" : "no")}";
 
         CmdHelper.Open(url);
     }
 
     protected void OpenMicroserviceDocumentPage()
     {
-        var url = "https://docs.abp.io/en/commercial/latest/startup-templates/microservice/index";
+        var url = "https://abp.io/docs/latest/solution-templates/microservice";
 
         CmdHelper.Open(url);
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/PromptCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/PromptCommand.cs
@@ -22,7 +22,7 @@ public string GetUsageInfo()
         sb.AppendLine("Usage:");
         sb.AppendLine("  abp prompt");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs
@@ -114,7 +114,7 @@ public virtual string GetUsageInfo()
         sb.AppendLine("     -p|--prompt                                       Asks the options from the command line prompt (for the missing options)");
         sb.AppendLine("     --target <target-name>                            (default: 'defaultProject') Angular project name to place generated code in.");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs
@@ -578,7 +578,7 @@ public string GetUsageInfo()
 
     public string GetShortDescription()
     {
-        return "Install, update, remove or start ABP Suite. See https://commercial.abp.io/tools/suite.";
+        return "Install, update, remove or start ABP Suite. See https://abp.io/suite.";
     }
 
     public static class Options

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToLocalCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToLocalCommand.cs
@@ -103,7 +103,7 @@ public string GetUsageInfo()
         sb.AppendLine("  abp switch-to-local --paths D:\\Github\\abp");
         sb.AppendLine("  abp switch-to-local --paths D:\\Github\\abp --solution D:\\test\\MyProject");
         sb.AppendLine("  abp switch-to-local --paths \"D:\\Github\\abp|D:\\Github\\volo\"");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToNightlyCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToNightlyCommand.cs
@@ -33,7 +33,7 @@ public string GetUsageInfo()
         sb.AppendLine("Options:");
         sb.AppendLine("-d|--directory");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreRcCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreRcCommand.cs
@@ -33,7 +33,7 @@ public string GetUsageInfo()
         sb.AppendLine("Options:");
         sb.AppendLine("-d|--directory");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreviewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreviewCommand.cs
@@ -33,7 +33,7 @@ public string GetUsageInfo()
         sb.AppendLine("Options:");
         sb.AppendLine("-d|--directory");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToStableCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToStableCommand.cs
@@ -33,7 +33,7 @@ public string GetUsageInfo()
         sb.AppendLine("Options:");
         sb.AppendLine("-d|--directory");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/TranslateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/TranslateCommand.cs
@@ -550,7 +550,7 @@ public string GetUsageInfo()
         sb.AppendLine("  abp translate -c zh-Hans --online --deepl-auth-key <auth-key>");
         sb.AppendLine("  abp translate -c zh-Hans -r tr --online --deepl-auth-key <auth-key>");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
@@ -127,7 +127,7 @@ public string GetUsageInfo()
         sb.AppendLine("  abp update -p");
         sb.AppendLine("  abp update -sp \"D:\\projects\\\" -sn Acme.BookStore");
         sb.AppendLine("");
-        sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+        sb.AppendLine("See the documentation for more info: https://abp.io/docs/latest/cli");
 
         return sb.ToString();
     }

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs
@@ -244,7 +244,7 @@ private void ConfigureThemeOptions(ProjectBuildArgs args, string templateVersion
             {
                 Logger.LogWarning("You may need to make some additional changes for this theme. " +
                                   "See the documentation for more information: " +
-                                  "https://docs.abp.io/en/abp/latest/UI/Angular/Theme-Configurations");
+                                  "https://abp.io/docs/latest/framework/ui/angular/theme-configurations");
             }
         }
 

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs
@@ -14,6 +14,6 @@ public class AppTemplate : AppTemplateBase
     public AppTemplate()
         : base(TemplateName)
     {
-        DocumentUrl = CliConsts.DocsLink + "/en/abp/latest/Startup-Templates/Application";
+        DocumentUrl = CliConsts.DocsLink + "latest/solution-templates/layered-web-application";
     }
 }
diff --git a/...k/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Console/ConsoleTemplate.cs b/...k/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Console/ConsoleTemplate.cs
@@ -10,6 +10,6 @@ public class ConsoleTemplate : ConsoleTemplateBase
     public ConsoleTemplate()
         : base(TemplateName)
     {
-        DocumentUrl = CliConsts.DocsLink + "/en/abp/latest/Startup-Templates/Console";
+        DocumentUrl = CliConsts.DocsLink + "latest/get-started/console";
     }
 }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Maui/MauiTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Maui/MauiTemplate.cs
@@ -10,6 +10,6 @@ public class MauiTemplate : MauiTemplateBase
     public MauiTemplate() 
         : base(TemplateName)
     {
-        DocumentUrl = CliConsts.DocsLink + "/en/abp/latest/Startup-Templates/MAUI";
+        DocumentUrl = CliConsts.DocsLink + "latest/get-started/MAUI";
     }
 }
diff --git a/.../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleProTemplate.cs b/.../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleProTemplate.cs
@@ -12,7 +12,6 @@ public class ModuleProTemplate : ModuleTemplateBase
     public ModuleProTemplate()
         : base(TemplateName)
     {
-        //TODO: uncomment next line after document is ready
-        //DocumentUrl = "https://docs.abp.io/en/commercial/latest/Startup-Templates/Module";
+        DocumentUrl = "https://abp.io/docs/latest/solution-templates/application-module";
     }
 }
diff --git a/...ork/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplate.cs b/...ork/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplate.cs
@@ -12,6 +12,6 @@ public class ModuleTemplate : ModuleTemplateBase
     public ModuleTemplate()
         : base(TemplateName)
     {
-        DocumentUrl = "https://docs.abp.io/en/abp/latest/Startup-Templates/Module";
+        DocumentUrl = "https://abp.io/docs/latest/solution-templates/application-module";
     }
 }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Wpf/WpfTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Wpf/WpfTemplate.cs
@@ -10,6 +10,6 @@ public class WpfTemplate : WpfTemplateBase
     public WpfTemplate()
         : base(TemplateName)
     {
-        DocumentUrl = CliConsts.DocsLink + "/en/abp/latest/Startup-Templates/WPF";
+        DocumentUrl = CliConsts.DocsLink + "latest/get-started/WPF";
     }
 }
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSender.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSender.cs
@@ -75,7 +75,7 @@ protected async override Task SendEmailAsync(MailMessage mail)
         using (var smtpClient = await BuildClientAsync())
         {
             Logger.LogWarning("We don't recommend that you use the SmtpClient class for new development because SmtpClient doesn't support many modern protocols. " +
-                               "Use MailKit(https://docs.abp.io/en/abp/latest/MailKit) or other libraries instead." +
+                               "Use MailKit(https://abp.io/docs/latest/framework/infrastructure/mail-kit) or other libraries instead." +
                                "For more information, see https://github.com/dotnet/platform-compat/blob/master/docs/DE0005.md");
 
             await smtpClient.SendMailAsync(mail);