Merge remote-tracking branch 'origin/rel-3.3' into dev

docs/en/UI/Angular/Component-Replacement.md

@@ -45,7 +45,7 @@ Run the following command to generate a layout in `angular` folder:
 yarn ng generate component my-application-layout
 ```
 
-Add the following code in your layout template (`my-layout.component.html`) where you want the page to be loaded.
+Add the following code in your layout template (`my-application-layout.component.html`) where you want the page to be loaded.
 
 ```html
 <router-outlet></router-outlet>

docs/zh-Hans/UI/Angular/Component-Replacement.md

@@ -49,7 +49,7 @@ export class AppComponent {
 yarn ng generate component my-application-layout
 ```
 
-在你的布局模板(`my-layout.component.html`)中添加以下代码:
+在你的布局模板(`my-application-layout.component.html`)中添加以下代码:
 
 ```html
 <router-outlet></router-outlet>
@@ -543,4 +543,4 @@ export class AppComponent implements OnInit {
 
 ## 下一步是什么?
 
-- [自定义设置页面](./Custom-Setting-Page.md)
+- [自定义设置页面](./Custom-Setting-Page.md)