Merge branch 'master' of gitee.com:openharmony/docs into master

Signed-off-by: Nyuyaozhi <yuyaozhi@huawei.com>

CODEOWNERS

@@ -338,7 +338,7 @@ zh-cn/application-dev/reference/apis/js-apis-distributedMissionManager.md @chenm
 zh-cn/application-dev/reference/apis/js-apis-document.md @panqinxu @zengyawen @bubble_mao @jinhaihw
 zh-cn/application-dev/reference/apis/js-apis-effectKit.md @zhangqiang183  @ge-yafang @wind_zj @zxg-gitee
 zh-cn/application-dev/reference/apis/js-apis-emitter.md @jayleehw @RayShih @li-weifeng2 @currydavids
-zh-cn/application-dev/reference/apis/js-apis-EnterpriseAdminExtensionAbility.md @Buda-Liu @ningningW @budda-wang @yangqing3
+zh-cn/application-dev/reference/apis/js-apis-EnterpriseAdminExtensionAbility.md @liuzuming @ningningW @yangqing3
 zh-cn/application-dev/reference/apis/js-apis-environment.md @panqinxu @zengyawen @bubble_mao @jinhaihw
 zh-cn/application-dev/reference/apis/js-apis-errorManager.md @littlejerry1 @RayShih @gwang2008 @chengxingzhen
 zh-cn/application-dev/reference/apis/js-apis-eventhub.md @jayleehw @RayShih @li-weifeng2 @currydavids
@@ -397,7 +397,7 @@ zh-cn/application-dev/reference/apis/js-apis-notification.md @jayleehw @RayShih
 zh-cn/application-dev/reference/apis/js-apis-observer.md @zhang-hai-feng @zengyawen @jyh926 @gaoxi785
 zh-cn/application-dev/reference/apis/js-apis-osAccount.md @nianCode @zengyawen @JiDong-CS @murphy1984
 zh-cn/application-dev/reference/apis/js-apis-particleAbility.md @littlejerry1 @RayShih @gwang2008 @chengxingzhen
-zh-cn/application-dev/reference/apis/js-apis-pasteboard.md @feng-aiwen @ge-yafang @gong-a-shi @logic42
+zh-cn/application-dev/reference/apis/js-apis-pasteboard.md @han-zhengshi @ge-yafang @logic42
 zh-cn/application-dev/reference/apis/js-apis-permissionrequestresult.md @littlejerry1 @RayShih @gwang2008 @chengxingzhen
 zh-cn/application-dev/reference/apis/js-apis-plainarray.md @gongjunsong @ge-yafang @flyingwolf @BlackStone
 zh-cn/application-dev/reference/apis/js-apis-pointer.md @yuanxinying @ningningW @cococoler @alien0208

README_zh.md

@@ -18,7 +18,7 @@
 
  - master：最新开发版本。  
 
- - OpenHarmony 3.2 Beta5版本：点击[此处](zh-cn/release-notes/OpenHarmony-v3.2-beta5.md)了解版本详情。
+ - OpenHarmony 3.2 Release版本：点击[此处](zh-cn/release-notes/OpenHarmony-v3.2-release.md)了解版本详情。
 
  - OpenHarmony 3.1 Release版本：点击[此处](zh-cn/release-notes/OpenHarmony-v3.1-release.md)了解版本详情。
 

en/OpenHarmony-Overview.md

@@ -189,7 +189,7 @@ For details about how to obtain the source code of OpenHarmony, see [Source Code
 
 ## How to Participate
 
-For details about how to join in the OpenHarmony community, see [OpenHarmony Community](https://gitee.com/openharmony/community/blob/master/README-EN.md)
+For details about how to join in the OpenHarmony community, see [OpenHarmony Community](https://gitee.com/openharmony/community/blob/master/README_EN.md)
 
 For details about how to contribute, see [How to contribute](contribute/how-to-contribute.md).
 

en/application-dev/IDL/idl-guidelines.md

@@ -3,7 +3,7 @@
 ## IDL Overview
 To ensure successful communications between the client and server, interfaces recognized by both parties must be defined. The OpenHarmony Interface Definition Language (IDL) is a tool for defining such interfaces. OpenHarmony IDL decomposes objects to be transferred into primitives that can be understood by the operating system and encapsulates cross-boundary objects based on developers' requirements.
 
-  **Figure 1** IDL interface description
+**Figure 1** IDL interface description
 
 ![IDL-interface-description](./figures/IDL-interface-description.png)
 
@@ -156,11 +156,13 @@ On DevEco Studio, choose **Tools > SDK Manager** to view the local installation
 
 Go to the local installation path, choose **toolchains > 3.x.x.x** (the folder named after the version number), and check whether the executable file of IDL exists.
 
-> **NOTE**: Use the SDK of the latest version. The use of an earlier version may cause errors in some statements.
+> **NOTE**
+>
+> Use the SDK of the latest version. The use of an earlier version may cause errors in some statements.
 
-If the executable file does not exist, download the SDK package from the mirror as instructed in the [Release Notes](../../release-notes). The following uses the [3.2 Beta3](../../release-notes/OpenHarmony-v3.2-beta3.md#acquiring-source-code-from-mirrors) as an example.
+If the executable file does not exist, download the SDK package from the mirror as instructed in the [Release Notes](../../release-notes). The following uses [3.2 Beta3](../../release-notes/OpenHarmony-v3.2-beta3.md) as an example.
 
-For details about how to replace the SDK package, see [Guide to Switching to Full SDK](../quick-start/full-sdk-switch-guide.md).
+For details about how to replace the SDK package, see [Full SDK Compilation Guide](../quick-start/full-sdk-compile-guide.md).
 
 After obtaining the executable file, perform subsequent development steps based on your scenario.
 
@@ -176,6 +178,8 @@ You can use TS to create IDL files.
   interface OHOS.IIdlTestService {
       int TestIntTransaction([in] int data);
       void TestStringTransaction([in] String data);
+      void TestMapTransaction([in] Map<int, int> data);
+      int TestArrayTransaction([in] String[] data);
   }
 ```
 
@@ -183,7 +187,9 @@ Run the **idl -gen-ts -d *dir* -c dir/IIdlTestService.idl** command in the folde
 
 -*dir* next to **d** is the target output folder. For example, if the target output folder is **IIdlTestServiceTs**, run the **idl -gen-ts -d IIdlTestServiceTs -c IIdlTestServiceTs/IIdlTestService.idl** command in the folder where the executable file is located. The interface file, stub file, and proxy file are generated in the *dir* directory (**IIdlTestServiceTs** directory in this example) in the execution environment.
 
-> **NOTE**: The generated interface class file name must be the same as that of the .idl file. Otherwise, an error occurs during code generation.
+> **NOTE**
+>
+> The generated interface class file name must be the same as that of the .idl file. Otherwise, an error occurs during code generation.
 
 For example, for an .idl file named **IIdlTestService.idl** and target output directory named **IIdlTestServiceTs**, the directory structure is similar to the following:
 
@@ -203,6 +209,8 @@ The stub class generated by IDL is an abstract implementation of the interface c
 ```ts
 import {testIntTransactionCallback} from "./i_idl_test_service";
 import {testStringTransactionCallback} from "./i_idl_test_service";
+import {testMapTransactionCallback} from "./i_idl_test_service";
+import {testArrayTransactionCallback} from "./i_idl_test_service";
 import IIdlTestService from "./i_idl_test_service";
 import rpc from "@ohos.rpc";
 
@@ -211,8 +219,8 @@ export default class IdlTestServiceStub extends rpc.RemoteObject implements IIdl
         super(des);
     }
     
-    async onRemoteRequestEx(code: number, data, reply, option): Promise<boolean> {
-        console.log("onRemoteRequestEx called, code = " + code);
+    async onRemoteMessageRequest(code: number, data, reply, option): Promise<boolean> {
+        console.log("onRemoteMessageRequest called, code = " + code);
         switch(code) {
             case IdlTestServiceStub.COMMAND_TEST_INT_TRANSACTION: {
                 let _data = data.readInt();
@@ -231,6 +239,29 @@ export default class IdlTestServiceStub extends rpc.RemoteObject implements IIdl
                 });
                 return true;
             }
+            case IdlTestServiceStub.COMMAND_TEST_MAP_TRANSACTION: {
+                let _data = new Map();
+                let _dataSize = data.readInt();
+                for (let i = 0; i < _dataSize; ++i) {
+                    let key = data.readInt();
+                    let value = data.readInt();
+                    _data.set(key, value);
+                }
+                this.testMapTransaction(_data, (errCode) => {
+                    reply.writeInt(errCode);
+                });
+                return true;
+            }
+            case IdlTestServiceStub.COMMAND_TEST_ARRAY_TRANSACTION: {
+                let _data = data.readStringArray();
+                this.testArrayTransaction(_data, (errCode, returnValue) => {
+                    reply.writeInt(errCode);
+                    if (errCode == 0) {
+                        reply.writeInt(returnValue);
+                    }
+                });
+                return true;
+            }
             default: {
                 console.log("invalid request code" + code);
                 break;
@@ -241,17 +272,23 @@ export default class IdlTestServiceStub extends rpc.RemoteObject implements IIdl
     
     testIntTransaction(data: number, callback: testIntTransactionCallback): void{}
     testStringTransaction(data: string, callback: testStringTransactionCallback): void{}
+    testMapTransaction(data: Map<number, number>, callback: testMapTransactionCallback): void{}
+    testArrayTransaction(data: string[], callback: testArrayTransactionCallback): void{}
 
     static readonly COMMAND_TEST_INT_TRANSACTION = 1;
     static readonly COMMAND_TEST_STRING_TRANSACTION = 2;
+    static readonly COMMAND_TEST_MAP_TRANSACTION = 3;
+    static readonly COMMAND_TEST_ARRAY_TRANSACTION = 4;
 }
 ```
 
-You need to inherit the interface class defined in the IDL file and implement the methods in the class. The following code snippet shows how to inherit the **IdlTestServiceStub** interface class and implement the **testIntTransaction** and **testStringTransaction** methods.  
+You need to inherit the interface class defined in the IDL file and implement the methods in the class. The following code snippet shows how to inherit the **IdlTestServiceStub** interface class and implement the **testIntTransaction**, **testStringTransaction**, **testMapTransaction**, and **testArrayTransaction** methods.  
 
 ```ts
 import {testIntTransactionCallback} from "./i_idl_test_service"
 import {testStringTransactionCallback} from "./i_idl_test_service"
+import {testMapTransactionCallback} from "./i_idl_test_service";
+import {testArrayTransactionCallback} from "./i_idl_test_service";
 import IdlTestServiceStub from "./idl_test_service_stub"
 
 
@@ -265,6 +302,14 @@ class IdlTestImp extends IdlTestServiceStub {
     {
         callback(0);
     }
+    testMapTransaction(data: Map<number, number>, callback: testMapTransactionCallback): void
+    {
+        callback(0);
+    }
+    testArrayTransaction(data: string[], callback: testArrayTransactionCallback): void
+    {
+        callback(0, 1);
+    }
 }
 ```
 
@@ -320,11 +365,28 @@ function callbackTestStringTransaction(result: number): void {
   }
 }
 
+function callbackTestMapTransaction(result: number): void {
+  if (result == 0) {
+    console.log('case 3 success');
+  }
+}
+
+function callbackTestArrayTransaction(result: number, ret: number): void {
+  if (result == 0 && ret == 124) {
+    console.log('case 4 success');
+  }
+}
+
 var onAbilityConnectDone = {
   onConnect:function (elementName, proxy) {
     let testProxy = new IdlTestServiceProxy(proxy);
+    let testMap = new Map();
+    testMap.set(1, 1);
+    testMap.set(1, 2);
     testProxy.testIntTransaction(123, callbackTestIntTransaction);
     testProxy.testStringTransaction('hello', callbackTestStringTransaction);
+    testProxy.testMapTransaction(testMap, callbackTestMapTransaction);
+    testProxy.testArrayTransaction(['1','2'], callbackTestMapTransaction);
   },
   onDisconnect:function (elementName) {
     console.log('onDisconnectService onDisconnect');

en/application-dev/application-models/ability-startup-with-implicit-want.md

@@ -27,8 +27,7 @@ This section uses the operation of using a browser to open a website as an examp
                 "host": "www.test.com",
                 "port": "8080",
                 // Prefix matching is used.
-                "pathStartWith": "query",
-                "type": "text/*"
+                "pathStartWith": "query"
               },
               {
                 "scheme": "http",
@@ -53,12 +52,11 @@ function implicitStartAbility() {
   let context = getContext(this) as common.UIAbilityContext;
   let wantInfo = {
     // Uncomment the line below if you want to implicitly query data only in the specific bundle.
-    // bundleName: "com.example.myapplication",
-    "action": "ohos.want.action.viewData",
+    // bundleName: 'com.example.myapplication',
+    'action': 'ohos.want.action.viewData',
     // entities can be omitted.
-    "entities": ["entity.system.browsable"],
-    "uri": "https://www.test.com:8080/query/student",
-    "type": "text/plain"
+    'entities': ['entity.system.browsable'],
+    'uri': 'https://www.test.com:8080/query/student'
   }
   context.startAbility(wantInfo).then(() => {
     // ...
@@ -75,6 +73,6 @@ The matching process is as follows:
 3. If **uri** in the passed **want** parameter is included in **uris** under **skills** of the ability to match, which is concatenated into https://www.test.com:8080/query* (where * is a wildcard), the matching is successful.
 4. If **type** in the passed **want** parameter is specified and is included in **type** under **skills** of the ability to match, the matching is successful.
 
-When there are multiple matching applications, a dialog box is displayed for you to select one of them. The following figure shows an example. 
+If there are multiple matching applications, the system displays a dialog box for you to select one of them. The following figure shows an example. 
 
 ![](figures/ability-startup-with-implicit-want1.png)
\ No newline at end of file

en/application-dev/application-models/application-context-stage.md

@@ -43,7 +43,7 @@
   - [AbilityStageContext](../reference/apis/js-apis-inner-application-abilityStageContext.md): module-level context. It provides **HapModuleInfo** and **Configuration** in addition to those provided by the base class **Context**.
     
      ```ts
-     import AbilityStage from "@ohos.app.ability.AbilityStage";
+     import AbilityStage from '@ohos.app.ability.AbilityStage';
      export default class MyAbilityStage extends AbilityStage {
        onCreate() {
          let abilityStageContext = this.context;
@@ -71,7 +71,7 @@ This topic describes how to use the context in the following scenarios:
 
 
 - [Obtaining the Application Development Path](#obtaining-the-application-development-path)
-- [Obtaining and Modifying Encrypted Areas](#obtaining-and-modifying-encrypted-areas)
+- [Obtaining and Modifying Encryption Areas](#obtaining-and-modifying-encryption-areas)
 - [Creating Context of Another Application or Module](#creating-context-of-another-application-or-module)
 - [Subscribing to UIAbility Lifecycle Changes in a Process](#subscribing-to-uiability-lifecycle-changes-in-a-process)
 
@@ -84,13 +84,13 @@ The following table describes the application development paths obtained from co
 
 | Name| Type| Readable| Writable| Description|
 | -------- | -------- | -------- | -------- | -------- |
-| cacheDir | string | Yes| No| Cache directory of the application on the internal storage.<br>It is the content of **Storage** of an application under **Settings > Apps & services > Apps**.|
-| tempDir | string | Yes| No| Temporary file directory of the application.<br>Files in this directory are deleted after the application is uninstalled.|
-| filesDir | string | Yes| No| File directory of the application on the internal storage.<br>Files in this directory may be synchronized to other directories during application migration or backup.|
-| databaseDir | string | Yes| No| Storage directory of the local database.|
-| bundleCodeDir | string | Yes| No| Installation directory of the application on the internal storage.|
-| distributedFilesDir | string | Yes| No| Storage directory of distributed application data files.|
-| preferencesDir | string | Yes| Yes| Preferences directory of the application.|
+| bundleCodeDir       | string   | Yes  | No  | Path for storing the application's installation package, that is, installation directory of the application on the internal storage.                  |
+| cacheDir | string | Yes| No| Path for storing the application's cache files, that is, cache directory of the application on the internal storage.<br>It is the content of **Storage** of an application under **Settings > Apps & services > Apps**.|
+| filesDir            | string   | Yes  | No  | Path for storing the application's common files, that is, file directory of the application on the internal storage.<br>Files in this directory may be synchronized to other directories during application migration or backup.|
+| preferencesDir      | string   | Yes  | Yes  | Path for storing the application's preference files, that is, preferences directory of the application.                |
+| tempDir             | string   | Yes  | No  | Path for storing the application's temporary files.<br>Files in this directory are deleted after the application is uninstalled.|
+| databaseDir         | string   | Yes  | No  | Path for storing the application's database, that is, storage directory of the local database.                        |
+| distributedFilesDir | string | Yes| No| Path for storing the application's distributed files.|
 
 The capability of obtaining the application development path is provided by the base class **Context**. This capability is also provided by **ApplicationContext**, **AbilityStageContext**, **UIAbilityContext**, and **ExtensionContext**. However, the paths obtained from different contexts may differ, as shown below.
 
@@ -144,13 +144,19 @@ export default class EntryAbility extends UIAbility {
 >
 > The sample code obtains the sandbox path of the application development path. The absolute path can be obtained by running the **find / -name <fileName>** command in the hdc shell after file creation or modification.
 
-### Obtaining and Modifying Encrypted Areas
+### Obtaining and Modifying Encryption Areas
 
-You can read and write [the area attribute in the context](../reference/apis/js-apis-inner-application-context.md) to obtain and set an encrypted area. Two encryption levels are supported:
+Encrypting application files enhances data security by preventing files from unauthorized access. Different application files require different levels of protection. For private files, such as alarms and wallpapers, the application must place them in the device-level encryption area (EL1) to ensure that they can be accessed before the user enters the password. For sensitive files, such as personal privacy data, the application must place them in the user-level encryption area (EL2).
 
-- AreaMode.EL1: device-level encryption area, which is accessible after the device is powered on.
+In practice, you need to select a proper encrypted area based on scenario-specific requirements to protect application data security. The proper use of EL1 and the EL2 can efficiently improve the security.
 
-- AreaMode.EL2: user-level encryption area, which is accessible only after the device is powered on and the password is entered (for the first time).
+> **NOTE**
+>
+> - AreaMode.EL1: device-level encryption area, which is accessible after the device is powered on.
+>
+> - AreaMode.EL2: user-level encryption area, which is accessible only after the device is powered on and the password is entered (for the first time).
+
+You can obtain and set the encryption area by reading and writing the [area attribute in Context](../reference/apis/js-apis-inner-application-context.md).
 
 ```ts
 import UIAbility from '@ohos.app.ability.UIAbility';
@@ -175,14 +181,15 @@ export default class EntryAbility extends UIAbility {
 
 ### Creating Context of Another Application or Module
 
-The base class **Context** provides the [createBundleContext(bundleName:string)](../reference/apis/js-apis-inner-application-context.md#contextcreatebundlecontext), [createModuleContext(moduleName:string)](../reference/apis/js-apis-inner-application-context.md#contextcreatemodulecontext), and [createModuleContext(bundleName:string, moduleName:string)](../reference/apis/js-apis-inner-application-context.md#contextcreatemodulecontext-1) methods for creating the context of other applications or modules, so as to obtain the resource information, for example, [obtaining the application development paths](#obtaining-the-application-development-path) of other modules.
+The base class **Context** provides [createBundleContext(bundleName:string)](../reference/apis/js-apis-inner-application-context.md#contextcreatebundlecontext), [createModuleContext(moduleName:string)](../reference/apis/js-apis-inner-application-context.md#contextcreatemodulecontext), and [createModuleContext(bundleName:string, moduleName:string)](../reference/apis/js-apis-inner-application-context.md#contextcreatemodulecontext-1) to create the context of other applications or modules, so as to obtain the resource information, for example, [obtaining the application development paths](#obtaining-the-application-development-path) of other modules.
 
 - Call **createBundleContext(bundleName:string)** to create the context of another application.
   > **NOTE**
   >
   > To obtain the context of another application:
   >
-  > - Request the **ohos.permission.GET_BUNDLE_INFO_PRIVILEGED** permission. For details, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+  > - Request the **ohos.permission.GET_BUNDLE_INFO_PRIVILEGED** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+  >
   > - This is a system API and cannot be called by third-party applications.
 
   For example, application information displayed on the home screen includes the application name and icon. The home screen application calls the foregoing method to obtain the context information, so as to obtain the resource information including the application name and icon.
@@ -192,7 +199,7 @@ The base class **Context** provides the [createBundleContext(bundleName:string)]
   
   export default class EntryAbility extends UIAbility {
     onCreate(want, launchParam) {
-          let bundleName2 = "com.example.application";
+      let bundleName2 = 'com.example.application';
       let context2 = this.context.createBundleContext(bundleName2);
       let label2 = context2.applicationInfo.label;
       // ...
@@ -205,7 +212,8 @@ The base class **Context** provides the [createBundleContext(bundleName:string)]
   >
   > To obtain the context of a specified module of another application:
   >
-  > - Request the **ohos.permission.GET_BUNDLE_INFO_PRIVILEGED** permission. For details, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+  > - Request the **ohos.permission.GET_BUNDLE_INFO_PRIVILEGED** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+  >
   > - This is a system API and cannot be called by third-party applications.
   
   ```ts
@@ -213,8 +221,8 @@ The base class **Context** provides the [createBundleContext(bundleName:string)]
   
   export default class EntryAbility extends UIAbility {
     onCreate(want, launchParam) {
-          let bundleName2 = "com.example.application";
-          let moduleName2 = "module1";
+      let bundleName2 = 'com.example.application';
+      let moduleName2 = 'module1';
       let context2 = this.context.createModuleContext(bundleName2, moduleName2);
       // ...
     }
@@ -228,7 +236,7 @@ The base class **Context** provides the [createBundleContext(bundleName:string)]
   
   export default class EntryAbility extends UIAbility {
     onCreate(want, launchParam) {
-          let moduleName2 = "module1";
+      let moduleName2 = 'module1';
       let context2 = this.context.createModuleContext(moduleName2);
       // ...
     }
@@ -238,66 +246,79 @@ The base class **Context** provides the [createBundleContext(bundleName:string)]
 
 ### Subscribing to UIAbility Lifecycle Changes in a Process
 
-In the DFX statistics scenario of an application, if you need to collect statistics on the stay duration and access frequency of a page, you can subscribe to UIAbility lifecycle changes.
+In the DFX statistics scenario of an application, if you need to collect statistics on the stay duration and access frequency of a page, you can subscribe to UIAbility lifecycle changes in a process.
 
-[ApplicationContext](../reference/apis/js-apis-inner-application-applicationContext.md) provides APIs for subscribing to UIAbility lifecycle changes in a process. When the UIAbility lifecycle changes in a process, for example, being created or destroyed, becoming visible or invisible, or gaining or losing focus, the corresponding callback is triggered, and a listener ID is returned. The ID is incremented by 1 each time the listener is registered. When the number of listeners exceeds the upper limit (2^63-1), -1 is returned. The following uses [UIAbilityContext](../reference/apis/js-apis-inner-application-uiAbilityContext.md) as an example.
+[ApplicationContext](../reference/apis/js-apis-inner-application-applicationContext) provides APIs for subscribing to UIAbility lifecycle changes in a process. When the UIAbility lifecycle changes in a process, for example, being created or destroyed, becoming visible or invisible, or gaining or losing focus, the corresponding callback is triggered. Each time the callback is registered, a listener lifecycle ID is returned, with the value incremented by 1 each time. When the number of listeners exceeds the upper limit (2^63-1), **-1** is returned. The following uses [UIAbilityContext](../reference/apis/js-apis-inner-application-uiAbilityContext.md) as an example.
 
 
 ```ts
 import UIAbility from '@ohos.app.ability.UIAbility';
 import window from '@ohos.window';
 
-const TAG: string = "[Example].[Entry].[EntryAbility]";
+const TAG: string = '[Example].[Entry].[EntryAbility]';
 
 export default class EntryAbility extends UIAbility {
+  // Define a lifecycle ID.
   lifecycleId: number;
 
   onCreate(want, launchParam) {
+    // Define a lifecycle callback object.
     let abilityLifecycleCallback = {
-            onAbilityCreate(uiability) {
-                console.info(TAG, "onAbilityCreate uiability:" + JSON.stringify(uiability));
+      // Called when a UIAbility is created.
+      onAbilityCreate(uiAbility) {
+        console.log(TAG, `onAbilityCreate uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
       },
-            onWindowStageCreate(uiability, windowStage) {
-                console.info(TAG, "onWindowStageCreate uiability:" + JSON.stringify(uiability));
-                console.info(TAG, "onWindowStageCreate windowStage:" + JSON.stringify(windowStage));
+      // Called when a window is created.
+      onWindowStageCreate(uiAbility, windowStage: window.WindowStage) {
+        console.log(TAG, `onWindowStageCreate uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
+        console.log(TAG, `onWindowStageCreate windowStage: ${JSON.stringify(windowStage)}`);
       },
-            onWindowStageActive(uiability, windowStage) {
-                console.info(TAG, "onWindowStageActive uiability:" + JSON.stringify(uiability));
-                console.info(TAG, "onWindowStageActive windowStage:" + JSON.stringify(windowStage));
+      // Called when the window becomes active.
+      onWindowStageActive(uiAbility, windowStage: window.WindowStage) {
+        console.log(TAG, `onWindowStageActive uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
+        console.log(TAG, `onWindowStageActive windowStage: ${JSON.stringify(windowStage)}`);
       },
-            onWindowStageInactive(uiability, windowStage) {
-                console.info(TAG, "onWindowStageInactive uiability:" + JSON.stringify(uiability));
-                console.info(TAG, "onWindowStageInactive windowStage:" + JSON.stringify(windowStage));
+      // Called when the window becomes inactive.
+      onWindowStageInactive(uiAbility, windowStage: window.WindowStage) {
+        console.log(TAG, `onWindowStageInactive uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
+        console.log(TAG, `onWindowStageInactive windowStage: ${JSON.stringify(windowStage)}`);
       },
-            onWindowStageDestroy(uiability, windowStage) {
-                console.info(TAG, "onWindowStageDestroy uiability:" + JSON.stringify(uiability));
-                console.info(TAG, "onWindowStageDestroy windowStage:" + JSON.stringify(windowStage));
+      // Called when the window is destroyed.
+      onWindowStageDestroy(uiAbility, windowStage: window.WindowStage) {
+        console.log(TAG, `onWindowStageDestroy uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
+        console.log(TAG, `onWindowStageDestroy windowStage: ${JSON.stringify(windowStage)}`);
       },
-            onAbilityDestroy(uiability) {
-                console.info(TAG, "onAbilityDestroy uiability:" + JSON.stringify(uiability));
+      // Called when the UIAbility is destroyed.
+      onAbilityDestroy(uiAbility) {
+        console.log(TAG, `onAbilityDestroy uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
       },
-            onAbilityForeground(uiability) {
-                console.info(TAG, "onAbilityForeground uiability:" + JSON.stringify(uiability));
+      // Called when the UIAbility is switched from the background to the foreground.
+      onAbilityForeground(uiAbility) {
+        console.log(TAG, `onAbilityForeground uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
       },
-            onAbilityBackground(uiability) {
-                console.info(TAG, "onAbilityBackground uiability:" + JSON.stringify(uiability));
+      // Called when the UIAbility is switched from the foreground to the background.
+      onAbilityBackground(uiAbility) {
+        console.log(TAG, `onAbilityBackground uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
       },
-            onAbilityContinue(uiability) {
-                console.info(TAG, "onAbilityContinue uiability:" + JSON.stringify(uiability));
+      // Called when UIAbility is continued on another device.
+      onAbilityContinue(uiAbility) {
+        console.log(TAG, `onAbilityContinue uiAbility.launchWant: ${JSON.stringify(uiAbility.launchWant)}`);
       }
     }
-        // 1. Obtain the application context through the context attribute.
+    // Obtain the application context.
     let applicationContext = this.context.getApplicationContext();
-        // 2. Register a listener for the lifecycle changes through the application context.
-        this.lifecycleId = applicationContext.on("abilityLifecycle", abilityLifecycleCallback);
-        console.info(TAG, "register callback number: " + JSON.stringify(this.lifecycleId));
+    // Register the application lifecycle callback.
+    this.lifecycleId = applicationContext.on('abilityLifecycle', abilityLifecycleCallback);
+    console.log(TAG, `register callback number: ${this.lifecycleId}`);
   }
 
+  // ...
+
   onDestroy() {
+    // Obtain the application context.
     let applicationContext = this.context.getApplicationContext();
-        applicationContext.off("abilityLifecycle", this.lifecycleId, (error, data) => {
-            console.info(TAG, "unregister callback success, err: " + JSON.stringify(error));
-        });
+    // Deregister the application lifecycle callback.
+    applicationContext.off('abilityLifecycle', this.lifecycleId);
   }
 }
 ```

en/application-dev/application-models/component-startup-rules.md

@@ -30,7 +30,7 @@ In view of this, OpenHarmony formulates a set of component startup rules, as fol
   - An application is considered as a foreground application only when the application process gains focus or its UIAbility component is running in the foreground.
   - Verify the **ohos.permission.START_ABILITIES_FROM_BACKGROUND** permission.
 
-- **When the startAbilityByCall() method is used, verify the call permission.** For details, see [Using Ability Call to Implement UIAbility Interaction](uiability-intra-device-interaction.md#using-ability-call-to-implement-uiability-interaction) and [Using Cross-Device Ability Call](hop-multi-device-collaboration.md#using-cross-device-ability-call).
+- **When the startAbilityByCall() method is used, verify the call permission.** For details, see [Using Call to Implement UIAbility Interaction](uiability-intra-device-interaction.md#using-call-to-implement-uiability-interaction) and [Using Cross-Device Call](hop-multi-device-collaboration.md#using-cross-device-call).
   - Verify the **ohos.permission.ABILITY_BACKGROUND_COMMUNICATION** permission.
 
 

en/application-dev/application-models/create-pageability.md

@@ -76,22 +76,22 @@ In the FA model, you can call **getContext** of **featureAbility** to obtain the
 The following code snippet shows how to use **getContext()** to obtain the application context and distributed directory:
 
 ```ts
-import featureAbility from '@ohos.ability.featureAbility'
-import fileIo from '@ohos.fileio'
+import featureAbility from '@ohos.ability.featureAbility';
+import fs from '@ohos.file.fs';
 
 (async () => {
-  let dir: string
+  let dir: string;
   try {
-    console.info('Begin to getOrCreateDistributedDir')
-    dir = await featureAbility.getContext().getOrCreateDistributedDir()
+    console.info('Begin to getOrCreateDistributedDir');
+    dir = await featureAbility.getContext().getOrCreateDistributedDir();
     console.info('distribute dir is ' + dir)
   } catch (error) {
-    console.error('getOrCreateDistributedDir failed with ' + error)
+    console.error('getOrCreateDistributedDir failed with ' + error);
   }
 
   let fd: number;
   let path = dir + "/a.txt";
-  fd = fileIo.openSync(path, 0o2 | 0o100, 0o666);
-  fileIo.close(fd);
+  fd = fs.openSync(path, fs.OpenMode.READ_WRITE).fd;
+  fs.close(fd);
 })()
 ```

en/application-dev/application-models/data-share-via-want.md

@@ -2,20 +2,20 @@
 
 Users often need to share data (such as a text or an image) from one application to another. The following uses PDF file sharing as an example to describe how to use Want to share data between applications.
 
-Data sharing requires two UIAbility components (one for the sharing party and the other for the shared party) and one system component (used as the application selector). When the sharing party initiates data sharing by calling **startAbility()**, the system implicitly matches and displays all applications that support the type of data to share. After the user selects an application, the system starts the application to complete data sharing.
+Data sharing requires two UIAbility components (one for the sharing party and the other for the shared party) and one system component (used as the application sharing box). When the sharing party initiates data sharing by calling **startAbility()**, the system implicitly matches and displays all applications that support the type of data to share. After the user selects an application, the system starts the application to complete data sharing.
 
 In this section, data sharing is triggered by touching a button. You can use other ways to trigger data sharing during application development. This section focuses on how to configure Want to implement data sharing.
 
 The following actions are involved for data sharing:
 
-- **ohos.want.action.select**: action of starting the application selector.
+- **ohos.want.action.select**: action of starting the application sharing box.
 - **ohos.want.action.sendData**: action of sending a single data record, that is, transferring data to the shared party.
 
 ## Sharing Party
 
-The sharing party starts an application selector and transfers the data to the shared party. Therefore, Want of the sharing party must be nested at two layers. In the first layer, implicit Want is used together with the **ohos.want.action.select** action to display the application selector. In the second layer, the data to share is declared
+The sharing party starts an application sharing box and transfers the data to the shared party. Therefore, Want of the sharing party must be nested at two layers. In the first layer, implicit Want is used together with the **ohos.want.action.select** action to display the application sharing box. In the second layer, the data to share is declared
 
-in the custom field **parameters**, and then the Want that includes the **ohos.want.action.sendData** action and the **parameters** field is transferred to the application selector. The shared party obtains the shared data from **parameters**.
+in the custom field **parameters**, and then the Want that includes the **ohos.want.action.sendData** action and the **parameters** field is transferred to the application sharing box. The shared party obtains the shared data from **parameters**.
 
 ```ts
 import common from '@ohos.app.ability.common';
@@ -28,21 +28,21 @@ let fileSize; // Obtain the size of the file to share.
 function implicitStartAbility() {
   let context = getContext(this) as common.UIAbilityContext;
   let wantInfo = {
-    / This action is used to implicitly match the application selector.
+    / This action is used to implicitly match the application sharing box.
     action: 'ohos.want.action.select',
     // This is the custom parameter in the first layer of Want,
-    / which is intended to add information to the application selector.
+    / which is intended to add information to the application sharing box.
     parameters: {
       // MIME type of PDF.
-      "ability.picker.type": fileType,
-      "ability.picker.fileNames": [fileName],
-      "ability.picker.fileSizes": [fileSize],
+      'ability.picker.type': fileType,
+      'ability.picker.fileNames': [fileName],
+      'ability.picker.fileSizes': [fileSize],
       // This is nested Want ,which will be directly sent to the selected application.
-      "ability.want.params.INTENT": {
-        "action": "ohos.want.action.sendData",
-        "type": "application/pdf",
-        "parameters": {
-          "keyFd": { "type": "FD", "value": fileFd }
+      'ability.want.params.INTENT': {
+        'action': 'ohos.want.action.sendData',
+        'type': 'application/pdf',
+        'parameters': {
+          'keyFd': { 'type': 'FD', 'value': fileFd }
         }
       }
     }
@@ -59,7 +59,7 @@ function implicitStartAbility() {
 >
 > Data sharing can be implemented only in FD format. For details about how to obtain the FD and file name, see [File Management](../reference/apis/js-apis-file-fs.md).
 
-In the preceding code, under the custom field **parameters**, the following **ability.picker.*** fields are used to pass the information to be displayed on the application selector:
+In the preceding code, under the custom field **parameters**, the following **ability.picker.*** fields are used to pass the information to be displayed on the application sharing box:
 
 - **ability.picker.type**: file type icon.
 - **ability.picker.fileNames**: file name.
@@ -67,6 +67,7 @@ In the preceding code, under the custom field **parameters**, the following **ab
 - **ability.picker.fileNames** and **ability.picker.fileSizes** are arrays and have a one-to-one mapping.
 
 The following figure shows an example. 
+
 ![](figures/ability-startup-with-implicit-want2.png)
 
 ## Shared Party

en/application-dev/application-models/enterprise-extensionAbility.md

@@ -6,10 +6,7 @@ EnterpriseAdminExtensionAbility is a mandatory component for Mobile Device Manag
 
 ## Constraints
 
-- **Function constraints**
-
-  EnterpriseAdminExtensionAbility is applicable only to enterprise administrator applications.
-  
+EnterpriseAdminExtensionAbility is applicable only to enterprise administrator applications.
 
 ## Observing Activation/Deactivation of a Device Administrator Application and Installation/Removal of an Application
 
@@ -26,10 +23,10 @@ EnterpriseAdminExtensionAbility is a mandatory component for Mobile Device Manag
 ### Available APIs
 
 | Class                           | API                                 | Description                        |
-| :------------------------------ | ----------------------------------------- | ---------------------------- |
+| ------------------------------ | ----------------------------------------- | ---------------------------- |
+| EnterpriseAdminExtensionAbility | onAdminEnabled(): void                    | Called when a device administrator application is activated.  |
 | EnterpriseAdminExtensionAbility | onAdminDisabled(): void                   | Called when a device administrator application is deactivated.|
 | EnterpriseAdminExtensionAbility | onBundleAdded(bundleName: string): void   | Called when an application is installed on a device.            |
-| EnterpriseAdminExtensionAbility | onAdminEnabled(): void                    | Called when a device administrator application is activated.  |
 | EnterpriseAdminExtensionAbility | onBundleRemoved(bundleName: string): void | Called when an application is removed from a device.            |
 
 ### How to Develop
@@ -78,10 +75,9 @@ To implement EnterpriseAdminExtensionAbility, you need to activate the device ad
 
 ## Example
 
-Use **subscribeManagedEvent()** and **unsubscribeManagedEvent()** in the **@ohos.enterprise.adminManager** module to subscribe to application installation and removal events. When an application is installed or removed, the MDM application is notified of the event. Then, the MDM application reports the event in the callback to notify the enterprise administrator.
+Use **subscribeManagedEvent** in the **@ohos.enterprise.adminManager** module to subscribe to application installation and removal events. When an application is installed or removed, the MDM application is notified of the event. Then, the MDM application reports the event in the callback to notify the enterprise administrator. To unsubscribe from events, use **unsubscribeManagedEvent**.
 
 ```ts
-  @State managedEvents: Array<adminManager.ManagedEvent> = [0,1]
   @State subscribeManagedEventMsg: string = ""
   @State unsubscribeManagedEventMsg: string = ""
 

en/application-dev/application-models/explicit-implicit-want-mappings.md

@@ -79,7 +79,7 @@ The system matches the **entities** attribute in the **want** parameter passed b
 
 - If **entities** in the passed **want** parameter is specified, and **entities** under **skills** of an ability is specified but does not contain **entities** in the passed **want** parameter, the matching fails.
 
-  Figure 2 Matching rule of entities in the want parameter
+  **Figure 2** Matching rule of entities in the want parameter
 
   ![want-entities](figures/want-entities.png)  
 
@@ -88,10 +88,6 @@ The system matches the **entities** attribute in the **want** parameter passed b
 
 When the **uri** and **type** parameters are specified in the **want** parameter to initiate a component startup request, the system traverses the list of installed components and matches the **uris** array under **skills** of the abilities one by one. If one of the **uris** arrays under **skills** matches the **uri** and **type** in the passed **want**, the matching is successful.
 
-Figure 3 Matching rules when uri and type are specified in the want parameter
-
-![want-uri-type1](figures/want-uri-type1.png) 
-
 There are four combinations of **uri** and **type** settings. The matching rules are as follows:
 
 - Neither **uri** or **type** is specified in the **want** parameter.
@@ -111,11 +107,17 @@ There are four combinations of **uri** and **type** settings. The matching rules
   - If the **uris** array under **skills** of an ability is unspecified, the matching fails.
   - If the **uris** array under **skills** of an ability contains an element whose [uri is matched](#matching-rules-of-uri) and [type is matched](#matching-rules-of-type), the matching is successful. Otherwise, the matching fails.
 
+Leftmost URI matching: When only **scheme**, a combination of **scheme** and **host**, or a combination of **scheme**, **host**, and **port** is configured in the **uris** array under **skills** of the ability,
+the matching is successful only if the leftmost URI in the passed **want** parameter matches **scheme**, the combination of **scheme** and **host**, or the combination of **scheme**, **host**, and **port**.
 
-To simplify the description, **uri** and **type** passed in the **want** parameter are called **w_uri** and **w_type**, respectively; the **uris** array under **skills** of an ability to match is called **s_uris**; each element in the array is called **s_uri**. Matching is performed from top to bottom.
+**Figure 3** Matching rules when uri and type are specified in the want parameter
+
+  ![want-uri-type1](figures/want-uri-type1.png)  
 
 
-Figure 4 Matching rules of uri and type in the want parameter
+To simplify the description, **uri** and **type** passed in the **want** parameter are called **w_uri** and **w_type**, respectively; the **uris** array under **skills** of an ability to match is called **s_uris**; each element in the array is called **s_uri**. Matching is performed from top to bottom.
+
+**Figure 4** Matching rules of uri and type in the want parameter
 
 ![want-uri-type2](figures/want-uri-type2.png)  
 
@@ -128,7 +130,9 @@ To simplify the description, **uri** in the passed **want** parameter is called
 
 - If **host** of **s_uri** is unspecified and **scheme** of **w_uri** and **scheme** of **s_uri** are the same, the matching is successful. Otherwise, the matching fails.
 
-- If **path**, **pathStartWith**, and **pathRegex** of **s_uri** are unspecified and **w_uri** and **s_uri** are the same, the matching is successful. Otherwise, the matching fails.
+- If **port** of **s_uri** is unspecified and the combination of **scheme** and **host** of **w_uri** is the same as the combination of **scheme** and **host** of **s_uri**, the matching is successful. Otherwise, the matching fails.
+
+- If **path**, **pathStartWith**, and **pathRegex** of **s_uri** are unspecified and the combination of **scheme**, **host**, and **port** of **w_uri** is the same as the combination of **scheme**, **host**, and **port** of **s_uri**, the matching is successful. Otherwise, the matching fails.
 
 - If **path** of **s_uri** is specified and the **full path expressions** of **w_uri** and **s_uri** are the same, the matching is successful. Otherwise, the matching of **pathStartWith** continues.
 
@@ -145,6 +149,11 @@ To simplify the description, **uri** in the passed **want** parameter is called
 > - **Prefix expression**: `scheme://host:port/pathStartWith`
 > 
 > - **Regular expression**: `scheme://host:port/pathRegex`
+>
+> - **Prefix URI expression**: When only **scheme**, a combination of **scheme** and **host**, or a combination of **scheme**, **host**, and **port** is configured in the configuration file, the matching is successful if a URI prefixed with the configuration file is passed in.
+>     * `scheme://`
+>     * `scheme://host`
+>     * `scheme://host:port`
 
 
 ### Matching Rules of type

en/application-dev/application-models/hop-cross-device-migration.md

-# Cross-Device Migration (for System Applications Only)]
+# Cross-Device Migration (for System Applications Only)
 
 
 ## When to Use
@@ -47,25 +47,16 @@ The table below describes the main APIs used for cross-device migration. For det
 
 ## How to Develop
 
-1. Configure the data synchronization permission in the **module.json5** file. The sample code is as follows:
+1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
 
-   ```json
-   {
-     "module": {
-       "requestPermissions":[  
-         {  
-           "name" : "ohos.permission.DISTRIBUTED_DATASYNC",
-         }
-       ]
-     }
-   }
-   ```
-
-2. Configure the fields related to cross-device migration in the configuration file.
-   - Configure the application to support migration.
+2. Display a dialog box to ask authorization from the user when the application is started for the first time. For details, see [Requesting User Authorization](../security/accesstoken-guidelines.md#requesting-user-authorization).
 
+3. Configure the fields related to cross-device migration in the configuration file.
 
+   Configure the application to support migration.
    Set the **continuable** field in the **module.json5** file to **true**. The default value is **false**. If this parameter is set to **false**, the application cannot be continued on the target device.
+   
+   
       ```json
       {
         "module": {
@@ -80,26 +71,10 @@ The table below describes the main APIs used for cross-device migration. For det
       }
       ```
 
-   - Configure the application launch type. For details, see [UIAbility Component Launch Type](uiability-launch-type.md).
-
-3. Request the data synchronization permission. The sample code for displaying a dialog box to request the permission is as follows:
-   
-   ```ts
-   requestPermission() {   
-       let context = this.context
-       let permissions: Array<string> = ['ohos.permission.DISTRIBUTED_DATASYNC']   
-       context.requestPermissionsFromUser(permissions).then((data) => {   
-           console.info("Succeed to request permission from user with data: "+ JSON.stringify(data))
-       }).catch((error) => {       
-           console.info("Failed to request permission from user with error: "+ JSON.stringify(error))   
-       }) 
-   }
-   ```
+   Configure the application launch type. For details, see [UIAbility Component Launch Type](uiability-launch-type.md).
 
 4. Implement [onContinue()](../reference/apis/js-apis-app-ability-uiAbility.md#abilityoncontinue) in the UIAbility of the initiator.
-
    [onContinue()](../reference/apis/js-apis-app-ability-uiAbility.md#abilityoncontinue) is called on the initiator. You can save the  data in this method to implement application compatibility check and migration decision.
-
    - Saving migrated data: You can save the data to be migrated in key-value pairs in **wantParam**.
 
    - Checking application compatibility: You can obtain the version number of the target application from **wantParam** and check the compatibility between the target application and the current application.

en/application-dev/application-models/hop-multi-device-collaboration.md

@@ -11,7 +11,7 @@ Multi-device coordination involves the following scenarios:
 
 - [Connecting to ServiceExtensionAbility Across Devices](#connecting-to-serviceextensionability-across-devices)
 
-- [Using Cross-Device Ability Call](#using-cross-device-ability-call)
+- [Using Cross-Device Call](#using-cross-device-call)
 
 
 ## Multi-Device Collaboration Process
@@ -47,21 +47,9 @@ On device A, touch the **Start** button provided by the initiator application to
 
 ### How to Develop
 
-1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
 
-2. Request the data synchronization permission. The sample code for displaying a dialog box to request the permission is as follows:
-   
-   ```ts
-   requestPermission() {   
-       let context = this.context;
-       let permissions: Array<string> = ['ohos.permission.DISTRIBUTED_DATASYNC'];
-       context.requestPermissionsFromUser(permissions).then((data) => {
-           console.info("Succeed to request permission from user with data: "+ JSON.stringify(data));
-       }).catch((error) => {
-           console.info("Failed to request permission from user with error: "+ JSON.stringify(error));
-       })
-   }
-   ```
+2. Display a dialog box to ask authorization from the user when the application is started for the first time. For details, see [Requesting User Authorization](../security/accesstoken-guidelines.md#requesting-user-authorization).
 
 3. Obtain the device ID of the target device.
 
@@ -102,7 +90,7 @@ On device A, touch the **Start** button provided by the initiator application to
        abilityName: 'FuncAbility',
        moduleName: 'module1', // moduleName is optional.
    }
-   // context is the ability-level context of the initiator UIAbility.
+   // context is the AbilityContext of the initiator UIAbility.
    this.context.startAbility(want).then(() => {
        // ...
    }).catch((err) => {
@@ -118,32 +106,20 @@ On device A, touch the **Start** button provided by the initiator application to
 
 ### Available APIs
 
-**Table 2** APIs for starting an ability across devices and returning the result data
+**Table 2** APIs for starting a UIAbility across devices and returning the result data
 
 | API| Description|
 | -------- | -------- |
 | startAbilityForResult(want: Want, callback: AsyncCallback&lt;AbilityResult&gt;): void; | Starts a UIAbility. This API uses an asynchronous callback to return the result when the UIAbility is terminated.|
-| terminateSelfWithResult(parameter: AbilityResult, callback: AsyncCallback&lt;void&gt;): void;| Terminates this UIAbility. This API uses an asynchronous callback to return the ability result information. It is used together with **startAbilityForResult**.|
-| terminateSelfWithResult(parameter: AbilityResult): Promise&lt;void&gt;; | Terminates this UIAbility. This API uses a promise to return the ability result information. It is used together with **startAbilityForResult**.|
+| terminateSelfWithResult(parameter: AbilityResult, callback: AsyncCallback&lt;void&gt;): void;| Terminates this UIAbility. This API uses an asynchronous callback to return the result information. It is used together with **startAbilityForResult**.|
+| terminateSelfWithResult(parameter: AbilityResult): Promise&lt;void&gt;; | Terminates this UIAbility. This API uses a promise to return the result information. It is used together with **startAbilityForResult**.|
 
 
 ### How to Develop
 
-1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
 
-2. Request the data synchronization permission. The sample code for displaying a dialog box to request the permission is as follows:
-   
-   ```ts
-   requestPermission() {   
-       let context = this.context;
-       let permissions: Array<string> = ['ohos.permission.DISTRIBUTED_DATASYNC'];
-       context.requestPermissionsFromUser(permissions).then((data) => {
-           console.info("Succeed to request permission from user with data: "+ JSON.stringify(data));
-       }).catch((error) => {
-           console.info("Failed to request permission from user with error: "+ JSON.stringify(error));
-       })
-   }
-   ```
+2. Display a dialog box to ask authorization from the user when the application is started for the first time. For details, see [Requesting User Authorization](../security/accesstoken-guidelines.md#requesting-user-authorization).
 
 3. Set the target component parameters on the initiator, and call **startAbilityForResult()** to start the target UIAbility. **data** in the asynchronous callback is used to receive the information returned by the target UIAbility to the initiator UIAbility after the target UIAbility terminates itself. For details about how to implement **getRemoteDeviceId()**, see [Starting UIAbility and ServiceExtensionAbility Across Devices (No Data Returned)](#starting-uiability-and-serviceextensionability-across-devices-no-data-returned).
 
@@ -154,7 +130,7 @@ On device A, touch the **Start** button provided by the initiator application to
        abilityName: 'FuncAbility',
        moduleName: 'module1', // moduleName is optional.
    }
-   // context is the ability-level context of the initiator UIAbility.
+   // context is the AbilityContext of the initiator UIAbility.
    this.context.startAbilityForResult(want).then((data) => {
        // ...
    }).catch((err) => {
@@ -174,7 +150,7 @@ On device A, touch the **Start** button provided by the initiator application to
            moduleName: 'module1',
        },
    }
-   // context is the ability-level context of the target UIAbility.
+   // context is the AbilityContext of the target UIAbility.
    this.context.terminateSelfWithResult(abilityResult, (err) => {
        // ...
    });
@@ -187,7 +163,7 @@ On device A, touch the **Start** button provided by the initiator application to
    
    // ...
    
-   // context is the ability-level context of the initiator UIAbility.
+   // context is the UIAbilityContext of the initiator UIAbility.
    this.context.startAbilityForResult(want).then((data) => {
        if (data?.resultCode === RESULT_CODE) {
            // Parse the information returned by the target UIAbility.
@@ -218,21 +194,9 @@ A system application can connect to a service on another device by calling [conn
 
 ### How to Develop
 
-1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
 
-2. Request the data synchronization permission. The sample code for displaying a dialog box to request the permission is as follows:
-   
-   ```ts
-   requestPermission() {   
-       let context = this.context;
-       let permissions: Array<string> = ['ohos.permission.DISTRIBUTED_DATASYNC'];
-       context.requestPermissionsFromUser(permissions).then((data) => {
-           console.info("Succeed to request permission from user with data: "+ JSON.stringify(data));
-       }).catch((error) => {
-           console.info("Failed to request permission from user with error: "+ JSON.stringify(error));
-       })
-   }
-   ```
+2. Display a dialog box to ask authorization from the user when the application is started for the first time. For details, see [Requesting User Authorization](../security/accesstoken-guidelines.md#requesting-user-authorization).
 
 3. (Optional) [Implement a background service](serviceextensionability.md#implementing-a-background-service). Perform this operation only if no background service is available.
 
@@ -303,56 +267,45 @@ A system application can connect to a service on another device by calling [conn
    ```
 
 
-## Using Cross-Device Ability Call
+## Using Cross-Device Call
 
-The basic principle of cross-device ability call is the same as that of intra-device ability call. For details, see [Using Ability Call to Implement UIAbility Interaction (for System Applications Only)](uiability-intra-device-interaction.md#using-ability-call-to-implement-uiability-interaction-for-system-applications-only).
+The basic principle of cross-device call is the same as that of intra-device call. For details, see [Using Call to Implement UIAbility Interaction (for System Applications Only)](uiability-intra-device-interaction.md#using-call-to-implement-uiability-interaction-for-system-applications-only).
 
-The following describes how to implement multi-device collaboration through cross-device ability call.
+The following describes how to implement multi-device collaboration through cross-device call.
 
 
 ### Available APIs
 
-**Table 4** Ability call APIs
+**Table 4** Call APIs
 
 | API| Description|
 | -------- | -------- |
 | startAbilityByCall(want: Want): Promise&lt;Caller&gt;; | Starts a UIAbility in the foreground or background and obtains the caller object for communicating with the UIAbility.|
-| on(method: string, callback: CalleeCallBack): void | Callback invoked when the callee ability registers a method.|
-| off(method: string): void | Callback invoked when the callee ability deregisters a method.|
-| call(method: string, data: rpc.Parcelable): Promise&lt;void&gt; | Sends agreed parcelable data to the callee ability.|
-| callWithResult(method: string, data: rpc.Parcelable): Promise&lt;rpc.MessageSequence&gt;| Sends agreed parcelable data to the callee ability and obtains the agreed parcelable data returned by the callee ability.|
+| on(method: string, callback: CalleeCallBack): void | Callback invoked when the CalleeAbility registers a method.|
+| off(method: string): void | Callback invoked when the CalleeAbility deregisters a method.|
+| call(method: string, data: rpc.Parcelable): Promise&lt;void&gt; | Sends agreed parcelable data to the CalleeAbility.|
+| callWithResult(method: string, data: rpc.Parcelable): Promise&lt;rpc.MessageSequence&gt;| Sends agreed parcelable data to the CalleeAbility and obtains the agreed parcelable data returned by the CalleeAbility.|
 | release(): void | Releases the caller object.|
 | on(type: "release", callback: OnReleaseCallback): void | Callback invoked when the caller object is released.|
 
 
 ### How to Develop
 
-1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
-   
-2. Request the data synchronization permission. The sample code for displaying a dialog box to request the permission is as follows:
+1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
 
-   ```ts
-   requestPermission() {   
-       let context = this.context;
-       let permissions: Array<string> = ['ohos.permission.DISTRIBUTED_DATASYNC'];
-       context.requestPermissionsFromUser(permissions).then((data) => {
-           console.info("Succeed to request permission from user with data: "+ JSON.stringify(data));
-       }).catch((error) => {
-           console.info("Failed to request permission from user with error: "+ JSON.stringify(error));
-       })
-   }
-   ```
+2. Display a dialog box to ask authorization from the user when the application is started for the first time. For details, see [Requesting User Authorization](../security/accesstoken-guidelines.md#requesting-user-authorization).
 
-3. Create the callee ability.
+3. Create the CalleeAbility.
    
-   For the callee ability, implement the callback to receive data and the methods to marshal and unmarshal data. When data needs to be received, use **on()** to register a listener. When data does not need to be received, use **off()** to deregister the listener.
+     For the CalleeAbility, implement the callback to receive data and the methods to marshal and unmarshal data. When data needs to be received, use **on()** to register a listener. When data does not need to be received, use **off()** to deregister the listener.
 
      1. Configure the launch type of the UIAbility.
-       Set **launchType** of the callee ability to **singleton** in the **module.json5** file.
+
+         Set **launchType** of the CalleeAbility to **singleton** in the **module.json5** file.
 
          | JSON Field| Description|
          | -------- | -------- |
-       | "launchType"| Ability launch type. Set this parameter to **singleton**.|
+         | "launchType"| UIAbility launch type. Set this parameter to **singleton**.|
 
          An example of the UIAbility configuration is as follows:
 
@@ -375,7 +328,7 @@ The following describes how to implement multi-device collaboration through cros
          ```
      3. Define the agreed parcelable data.
 
-       The data formats sent and received by the caller and callee abilities must be consistent. In the following example, the data formats are number and string.
+         The data formats sent and received by the CallerAbility and CalleeAbility must be consistent. In the following example, the data formats are number and string.
 
          
          ```ts
@@ -403,7 +356,7 @@ The following describes how to implement multi-device collaboration through cros
          ```
      4. Implement **Callee.on** and **Callee.off**.
 
-         In the following example, the **MSG_SEND_METHOD** listener is registered in **onCreate()** of the ability and deregistered in **onDestroy()**. After receiving parcelable data, the application processes the data and returns the data result. You need to implement processing based on service requirements.
+           In the following example, the **MSG_SEND_METHOD** listener is registered in **onCreate()** of the UIAbility and deregistered in **onDestroy()**. After receiving parcelable data, the application processes the data and returns the data result. You need to implement processing based on service requirements.
            
          ```ts
          const TAG: string = '[CalleeAbility]';
@@ -412,13 +365,13 @@ The following describes how to implement multi-device collaboration through cros
          function sendMsgCallback(data) {
              console.info('CalleeSortFunc called');
          
-           // Obtain the parcelable data sent by the caller ability.
+             // Obtain the parcelable data sent by the CallerAbility.
              let receivedData = new MyParcelable(0, '');
              data.readParcelable(receivedData);
              console.info(`receiveData[${receivedData.num}, ${receivedData.str}]`);
          
              // Process the data.
-           // Return the parcelable data result to the caller ability.
+             // Return the parcelable data result to the CallerAbility.
              return new MyParcelable(receivedData.num + 1, `send ${receivedData.str} succeed`);
          }
          
@@ -441,7 +394,7 @@ The following describes how to implement multi-device collaboration through cros
          }
          ```
 
-4. Obtain the caller object and access the callee ability.
+4. Obtain the caller object and access the CalleeAbility.
    1. Import the **UIAbility** module.
       
        ```ts
@@ -449,7 +402,7 @@ The following describes how to implement multi-device collaboration through cros
        ```
    2. Obtain the caller object.
 
-       The **context** attribute of the ability implements **startAbilityByCall** to obtain the caller object for communication. The following example uses **this.context** to obtain the **context** attribute of the ability, uses **startAbilityByCall** to start the callee ability, obtain the caller object, and register the **onRelease** listener of the caller ability. You need to implement processing based on service requirements.
+       The **context** attribute of the UIAbility implements **startAbilityByCall** to obtain the caller object for communication. The following example uses **this.context** to obtain the **context** attribute of the UIAbility, uses **startAbilityByCall** to start the CalleeAbility, obtain the caller object, and register the **onRelease** and **onRemoteStateChange** listeners of the CallerAbility. You need to implement processing based on service requirements.
 
        
        ```ts
@@ -465,11 +418,19 @@ The following describes how to implement multi-device collaboration through cros
                if (data != null) {
                    caller = data;
                    console.info('get remote caller success');
-                   // Register the onRelease() listener of the caller ability.
+                   // Register the onRelease listener of the CallerAbility.
                    caller.onRelease((msg) => {
                        console.info(`remote caller onRelease is called ${msg}`);
                    })
                    console.info('remote caller register OnRelease succeed');
+                   // Register the onRemoteStateChange listener of the CallerAbility.
+                   try {
+                        caller.onRemoteStateChange((str) => {
+                            console.log('Remote state changed ' + str);
+                        });
+                    } catch (error) {
+                        console.log('Caller.onRemoteStateChange catch error, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+                    }
                }
            }).catch((error) => {
                console.error(`get remote caller failed with ${error}`);
@@ -479,8 +440,8 @@ The following describes how to implement multi-device collaboration through cros
 
        For details about how to implement **getRemoteDeviceId()**, see [Starting UIAbility and ServiceExtensionAbility Across Devices (No Data Returned)](#starting-uiability-and-serviceextensionability-across-devices-no-data-returned).
 
-5. Sends agreed parcelable data to the callee ability.
-   1. The parcelable data can be sent to the callee ability with or without a return value. The method and parcelable data must be consistent with those of the callee ability. The following example describes how to send data to the callee ability.
+5. Sends agreed parcelable data to the CalleeAbility.
+   1. The parcelable data can be sent to the CalleeAbility with or without a return value. The method and parcelable data must be consistent with those of the CalleeAbility. The following example describes how to send data to the CalleeAbility.
       
        ```ts
        const MSG_SEND_METHOD: string = 'CallSendMsg';
@@ -493,7 +454,7 @@ The following describes how to implement multi-device collaboration through cros
            }
        }
        ```
-   2. In the following, **CallWithResult** is used to send data **originMsg** to the callee ability and assign the data processed by the **CallSendMsg** method to **backMsg**.
+   2. In the following, **CallWithResult** is used to send data **originMsg** to the CalleeAbility and assign the data processed by the **CallSendMsg** method to **backMsg**.
       
        ```ts
        const MSG_SEND_METHOD: string = 'CallSendMsg';

en/application-dev/application-models/inputmethodextentionability.md

@@ -33,7 +33,7 @@ In the **ets** directory of the target module, right-click and choose **New** >
 
 > **NOTE**
 > 
-> When compiling the input method application, use the signature at the system_core level. Otherwise, the application will not be able to start the keyboard.
+> When compiling the input method application, use the signature at the system_basic level. Otherwise, the application will not be able to start the keyboard.
 
 The minimum template implements an input method application with the most basic features, such as starting the keyboard, entering text, and deleting input. You can diversify the feature set of the application by, for example, adding the feature to hide the keyboard.
 

en/application-dev/application-models/mission-management-overview.md

@@ -30,18 +30,14 @@ Missions are managed by system applications (such as home screen), rather than t
 
 A UIAbility instance corresponds to an independent mission. Therefore, when an application calls [startAbility()](../reference/apis/js-apis-inner-application-uiAbilityContext.md#uiabilitycontextstartability) to start a UIAbility, a mission is created.
 
+To call [missionManager](../reference/apis/js-apis-application-missionManager.md) to manage missions, the home screen application must request the **ohos.permission.MANAGE_MISSIONS** permission. For details about the configuration, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
 
-To call [missionManager](../reference/apis/js-apis-application-missionManager.md) to manage missions, the home screen application must request the **ohos.permission.MANAGE_MISSIONS** permission. For details about the configuration, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+You can use **missionManager** to manage missions, for example, listening for mission changes, obtaining mission information or snapshots, and clearing, locking, or unlocking missions.
 
+   ```ts
+   import missionManager from '@ohos.app.ability.missionManager'
    
-You can use **missionManager** to manage missions, for example, listening for mission changes, obtaining mission information or snapshots, and clearing, locking, or unlocking missions. The sample code is as follows:
-
-
-
-```ts
-import missionManager from '@ohos.app.ability.missionManager'
-
-let listener = {
+   let listener = {
        // Listen for mission creation.
        onMissionCreated: function (mission) {
            console.info("--------onMissionCreated-------")
@@ -70,62 +66,64 @@ let listener = {
        onMissionClosed: function (mission) {
            console.info("--------onMissionClosed-------")
        }
-};
+   };
    
-// 1. Register a mission change listener.
-let listenerId = missionManager.on('mission', listener);
+   // 1. Register a mission change listener.
+   let listenerId = missionManager.on('mission', listener);
    
-// 2. Obtain the latest 20 missions in the system.
-missionManager.getMissionInfos("", 20, (error, missions) => {
+   // 2. Obtain the latest 20 missions in the system.
+   missionManager.getMissionInfos("", 20, (error, missions) => {
        console.info("getMissionInfos is called, error.code = " + error.code);
        console.info("size = " + missions.length);
        console.info("missions = " + JSON.stringify(missions));
-});
+   });
    
-// 3. Obtain the detailed information about a mission.
-let missionId = 11; // The mission ID 11 is only an example.
-let mission = missionManager.getMissionInfo("", missionId).catch(function (err) {
+   // 3. Obtain the detailed information about a mission.
+   let missionId = 11; // The mission ID 11 is only an example.
+   let mission = missionManager.getMissionInfo("", missionId).catch(function (err) {
        console.info(err);
-});
+   });
    
-// 4. Obtain the mission snapshot.
-missionManager.getMissionSnapShot("", missionId, (error, snapshot) => {
+   // 4. Obtain the mission snapshot.
+   missionManager.getMissionSnapShot("", missionId, (error, snapshot) => {
        console.info("getMissionSnapShot is called, error.code = " + error.code);
        console.info("bundleName = " + snapshot.ability.bundleName);
-})
+   })
    
-// 5. Obtain the low-resolution mission snapshot.
-missionManager.getLowResolutionMissionSnapShot("", missionId, (error, snapshot) => {
+   // 5. Obtain the low-resolution mission snapshot.
+   missionManager.getLowResolutionMissionSnapShot("", missionId, (error, snapshot) => {
        console.info("getLowResolutionMissionSnapShot is called, error.code = " + error.code);
        console.info("bundleName = " + snapshot.ability.bundleName);
-})
+   })
    
-// 6. Lock or unlock the mission.
-missionManager.lockMission(missionId).then(() => {
+   // 6. Lock or unlock the mission.
+   missionManager.lockMission(missionId).then(() => {
        console.info("lockMission is called ");
-});
+   });
    
-missionManager.unlockMission(missionId).then(() => {
+   missionManager.unlockMission(missionId).then(() => {
        console.info("unlockMission is called ");
-});
+   });
    
-// 7. Switch the mission to the foreground.
-missionManager.moveMissionToFront(missionId).then(() => {
+   // 7. Switch the mission to the foreground.
+   missionManager.moveMissionToFront(missionId).then(() => {
        console.info("moveMissionToFront is called ");
-});
+   });
    
-// 8. Clear a single mission.
-missionManager.clearMission(missionId).then(() => {
+   // 8. Clear a single mission.
+   missionManager.clearMission(missionId).then(() => {
        console.info("clearMission is called ");
-});
+   });
    
-// 9. Clear all missions.
-missionManager.clearAllMissions().catch(function (err) {
+   // 9. Clear all missions.
+   missionManager.clearAllMissions().catch(function (err) {
        console.info(err);
-});
+   });
    
-// 10. Deregister the mission change listener.
-missionManager.off('mission', listenerId, (error) => {
+   // 10. Deregister the mission change listener.
+   missionManager.off('mission', listenerId, (error) => {
        console.info("unregisterMissionListener");
-})
-```
+   })
+   ```
+
+   

en/application-dev/application-models/request-permissions.md

@@ -9,37 +9,7 @@ During application development, you must declare the required permission in the
 
 To declare a permission in **config.json**, add **reqPermissions** under **module** and list the permission.
 
+For example, to request the permission to access the calendar, perform the following steps:
 
-For example, to declare the permission to access the calendar, request the **ohos.permission.READ_CALENDAR** permission. For details, see [Permission Application Guide](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
-
-
-The sample code in the **config.json** file is as follows:
-
-```json
-{
-  "module": {
-    // ...
-    "reqPermissions": [
-      {
-        "name": "ohos.permission.READ_CALENDAR"
-        // ...
-      }
-    ]
-  }
-}
-```
-
-
-Request the permission from uses in the form of a dialog box:
-
-```ts
-import featureAbility from '@ohos.ability.featureAbility';
-
-let context = featureAbility.getContext();  
-let permissions: Array<string> = ['ohos.permission.READ_CALENDAR']
-context.requestPermissionsFromUser(permissions, 1).then((data) => {    
-    console.info("Succeed to request permission from user with data: " + JSON.stringify(data))
-}).catch((error) => {    
-    console.info("Failed to request permission from user with error: " + JSON.stringify(error))
-})
-```
+1. Request the **ohos.permission.DISTRIBUTED_DATASYNC** permission. For details, see [Declaring Permissions in the Configuration File](../security/accesstoken-guidelines.md#declaring-permissions-in-the-configuration-file).
+2. Display a dialog box to ask authorization from the user when the application is started for the first time. For details, see [Requesting User Authorization](../security/accesstoken-guidelines.md#requesting-user-authorization).

en/application-dev/application-models/uiability-data-sync-with-ui.md

@@ -80,7 +80,7 @@ Before using the APIs provided by **EventHub**, you must obtain an **EventHub**
 4. After **event1** is used, you can call [eventHub.off()](../reference/apis/js-apis-inner-application-eventHub.md#eventhuboff) to unsubscribe from the event.
 
    ```ts
-   // context is the ability-level context of the UIAbility instance.
+   // context is the AbilityContext of the UIAbility instance.
    this.context.eventHub.off('event1');
    ```
 
@@ -240,10 +240,6 @@ The following provides an example to describe the object overwritten problem in
    struct Index {
      onPageShow() {
        let ctx = globalThis.context; // Obtain the context from globalThis and use it.
-       let permissions = ['com.example.permission']
-       ctx.requestPermissionsFromUser(permissions,(result) => {
-          // ...
-       });
      }
      // Page display.
      build() {
@@ -274,10 +270,6 @@ The following provides an example to describe the object overwritten problem in
    struct Index {
      onPageShow() {
        let ctx = globalThis.context; // Obtain the context from globalThis and use it.
-       let permissions = ['com.example.permission']
-       ctx.requestPermissionsFromUser(permissions,(result) => {
-         console.info('requestPermissionsFromUser result:' + JSON.stringify(result));
-       });
      }
      // Page display.
      build() {
@@ -307,10 +299,6 @@ The following provides an example to describe the object overwritten problem in
    struct Index {
      onPageShow() {
        let ctx = globalThis.context; // The context in globalThis is the context of UIAbilityB.
-       let permissions=['com.example.permission'];
-       ctx.requestPermissionsFromUser(permissions,(result) => { // Using this object causes a process breakdown.
-          console.info('requestPermissionsFromUser result:' + JSON.stringify(result));
-       });
      }
      // Page display.
      build() {

en/application-dev/application-models/uiability-launch-type.md

@@ -18,9 +18,12 @@ The launch type of the UIAbility component refers to the state of the UIAbility
 Each time [startAbility()](../reference/apis/js-apis-inner-application-uiAbilityContext.md#uiabilitycontextstartability) is called, if a UIAbility instance of this type already exists in the application process, the instance is reused. Therefore, only one UIAbility instance of this type exists in the system, that is, displayed in **Recents**.
 
 **Figure 1** Demonstration effect in singleton mode 
+
 ![uiability-launch-type1](figures/uiability-launch-type1.png)  
 
-> **NOTE**<br>Assume that the application already has a UIAbility instance created, and the launch type of the UIAbility instance is set to **singleton**. If [startAbility()](../reference/apis/js-apis-inner-application-uiAbilityContext.md#uiabilitycontextstartability) is called again to start the UIAbility instance, the original UIAbility instance is started, and no new UIAbility instance is created. In this case, the [onNewWant()](../reference/apis/js-apis-app-ability-uiAbility.md#abilityonnewwant) callback is invoked, but the [onCreate()](../reference/apis/js-apis-app-ability-uiAbility.md#uiabilityoncreate) and [onWindowStageCreate()](../reference/apis/js-apis-app-ability-uiAbility.md#uiabilityonwindowstagecreate) callbacks are not.
+> **NOTE**
+>
+> Assume that the application already has a UIAbility instance created, and the launch type of the UIAbility instance is set to **singleton**. If [startAbility()](../reference/apis/js-apis-inner-application-uiAbilityContext.md#uiabilitycontextstartability) is called again to start the UIAbility instance, the original UIAbility instance is started, and no new UIAbility instance is created. In this case, the [onNewWant()](../reference/apis/js-apis-app-ability-uiAbility.md#abilityonnewwant) callback is invoked, but the [onCreate()](../reference/apis/js-apis-app-ability-uiAbility.md#uiabilityoncreate) and [onWindowStageCreate()](../reference/apis/js-apis-app-ability-uiAbility.md#uiabilityonwindowstagecreate) callbacks are not.
 
 To use the singleton mode, set **launchType** in the [module.json5 configuration file](../quick-start/module-configuration-file.md) to **singleton**.
 
@@ -45,6 +48,7 @@ To use the singleton mode, set **launchType** in the [module.json5 configuration
 In standard mode, each time [startAbility()](../reference/apis/js-apis-inner-application-uiAbilityContext.md#uiabilitycontextstartability) is called, a new UIAbility instance of this type is created in the application process. Multiple UIAbility instances of this type are displayed in **Recents**.  
 
 **Figure 2** Demonstration effect in standard mode
+
 ![standard-mode](figures/standard-mode.png)  
 
 To use the standard mode, set **launchType** in the [module.json5 configuration file](../quick-start/module-configuration-file.md) to **standard**.
@@ -70,6 +74,7 @@ To use the standard mode, set **launchType** in the [module.json5 configuration
 The **specified** mode is used in some special scenarios. For example, in a document application, you want a document instance to be created each time you create a document, but you want to use the same document instance when you repeatedly open an existing document.
 
 **Figure 3** Demonstration effect in specified mode 
+
 ![uiability-launch-type2](figures/uiability-launch-type2.png)  
 
 For example, there are two UIAbility components: EntryAbility and SpecifiedAbility (with the launch type **specified**). You are required to start SpecifiedAbility from EntryAbility.
@@ -108,7 +113,7 @@ For example, there are two UIAbility components: EntryAbility and SpecifiedAbili
            instanceKey: getInstance(),
        },
    }
-   // context is the ability-level context of the initiator UIAbility.
+   // context is the UIAbilityContext of the initiator UIAbility.
    this.context.startAbility(want).then(() => {
        // ...
    }).catch((err) => {
@@ -137,7 +142,7 @@ For example, there are two UIAbility components: EntryAbility and SpecifiedAbili
    }
    ```
 
-   > **NOTE**<br>
+   > **NOTE**
    >
    > 1. Assume that the application already has a UIAbility instance created, and the launch type of the UIAbility instance is set to **specified**. If [startAbility()](../reference/apis/js-apis-inner-application-uiAbilityContext.md#uiabilitycontextstartability) is called again to start the UIAbility instance, and the [onAcceptWant()](../reference/apis/js-apis-app-ability-abilityStage.md#abilitystageonacceptwant) callback of [AbilityStage](../reference/apis/js-apis-app-ability-abilityStage.md) matches a created UIAbility instance, the original UIAbility instance is started, and no new UIAbility instance is created. In this case, the [onNewWant()](../reference/apis/js-apis-app-ability-uiAbility.md#abilityonnewwant) callback is invoked, but the [onCreate()](../reference/apis/js-apis-app-ability-uiAbility.md#uiabilityoncreate) and [onWindowStageCreate()](../reference/apis/js-apis-app-ability-uiAbility.md#uiabilityonwindowstagecreate) callbacks are not.
    > 2. AbilityStage is not automatically generated in the default project of DevEco Studio. For details about how to create an AbilityStage file, see [AbilityStage Component Container](abilitystage.md).

en/application-dev/connectivity/http-request.md

@@ -30,7 +30,7 @@ The following table provides only a simple description of the related APIs. For
 | on\('dataProgress'\)<sup>10+</sup>        | Registers an observer for events indicating progress of receiving HTTP streaming responses. |
 | off\('dataProgress'\)<sup>10+</sup>       | Unregisters the observer for events indicating progress of receiving HTTP streaming responses.|
 
-## How to Develop
+## How to Develop request APIs
 
 1. Import the **http** namespace from **@ohos.net.http.d.ts**.
 2. Call **createHttp()** to create an **HttpRequest** object.
@@ -89,3 +89,80 @@ httpRequest.request(
     }
 );
 ```
+
+## How to Develop request2 APIs
+
+1. Import the **http** namespace from **@ohos.net.http.d.ts**.
+2. Call **createHttp()** to create an **HttpRequest** object.
+3. Depending on your need, call **on()** of the **HttpRequest** object to subscribe to HTTP response header events as well as events indicating receiving of HTTP streaming responses, progress of receiving HTTP streaming responses, and completion of receiving HTTP streaming responses.
+4. Call **request2()** to initiate a network request. You need to pass in the URL and optional parameters of the HTTP request.
+5. Parse the returned response code as needed.
+6. Call **off()** of the **HttpRequest** object to unsubscribe from the related events.
+7. Call **httpRequest.destroy()** to release resources after the request is processed.
+
+```js
+// Import the http namespace.
+import http from '@ohos.net.http'
+
+// Each httpRequest corresponds to an HTTP request task and cannot be reused.
+let httpRequest = http.createHttp();
+// Subscribe to HTTP response header events.
+httpRequest.on('headersReceive', (header) => {
+    console.info('header: ' + JSON.stringify(header));
+});
+// Subscribe to events indicating receiving of HTTP streaming responses.
+let res = '';
+httpRequest.on('dataReceive', (data) => {
+    res += data;
+    console.info('res: ' + res);
+});
+// Subscribe to events indicating completion of receiving HTTP streaming responses.
+httpRequest.on('dataEnd', () => {
+    console.info('No more data in response, data receive end');
+});
+// Subscribe to events indicating progress of receiving HTTP streaming responses.
+httpRequest.on('dataProgress', (data) => {
+    console.log("dataProgress receiveSize:" + data.receiveSize+ ", totalSize:" + data.totalSize);
+});
+
+httpRequest.request2(
+    // Customize EXAMPLE_URL in extraData on your own. It is up to you whether to add parameters to the URL.
+    "EXAMPLE_URL",
+    {
+        method: http.RequestMethod.POST, // Optional. The default value is http.RequestMethod.GET.
+        // You can add header fields based on service requirements.
+        header: {
+            'Content-Type': 'application/json'
+        },
+        // This field is used to transfer data when the POST request is used.
+        extraData: {
+            "data": "data to send",
+        },
+        expectDataType: http.HttpDataType.STRING, // Optional. This field specifies the type of the return data.
+        usingCache: true, // Optional. The default value is true.
+        priority: 1, // Optional. The default value is 1.
+        connectTimeout: 60000 // Optional. The default value is 60000, in ms.
+        readTimeout: 60000, // Optional. The default value is 60000, in ms. If a large amount of data needs to be transmitted, you are advised to set this parameter to a larger value to ensure normal data transmission.
+        usingProtocol: http.HttpProtocol.HTTP1_1, // Optional. The default protocol type is automatically specified by the system.
+    }, (err, data) => {
+            console.info('error:' + JSON.stringify(err));
+            console.info('ResponseCode :' + JSON.stringify(data));
+            // Unsubscribe from HTTP Response Header events.
+            httpRequest.off('headersReceive');
+            // Unregister the observer for events indicating receiving of HTTP streaming responses.
+            httpRequest.off('dataReceive');
+            // Unregister the observer for events indicating progress of receiving HTTP streaming responses.
+            httpRequest.off('dataProgress');
+            // Unregister the observer for events indicating completion of receiving HTTP streaming responses.
+            httpRequest.off('dataEnd');
+            // Call the destroy() method to release resources after HttpRequest is complete.
+            httpRequest.destroy();
+        }
+);
+
+```
+
+## Samples
+The following sample is provided to help you better understand how to develop the HTTP data request feature:
+- [HTTP Data Request (ArkTS) (API9)](https://gitee.com/openharmony/applications_app_samples/tree/master/code/BasicFeature/Connectivity/Http)
+- [HTTP Communication (ArkTS) (API9)](https://gitee.com/openharmony/codelabs/tree/master/NetworkManagement/SmartChatEtsOH)

en/application-dev/database/database-mdds-guidelines.md

@@ -169,7 +169,7 @@ The following uses a single KV store as an example to describe the development p
            console.log(`dataChange callback call data: ${data}`);
        });
    }catch(e){
-       console.error(`An unexpected error occured. Code is ${e.code}, message is ${e.message}`);
+       console.error(`An unexpected error occurred. Code is ${e.code}, message is ${e.message}`);
    }
    ```
 

en/application-dev/device/inputdevice-guidelines.md

@@ -29,7 +29,6 @@ When a user enters text, the input method determines whether to launch the virtu
 
 1. Call the **getDeviceList** API to obtain the list of connected input devices. Call the **getKeyboardType** API to traverse all connected devices to check whether a physical keyboard exists. If a physical keyboard exists, mark the physical keyboard as connected. This step ensures that your application detects all inserted input devices before listening for device hot swap events.
 2. Call the **on** API to listen for device hot swap events. If a physical keyboard is inserted, mark the physical keyboard as connected. If a physical keyboard is removed, mark the physical keyboard as disconnected.
-3. When a user enters text, check whether a physical keyboard is connected. If a physical keyboard is not connected, launch the virtual keyboard.
 
 
 ```js
@@ -65,6 +64,4 @@ try {
 } catch (error) {
   console.log(`Execute failed, error: ${JSON.stringify(error, [`code`, `message`])}`);
 }
-  // 3. Determine whether to launch the virtual keyboard based on the value of isPhysicalKeyboardExist.
-  // TODO
 ```

en/application-dev/dfx/apprecovery-guidelines.md

@@ -125,12 +125,12 @@ import AbilityConstant from '@ohos.app.ability.AbilityConstant';
 
 #### Actively Saving the Application State and Restoring Data
 
-- Define and register the [ErrorObserver](../reference/apis/js-apis-inner-application-errorObserver.md) callback. 
+- Define and register the [ErrorObserver](../reference/apis/js-apis-inner-application-errorObserver.md) callback. For details about its usage, see [errorManager](../reference/apis/js-apis-app-ability-errorManager.md).
 
 ```ts
   var registerId = -1;
   var callback = {
-      onUnhandledException: function (errMsg) {
+      onUnhandledException(errMsg) {
           console.log(errMsg);
           appRecovery.saveAppState();
           appRecovery.restartApp();
@@ -142,7 +142,7 @@ import AbilityConstant from '@ohos.app.ability.AbilityConstant';
       console.log("[Demo] EntryAbility onWindowStageCreate")
 
       globalThis.registerObserver = (() => {
-          registerId = errorManager.registerErrorObserver(callback);
+          registerId = errorManager.on('error', callback);
       })
 
       windowStage.loadContent("pages/index", null);
@@ -158,7 +158,7 @@ After the callback triggers **appRecovery.saveAppState()**, **onSaveState(state,
       // Ability has called to save app data
       console.log("[Demo] EntryAbility onSaveState")
       wantParams["myData"] = "my1234567";
-      return AbilityConstant.onSaveResult.ALL_AGREE;
+      return AbilityConstant.OnSaveResult.ALL_AGREE;
   }
 ```
 
@@ -188,8 +188,8 @@ onWindowStageDestroy() {
     console.log("[Demo] EntryAbility onWindowStageDestroy")
 
     globalThis.unRegisterObserver = (() => {
-        errorManager.unregisterErrorObserver(registerId, (result) => {
-            console.log("[Demo] result " + result.code + ";" + result.message)
+        errorManager.off('error', registerId, (err) => {
+            console.error("[Demo] err:", err);
         });
     })
 }
@@ -217,7 +217,7 @@ export default class EntryAbility extends Ability {
         // Ability has called to save app data
         console.log("[Demo] EntryAbility onSaveState")
         wantParams["myData"] = "my1234567";
-        return AbilityConstant.onSaveResult.ALL_AGREE;
+        return AbilityConstant.OnSaveResult.ALL_AGREE;
     }
 }
 ```

en/application-dev/dfx/hiappevent-guidelines.md

@@ -146,9 +146,3 @@ The following example illustrates how to log and subscribe to button click event
    HiAppEvent eventPkg.size=124
    HiAppEvent eventPkg.info={"domain_":"button","name_":"click","type_":4,"time_":1670268234523,"tz_":"+0800","pid_":3295,"tid_":3309,"click_time":100}
    ```
-
-## Samples
-
-The following sample is provided to help you better understand how to develop the application event logging feature:
-
-- [`JsDotTest`: Event Logging (JS) (API8)](https://gitee.com/openharmony/applications_app_samples/tree/master/DFX/JsDotTest)

en/application-dev/faqs/Readme-EN.md

@@ -18,5 +18,4 @@
 - [Native API Usage](faqs-native.md)
 - [Usage of Third- and Fourth-Party Libraries](faqs-third-party-library.md)
 - [IDE Usage](faqs-ide.md)
-- [hdc_std Command Usage](faqs-hdc-std.md)
 - [Development Board](faqs-development-board.md)
\ No newline at end of file

en/application-dev/faqs/faqs-bundle.md

@@ -14,7 +14,7 @@ Applicable to: OpenHarmony SDK 3.2.3.5, stage model of API version 9
 
 Obtain the bundle name through **context.abilityInfo.bundleName**.
 
-Reference: [AbilityContext](../reference/apis/js-apis-ability-context.md) and [AbilityInfo](../reference/apis/js-apis-bundle-AbilityInfo.md)
+Reference: [AbilityInfo](../reference/apis/js-apis-bundle-AbilityInfo.md)
 
 ## How do I obtain an application icon?
 

en/application-dev/faqs/faqs-hdc-std.md

-# hdc_std Command Usage
-
-## Common Log Commands
-
-Applicable to: OpenHarmony SDK 3.2.2.5
-
-Clearing logs: hdc_std shell hilog -r
-
-Increasing the buffer size to 20 MB: hdc_std shell hilog -G 20M
-
-Capturing logs: hdc_std shell hilog > log.txt
-
-## What should I do to avoid log flow control?
-
-Applicable to: OpenHarmony SDK 3.2.5.3, stage model of API version 9
-
-- Disabling log flow control: hdc_std shell hilog -Q pidoff
-
-- Disabling the privacy flag: hdc_std shell hilog -p off
-
-- Increasing the log buffer to 200 MB: hdc_std shell hilog -G 200M
-
-- Enabling the log function of the specific domain (that is, disabling the global log function): hdc_std shell hilog –b D –D  0xd0xxxxx
-
-After performing the preceding operations, restart the DevEco Studio.
-
-## What should I do if the HAP installed on the development board through the IDE cannot be opened?
-
-Applicable to: OpenHarmony SDK 3.2.5.3, stage model of API version 9
-
-Check whether the SDK version is consistent with the system version on the development board. You are advised to use the SDK version and system version that are released on the same day.
-
-## How do I upload files using the hdc command?
-
-Applicable to: OpenHarmony SDK 3.2.2.5
-
-Run the **hdc_std file send** command.
-
-## How do I prevent the screen of the RK3568 development board from turning off?
-
-Applicable to: OpenHarmony SDK 3.2.5.3, stage model of API version 9
-
-Run the **hdc_std shell "power-shell setmode 602"** command.
-
-## How do I start an ability using the hdc command?
-
-Applicable to: OpenHarmony SDK 3.2.5.3, stage model of API version 9
-
-Run the **hdc\_std shell aa start -a AbilityName -b bundleName -m moduleName** command.
-
-## How do I change the read and write permissions on a file directory on the development board?
-
-Applicable to: OpenHarmony SDK 3.2.5.6, stage model of API version 9
-
-Run the **hdc\_std shell mount -o remount,rw /** command.
-
-## What should I do if the error message "Unknown file option -r" is displayed when hdc_std file recv is run?
-
-Applicable to: OpenHarmony SDK 3.2.5.6, stage model of API version 9
-
-1. Use the the hdc tool in the device image or SDK of the same version.
-
-2. Remove any Chinese characters or spaces from the directory specified for the hdc tool.
-
-## How do I uninstall an application using the hdc command?
-
-Applicable to: OpenHarmony SDK 3.2.2.5
-
-Run the **hdc\_std uninstall [-k] [package_name]** command.
-
-## How do I check whether the system is 32-bit or 64-bit?
-
-Applicable to: OpenHarmony SDK 3.2.5.5
-
-Run the **hdc\_std shell getconf LONG_BIT** command.
-
-If **64** is returned, the system is a 64-bit one. Otherwise, the system is a 32-bit one.
-
-## How do I view the component tree structure?
-
-Applicable to: OpenHarmony SDK 3.2.5.5
-
-1. Run the **hdc\_std shell** command to launch the CLI.
-
-2. Run the **aa dump -a** command to find **abilityID**.
-
-3. Run the **aa dump -i [abilityID] -c -render** command to view the component tree.

en/application-dev/faqs/faqs-language.md

@@ -251,7 +251,6 @@ Applicable to: OpenHarmony SDK 3.2.5.5, stage model of API version 9
 
 To listen for in-depth changes of **@State** decorated variables, you can use **@Observed** and **@ObjectLink** decorators.
 
-Reference: [@Observed and @ObjectLink](../quick-start/arkts-state-mgmt-page-level.md#observed-and-objectlink)
 
 ## How do I implement character string encoding and decoding?
 

en/application-dev/faqs/faqs-web-arkts.md

@@ -76,4 +76,4 @@ Applicable to: OpenHarmony SDK 3.2.7.5, stage model of API version 9
 
 4. Use message port 0 on the application side to send messages to message port 1 on the HTML side.
 
-Reference: [Web](../reference/arkui-ts/ts-basic-components-web.md#postmessage9)
+Reference: [Web](../reference/arkui-ts/ts-basic-components-web.md)

en/application-dev/file-management/medialibrary-resource-guidelines.md

@@ -147,7 +147,7 @@ async function example() {
 ## Obtaining Images and Videos in an Album
 
 You can obtain media assets in an album in either of the following ways:
-- Call [MediaLibrary.getFileAssets](../reference/apis/js-apis-medialibrary.md#getfileassets7-1) with an album specified, as described in [Querying Media Assets with the Specfied Album Name](#querying-media-assets-with-the-specified-album-name).
+- Call [MediaLibrary.getFileAssets](../reference/apis/js-apis-medialibrary.md#getfileassets7-1) with an album specified, as described in [Querying Media Assets with the Specified Album Name](#querying-media-assets-with-the-specified-album-name).
 - Call [Album.getFileAssets](../reference/apis/js-apis-medialibrary.md#getfileassets7-3) to obtain an **Album** instance, so as to obtain the media assets in it.
 
 **Prerequisites**

en/application-dev/media/avrecorder.md

@@ -480,9 +480,3 @@ export class VideoRecorderDemo {
   }
 }
 ```
-
-### AVRecorder App
-
-The AVRecorder app provides a complete audio and video recording process, which includes creating an instance, setting recording parameters, obtaining the input surface, starting, pausing, resuming, and stopping recording, and releasing resources.
-
-For details about the code, see [AVRecorderDemo]([multimedia_player_framework: Implementation of media playback and recording](https://gitee.com/openharmony/multimedia_player_framework/tree/master/test/appdemo/AVRecorderDemo)).

en/application-dev/napi/Readme-EN.md

 # Native APIs
+Native APIs are a set of native development interfaces and tools provided by the OHOS SDK. It enables the use of C or C++ code to implement key application functionalities. Native APIs provide part of basic underlying capabilities of OHOS, such as libc, graphics library, window system, multimedia, and compression library. They do not provide complete OHOS platform capabilities as JS APIs do. Native APIs are compiled into a dynamic library before being packed into the application.
 
+## Native API Composition
+
+### Native API Directory Structure
+
+Native APIs are stored in the **$(SDK_ROOT)/native** directory of the SDK. They consist of the following parts:
+
+|Directory|Description|
+|--|--|
+|build|Used to build the toolchain.cmake script of the dynamic library in the application. The **ohos.toolchain.cmake** file in this directory defines OHOS cross compilation options.|
+|build-tools|Stores build tools, such as CMake.|
+|docs|Stores Native API reference documents, which is extracted from the header files using Doxgen.|
+|llvm|Stores LLVM, a cross compiler that supports OHOS ABIs.|
+|sysroot|Stores dependent files of build links, including header files and dynamic libraries.|
+
+### Native APIs
+
+|Category|Function|Introduced In|
+|--|--|--|
+|C standard library|C standard library interfaces based on musl. Currently, more than 1500 interfaces are provided.|API version 8|
+|C++ standard library|C++ runtime library libc++_shared. This library must be packed or statically linked to the application during packing.|API version 8|
+|Log|HiLog interfaces for printing logs to the system|API version 8|
+|napi|A group of Node-APIs provided by ArkUI to facilitate access to the JS application environment during application development. Node-APIs are part of native APIs.|API version 8|
+|XComponent|Provides surface and touchscreen event interfaces for developing high-performance graphics applications.|API version 8|
+|libuv|Third-party asynchronous I/O library integrated by ArkUI.|API version 8|
+|libz|zlib library that provides basic compression and decompression interfaces.|API version 8|
+|Drawing|2D graphics library that can be used for drawing on the surface.|API version 8|
+|OpenGL|OpenGL 3.0 interfaces.|API version 8|
+|Rawfile|Application resource access interfaces that can be used to read various resources packed in the application.|API version 8|
+|OpenSLES|Interface library used for 2D and 3D audio acceleration.|API version 8|
+|Mindspore|AI model interface library.|API version 9|
+|Bundle management|Bundle service interfaces that can be used to query bundle information of the application.|API version 8|
+
+Some native APIs use open source standards. For details, see [Native Standard Libraries Supported by OpenHarmony](https://docs.openharmony.cn/pages/v3.1/en/application-dev/reference/native-lib/third_party_libc/musl.md/) and [Node_API](https://docs.openharmony.cn/pages/v3.1/en/application-dev/reference/native-lib/third_party_napi/napi.md/).
+
+## Usage Guidelines
+
+### Scenarios Where Native APIs Are Recommended
+
+You can use native APIs when you want to:
+
+1. Develop performance-sensitive code in computing-intensive scenarios such as gaming and physical simulation.
+2. Reuse the existing C or C++ library.
+3. Customize libraries related to CPU features, such as neon acceleration.
+
+### Scenarios Where Native APIs Are Not Recommended
+
+You do not need to use native APIs when you want to:
+
+1. Write a native OHOS application.
+2. Develop an application compatible on as many OHOS devices as possible.
+
+# Native API References
+
+- [Native API hello world]()
+  
+  This sample shows how to develop a hello native API library, which can display strings obtained from the hello library on the TS page.
 - [Using Native APIs in Application Projects](napi-guidelines.md)
+  
+  This document describes how to use native APIs to interact with modules, interfaces, and asynchronous tasks in JS.
 - [Drawing Development](drawing-guidelines.md)
 - [Raw File Development](rawfile-guidelines.md)
 - [Native Window Development](native-window-guidelines.md)

en/application-dev/napi/neural-network-runtime-guidelines.md

@@ -244,7 +244,7 @@ The development process of the Neural Network Runtime consists of three phases:
         // Create a compilation instance to pass the model to the underlying hardware for compilation.
         OH_NNCompilation* compilation = OH_NNCompilation_Construct(model);
         if (compilation == nullptr) {
-            std::cout << "CreateCompilation failed, error happended when creating compilation." << std::endl;
+            std::cout << "CreateCompilation failed, error happened when creating compilation." << std::endl;
             return OH_NN_MEMORY_ERROR;
         }
 

en/application-dev/notification/progress-bar-notification.md

@@ -3,7 +3,7 @@
 
 The progress notification is a commonly used notification type, mainly used to display the progress of an ongoing operation, such as file downloading. When publishing a progress notification through the notification subsystem, you can use the readily available template by specifying the related attributes, such as the template name and template data.
 
-In the [NotificationTemplate](../reference/apis/js-apis-notificationManager.md#notificationtemplate), which can only be of the progress type, **data** indicates custom template data.
+In the [NotificationTemplate](../reference/apis/js-apis-inner-notification-notificationTemplate.md), which can only be of the progress type, **data** indicates custom template data.
 
 ## Available APIs
 

en/application-dev/quick-start/app-configuration-file.md

@@ -19,7 +19,9 @@ This document gives an overview of the **app.json5** configuration file. To star
     "debug": false,
     "car": {
       "minAPIVersion": 8,
-    }
+    },
+    "targetBundleName": "com.application.test",
+    "targetPriority": 50
   },
 }
 ```
@@ -28,11 +30,12 @@ This document gives an overview of the **app.json5** configuration file. To star
 As shown above, the **app.json5** file contains several tags.
 
 
-**Table 1** Tags in the app.json5 file
+  **Table 1** Tags in the app.json5 file
 
 | Name| Description| Data Type| Initial Value Allowed|
 | -------- | -------- | -------- | -------- |
 | bundleName | Bundle name, which uniquely identifies an application.  The value must comply with the following rules:<br>- Consists of letters, digits, underscores (_), and periods (.).<br>- Starts with a letter.<br>- Contains 7 to 127 bytes.<br>You are advised to use the reverse domain name notation, for example, *com.example.demo*, where the first part is the domain suffix **com**, the second part is the vendor/individual name, and the third part is the application name, which can be of multiple levels.<br>If an application is built with the system source code, you are advised to name it in *com.ohos.demo* notation, where **ohos** signifies that the application is an OpenHarmony system application.| String| No|
+| bundleType| Bundle type, which is used to distinguish applications and atomic services.<br>- **app**: The bundle is a common application.<br>- **atomicService**: The bundle is an atomic service.<br>- **shared**: The bundle is a shared object application. | String| Yes (initial value: **"app"**)|
 | debug | Whether the application can be debugged. This tag is generated during compilation and building in DevEco Studio.<br>- **true**: The application can be debugged.<br>- **false**: The application cannot be debugged.| Boolean| Yes (initial value: **false**)|
 | icon | [Icon of the application](../application-models/application-component-configuration-stage.md). The value is an icon resource index.| String| No|
 | label | [Name of the application](../application-models/application-component-configuration-stage.md). The value is a string resource index.| String| No|
@@ -51,3 +54,5 @@ As shown above, the **app.json5** file contains several tags.
 | wearable | Wearable-specific configuration, which includes **minAPIVersion** and **distributedNotificationEnabled** attributes.<br>When running on wearables, the application applies the attribute settings under this tag and ignores the general counterparts.| Object| Yes (initial value: general settings in the **app.json5** file)|
 | car | Head unit–specific configuration, which includes **minAPIVersion** and **distributedNotificationEnabled** attributes.<br>When running on head units, the application applies the attribute settings under this tag and ignores the general counterparts.| Object| Yes (initial value: general settings in the **app.json5** file)|
 | default | Default device–specific configuration, which includes **minAPIVersion** and **distributedNotificationEnabled** attributes.<br>When running on default devices, the application applies the attribute settings under this tag and ignores the general counterparts.| Object| Yes (initial value: general settings in the **app.json5** file)|
+|targetBundleName|Target application name of the bundle. The value rule and range are the same as those of **bundleName**.|String|Yes (if the initial value is used, the target application is not an application with the overlay feature)|
+|targetPriority|Priority of the application. When **targetBundleName** is set, the application is an application with the overlay feature. The value ranges from 1 to 100.|Number|Yes (initial value: **1**)|

en/application-dev/quick-start/application-package-structure-fa.md

@@ -11,7 +11,7 @@ The difference between the application package structures in the FA model and st
 
 - The **assets** folder is a collection of all the resource files, library files, and code files in a HAP file. It can be further organized into the **entry** folder and the **js** folder. The **entry** folder stores the **resources** folder and the **resources.index** file.
 
-- The **resources** folder stores resource files (such as strings and images) of the application.
+- The **resources** folder stores resource files (such as strings and images) of the application. For details, see [Resource Categories and Access](resource-categories-and-access.md).
 
 - The **resources.index** file provides a resource index table, which is generated by DevEco Studio invoking the specific SDK tool.
 

en/application-dev/quick-start/application-package-structure-stage.md

@@ -22,7 +22,7 @@ To develop an application based on the [stage model](application-configuration-f
 - The HAP file includes folders such as **ets**, **libs**, and **resources** and files such as **resources.index**, **module.json**, and **pack.info**.
   - The **ets** folder stores bytecode files generated after application code build.
   - The **libs** folder stores library files, which are .so binary files that contain third-party code on which the OpenHarmony application depends.
-  - The **resources** folder stores resource files (such as strings and images) of the application.
+  - The **resources** folder stores resource files (such as strings and images) of the application. For details, see [Resource Categories and Access](resource-categories-and-access.md).
   - The **resources.index** file provides a resource index table, which is generated when the application project is built in DevEco Studio.
   - The **module.json** file is the configuration file indispensable in a HAP file. It consists of **module.json5** and **app.json5** in the project configuration. While DevEco Studio provides default configuration, you must modify the configuration as needed. For details about the configuration fields, see [Application Configuration Files in Stage Model](application-configuration-file-overview-stage.md).
   - The **pack.info** file describes the HAP attributes in the bundle, for example, **bundleName** and **versionCode** in **app** and **name**, **type**, and **abilities** in **module**. The file is automatically generated when DevEco Studio generates the bundle.

en/application-dev/quick-start/arkts-restrictions-and-extensions.md

@@ -232,3 +232,26 @@ struct Child {
   }
 }
 ```
+
+## Restrictions on Naming Custom Components, Classes, and Functions
+
+The name of a custom component, class, or function cannot be the same as any system component name.
+
+Example:
+
+```
+// Rect.ets
+export class Rect {
+  constructor(){}
+}
+// Index.ets
+// ERROR: The module name 'Rect' can not be the same as the inner component name.
+import { Rect } from './Rect';
+@Entry
+@Component
+struct Index {
+  build() {
+    
+  }
+}
+```

en/application-dev/quick-start/atomicService.md

+# Atomic Service
+
+## Pre-loading by HAP Type
+
+### HAP File Implementation
+
+To speed up the initial startup of an atomic service, you can configure it to load on demand with the use of HAP files. HAP files of an atomic service are classified as entry-type or feature-type. The entry-type HAP file contains the page code and related resources required for starting up the atomic service. The feature-type HAP files contain the rest of the code and resources. To start the atomic service, the user only needs to download and install the entry-type HAP file, which minimizes the time for downloading the atomic service.
+
+#### How to Use
+
+You create HAP files of an atomic service by creating an atomic service project in DevEco Studio. The basic project directory structure is as follows:
+
+```
+├── AppScope
+|    ├── resources
+|    └── app.json5
+├── entry
+|    └── src/main
+|       ├── ets
+|       ├── resources
+|       └── module.json5
+├── feature
+|    └── src/main
+|       ├── ets
+|       ├── resources
+|       └── module.json5
+├── library
+|    └── src/main
+|       ├── ets
+|       ├── resources
+|       └── module.json5
+├── node_modules
+```
+
+Note that you must set the **bundleType** field to **atomicService** in the [app.json5](app-configuration-file.md) file, which is located in the **AppScope** folder. The following is an example of the file content:
+
+```json
+{
+  "app": {
+    "bundleName": "com.example.hmservice",
+    "bundleType":"atomicService",
+    "vendor": "example",
+    "versionCode": 1000000,
+    "versionName": "1.0.0",
+    "icon": "$media:app_icon",
+    "label": "$string:app_name",
+    "distributedNotificationEnabled": true,
+    "targetAPIVersion": 9
+  }
+}
+```
+
+For details about HAP files, see [Multi-HAP Design Objectives](multi-hap-objective.md).
+
+#### Restrictions
+
+1. The **installationFree** field must be set to **true** in each module-specific configuration file [module.json5](module-configuration-file.md) file.
+
+2. When packaging an atomic service, comply with the following size rules:
+
+- The total size of HAP files cannot exceed 10 MB.
+
+- The size of a HAP file itself and all its dependent [HSP](in-app-hsp.md) cannot exceed 2 MB.
+
+
+### Pre-loading Implementation
+
+You can configure the system to automatically pre-download required modules when the atomic service enters a module, thereby speeding up module access.
+
+Currently, pre-loading can be implemented only through configuration, not by invoking APIs.
+
+#### How to Use
+
+Pre-loading is triggered after the first frame of the newly accessed module is rendered. You can configure what to pre-load for a module, by setting the **preloads** field under **atomicService** in the [module.json5](module-configuration-file.md) file of the module. The following is an example of the **module.json5** file of the **entry** module, saved in **entry/src/main**:
+
+```json
+{
+  "module": {
+    "name": "entry",
+    "type": "entry",
+    "srcEntrance": "./ets/Application/MyAbilityStage.ts",
+    "description": "$string:entry_desc",
+    "mainElement": "MainAbility",
+    "deviceTypes": [
+      "default",
+      "tablet"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": true,
+    "pages": "$profile:main_pages",
+    "atomicService": {
+      "preloads": [
+        {
+          "moduleName": "feature"
+        }
+      ]
+    },
+    "abilities": [
+      {
+        "name": "MainAbility",
+        "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+        "description": "$string:MainAbility_desc",
+        "icon": "$media:icon",
+        "label": "$string:MainAbility_label",
+        "startWindowIcon": "$media:icon",
+        "startWindowBackground": "$color:white",
+        "visible": true,
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+In this example, the system automatically pre-loads the **feature** module after the first frame of the **entry** module is rendered.
+
+#### Restrictions
+
+[moduleType](../reference/apis/js-apis-bundleManager.md#moduletype) corresponding to moduleName in the **preloads** list cannot be entry.
+
+## Using Dynamic Shared Packages in Atomic Services
+
+A [Harmony Shared Package (HSP)](shared-guide.md) is a dynamic shared package for sharing code, C++ libraries, resources, and configuration files among modules.
+For details about how to use the HSP within an atomic service, see [In-Application HSP Development](in-app-hsp.md).
+
+#### How to Use
+
+Assume that the project directory structure is as follows:
+```
+├── AppScope
+|    ├── resources
+|    └── app.json5
+├── entry
+|    └── src/main
+|       ├── ets
+|           ├── entryAbility
+|           └── pages
+|               └── Index.ets
+|       ├── resources
+|       └── module.json5
+├── feature
+|    └── src/main
+|       ├── ets
+|       ├── resources
+|       └── module.json5
+├── library
+|    └── src/main
+|       ├── ets
+|           └── pages
+|               └── menu.ets
+|       ├── resources
+|       └── module.json5
+├── node_modules
+```
+
+If you want to add a button in the **entry** module to jump to the menu page (**library/src/main/ets/pages/menu.ets**) in the **library** module, you can write the following code in the **entry/src/main/ets/MainAbility/Index.ets** file of the **entry** module:
+
+```ts
+import router from '@ohos.router';
+
+@Entry
+@Component
+struct Index {
+    @State message: string = 'Hello World'
+
+    build() {
+    Row() {
+        Column() {
+        Text(this.message)
+            .fontSize(50)
+            .fontWeight(FontWeight.Bold)
+        // Add a button to respond to user clicks.
+        Button() {
+            Text('click to menu')
+            .fontSize(30)
+            .fontWeight(FontWeight.Bold)
+        }
+        .type(ButtonType.Capsule)
+        .margin({
+            top: 20
+        })
+        .backgroundColor('#0D9FFB')
+        .width('40%')
+        .height('5%')
+        // Bind click events.
+        .onClick(() => {
+            router.pushUrl({
+              url: '@bundle:com.example.hmservice/library/ets/pages/menu'
+            }).then(() => {
+              console.log("push page success");
+            }).catch(err => {
+              console.error(`pushUrl failed, code is ${err.code}, message is ${err.message}`);
+            })
+        }
+        .width('100%')
+    }
+    .height('100%')
+    }
+}
+```
+
+The input parameter **url** of the **router.pushUrl** API is as follows:
+```ets
+'@bundle:com.example.hmservice/library/ets/pages/menu'
+```
+The **url** content template is as follows:
+```ets
+'@bundle:bundle name/module name/path/page file name (without the extension .ets)'
+```

en/application-dev/quick-start/full-sdk-compile-guide.md

@@ -26,4 +26,4 @@ If the compilation is successful, export the files in the **out/sdk/packages/oho
 
 ## Replacing the SDK
 
-After the full SDK is compiled, switch to it in DevEco Studio. For details, see [Guide to Switching to Full SDK](../../application-dev/quick-start/full-sdk-switch-guide.md).
+After the full SDK is compiled, switch to it in DevEco Studio. For details, see [Guide to Switching to Full SDK](full-sdk-switch-guide.md).

en/application-dev/quick-start/module-structure.md

@@ -192,12 +192,20 @@ Example of the metadata attribute:
 
 **By default, application icons cannot be hidden from the home screen in OpenHarmony.**
 
-The OpenHarmony system imposes a strict rule on the presence of application icons. If no icon is configured in the HAP file of an application, the system creates a default icon for the application and displays it on the home screen.<br>
-Touching this icon will direct the user to the application details screen in **Settings**.
+The OpenHarmony system imposes a strict rule on the presence of application icons. If no icon is configured in the HAP file of an application, the system creates a default icon for the application and displays it on the home screen.
+
+Touching this icon will direct the user to the application details screen in **Settings**, as shown in Figure 1.
+
 To hide an application icon from the home screen, you must configure the **AllowAppDesktopIconHide** privilege. For details, see [Application Privilege Configuration Guide](../../device-dev/subsystems/subsys-app-privilege-config-guide.md).
 
+**Objectives**:
+
+This requirement on application icons is intended to prevent malicious applications from deliberately configuring no icon to block uninstallation attempts.
+
+**Setting the application icon to be displayed on the home screen**:
+
+Set **icon**, **label**, and **skills** under **abilities** in the **config.json** file. In addition, make sure the **skills** configuration contains **ohos.want.action.home** and **entity.system.home**.
 
-**Setting the application icon to be displayed on the home screen**:<br>Set **icon**, **label**, and **skills** under **abilities** in the **config.json** file. In addition, make sure the **skills** configuration contains **ohos.want.action.home** and **entity.system.home**.
 ```
 {
   "module":{
@@ -220,36 +228,37 @@ To hide an application icon from the home screen, you must configure the **Allow
 }
 ```
 
-**Querying an application icon:**
+**Display rules of application icons and labels on the home screen:**
 * The HAP file contains Page ability configuration.
-  * The application icon is set under **abilities** in the **config.json** file.
+  * The application icon on the home screen is set under **abilities** in the **config.json** file.
     * The application does not have the privilege to hide its icon from the home screen.
-      * The returned home screen icon is the icon configured for the ability.
-      * The returned home screen label is the label configured for the ability. If no label is configured, the bundle name is returned.
-      * The returned component name is the component name of the ability.
-      * When the user touches the home screen icon, the home screen of the ability is displayed.
+      * The application icon displayed on the home screen is the icon configured for the Page ability.
+      * The application label displayed on the home screen is the label configured for the Page ability. If no label is configured, the bundle name is returned.
+      * The name of the Page ability is displayed.
+      * When the user touches the home screen icon, the home screen of the Page ability is displayed.
     * The application has the privilege to hide its icon from the home screen.
       * The information about the application is not returned during home screen information query, and the icon of the application is not displayed on the home screen.
-  * The application icon is not set under **abilities** in the **config.json** file.
+  * The application icon on the home screen is not set under **abilities** in the **config.json** file.
     * The application does not have the privilege to hide its icon from the home screen.
-      * The returned home screen icon is the default icon.
-      *The returned home screen label is the bundle name of the application.
-      * The returned component name is the component name displayed on the application details screen (this component is built in the system).
-      * Touching the home screen icon will direct the user to the application details screen.
+      * The application icon displayed on the home screen is the default icon.
+      * The application label displayed on the home screen is the bundle name of the application.
+      * Touching the application icon on the home screen will direct the user to the application details screen shown in Figure 1.
     * The application has the privilege to hide its icon from the home screen.
       * The information about the application is not returned during home screen information query, and the icon of the application is not displayed on the home screen.
 * The HAP file does not contain Page ability configuration.
   * The application does not have the privilege to hide its icon from the home screen.
-    * The returned home screen icon is the default icon.
-    *The returned home screen label is the bundle name of the application.
-    * The returned component name is the component name displayed on the application details screen (this component is built in the system).
-    * Touching the home screen icon will direct the user to the application details screen.
+    * The application icon displayed on the home screen is the default icon.
+    * The application label displayed on the home screen is the bundle name of the application.
+    * Touching the application icon on the home screen will direct the user to the application details screen shown in Figure 1.
   * The application has the privilege to hide its icon from the home screen.
     * The information about the application is not returned during home screen information query, and the icon of the application is not displayed on the home screen.
 
-> **NOTE**
-> 
-> The icon and label displayed on the application details page may be different from those displayed on the home screen. For non-Page abilities, they are the entry icon and label set under **abilities**, if any.
+Note: The label displayed on the application details screen may be different from that displayed on the home screen. For non-Page abilities, it is the entry label set (if any).<br><br>
+
+**Figure 1** Application details screen
+
+![Application details screen](figures/application_details.jpg)
+
 
 **Table 8** Internal structure of the abilities attribute
 
@@ -412,39 +421,6 @@ Example of the **skills** attribute structure:
 ]
 ```
 
-**Enhanced implicit query**
-
-URI-level prefix matching is supported.
-
-When only **scheme** or a combination of **scheme** and **host** or **scheme**, **host**, and **port** are configured in the configuration file, the configuration is successful if a URI prefixed with the configuration file is passed in.
-
-  * The query enhancement involves the following APIs:<br>
-    [@ohos.bundle.bundleManager](../reference/apis/js-apis-bundleManager.md#bundlemanagerqueryabilityinfo)<br>
-    1. function queryAbilityInfo(want: Want, abilityFlags: number, callback: AsyncCallback<Array\<AbilityInfo>>): void;<br>
-    2. function queryAbilityInfo(want: Want, abilityFlags: number, userId: number, callback: AsyncCallback<Array\<AbilityInfo>>): void;<br>
-    3. function queryAbilityInfo(want: Want, abilityFlags: number, userId?: number): Promise<Array\<AbilityInfo>>;
-  * Configuration requirements<br>
-    abilities -> skills -> uris object<br>
-    Configuration 1: only **scheme = 'http'**
-    Configuration 2: only **(scheme = 'http') + (host = 'www.example.com')**
-    Configuration 3: only **(scheme = 'http') + (host = 'www.example.com') + (port = '8080')**
-  * Prefix match<br>
-    If the value of **uri** under [want](../application-models/want-overview.md) is obtained by calling the **queryAbilityInfo** API:<br>
-    1. uri = 'https://': No matches<br>
-    2. uri = 'http://': Matches configuration 1<br>
-    3. uri = 'https://www.example.com': No matches<br>
-    4. uri = 'https://www.exa.com': No matches<br>
-    5. uri = 'http://www.exa.com': Matches configuration 1<br>
-    6. uri = 'http://www.example.com': Matches configuration 1 and configuration 2<br>
-    7. uri = 'https://www.example.com:8080': No matches<br>
-    8. uri = 'http://www.exampleaa.com:8080': Matches configuration 1<br>
-    9. uri = 'http://www.example.com:9180': Matches configuration 1 and configuration 2<br>
-    10. uri = 'http://www.example.com:8080': Matches configuration 1, configuration 2, and configuration 3<br>
-    11. uri = 'https://www.example.com:9180/query/student/name' : No matches<br>
-    12. uri = 'http://www.exampleap.com:8080/query/student/name': Matches configuration 1<br>
-    13. uri = 'http://www.example.com:9180/query/student/name': Matches configuration 1 and configuration 2<br>
-    14. uri = 'http://www.example.com:8080/query/student/name': Matches configuration 1, configuration 2, and configuration 3<br>
-
 ## Internal Structure of the reqPermissions Attribute
 
 **Table 12** Internal structure of the reqPermissions attribute

en/application-dev/quick-start/multi-hap-objective.md

 # Multi-HAP Design Objectives
 
 
-- Modular management: A well-designed application is generally managed in a modular manner, where modules are loosely coupled. In light of this, the multi-HAP mechanism is designed, allowing you to divide services into multiple modules and store each module in an independent HAP file. For example, If you are developing a payment application and its home screen consists of multiple modules, such as the scan, pay, messaging, and finance modules, you can implement the logic of the home screen for managing other modules in the entry-type HAP file, and implement specific modules in feature-type HAP files. The feature-type HAP files are independent. You can develop and test each of them separately, and then integrate them with the entry-type HAP file.
+- Modular management: A well-designed application is generally managed in a modular manner, where modules are loosely coupled. In light of this, the multi-HAP mechanism is designed, allowing you to divide services into multiple modules and store each module in an independent HAP file. For example, if you are developing a payment application whose home screen consists of multiple modules, such as the scan, pay, messaging, and finance modules, you can implement the HAP files as follows: (1) In the entry-type HAP file, implement the home screen logic for managing modules; (2) in feature-type HAP files, implement specific modules. The feature-type HAP files are independent of each other. You can develop and test each of them separately, and then integrate them with the entry-type HAP file.
 
-- Flexible deployment: You can combine multiple HAP files and deploy them on different devices. Assume that an application contains one entry-type HAP file (**Entry.hap**) and two feature-type HAP files (**Feature1.hap** and **Feature2.hap**). The **Entry.hap** file can be deployed on device A and device B, the **Feature1.hap** file can be deployed only on device A, and the **Feature2.hap** can be deployed only on device B. In this way, you can easily combine the **Entry.hap** and **Feature1.hap** files and deploy them on device A, and combine the **Entry.hap** and **Feature2.hap** files and deploy them on device B.
+- Flexible deployment: You can flexibly combine HAP files for device-specific deployment. Assume that an application contains one entry-type HAP file (**entry.hap**) and two feature-type HAP files (**Feature1.hap** and **Feature2.hap**). The **Entry.hap** file can be deployed on device A and device B, the **Feature1.hap** file can be deployed only on device A, and the **Feature2.hap** can be deployed only on device B. This means that you can combine the **Entry.hap** and **Feature1.hap** files and deploy them on device A, and combine the **Entry.hap** and **Feature2.hap** files and deploy them on device B.
 
-- On-demand loading: You can load modules only when they are needed, reducing the package size. Specifically, you can configure some HAP files of an application to be loaded on demand. For example, if some features are not used during application startup, you can configure them to be loaded only when they are needed, rather than being loaded at startup. This can reduce the size of the application package to some extent.
+- On-demand loading: You can load modules only when they are needed, reducing the package size. Specifically, you can configure some HAP files of your application to be loaded on demand. For example, if some features are not used during application startup, you can configure them to be loaded only when they are needed, rather than being loaded at startup. This can reduce the size of the application package to some extent.
 
-- Easier resource sharing: The resources (including public resource files and public pages) and shared objects (.so library files) required by multiple HAP files can be stored in an independent HAP file. In this way, other HAP files can obtain the resources and files by accessing the HAP, which reduces the size of the application package to some extent.
+- Easier resource sharing: The resources (including public resource files and public pages) and shared objects (.so library files) required by multiple HAP files can be stored in an independent HAP file. In this way, other HAP files can obtain the resources and files by accessing the HAP, which also reduces the size of the application package to some extent.

en/application-dev/reference/apis/Readme-EN.md

@@ -228,18 +228,19 @@
   - [@ohos.data.dataShareResultSet (DataShare Result Set)](js-apis-data-DataShareResultSet.md)
   - [@ohos.data.distributedDataObject (Distributed Data Object)](js-apis-data-distributedobject.md)
   - [@ohos.data.distributedKVStore (Distributed KV Store)](js-apis-distributedKVStore.md) 
-  - [@ohos.data.preferences (Preferences)](js-apis-data-preferences.md)
+  - [@ohos.data.preferences (User Preferences)](js-apis-data-preferences.md)
   - [@ohos.data.relationalStore (RDB Store)](js-apis-data-relationalStore.md)
   - [@ohos.data.ValuesBucket (Value Bucket)](js-apis-data-valuesBucket.md)
 
 - File Management
+  - [@ohos.file.cloudSyncManager (Device-Cloud Synchronization Management)](js-apis-file-cloudsyncmanager.md)
   - [@ohos.file.environment (Directory Environment Capability)](js-apis-file-environment.md)
   - [@ohos.file.fileAccess (User File Access and Management)](js-apis-fileAccess.md)
   - [@ohos.file.fileExtensionInfo (User File Extension Information)](js-apis-fileExtensionInfo.md)
   - [@ohos.file.fileUri (File URI)](js-apis-file-fileUri.md)
   - [@ohos.file.fs (File Management)](js-apis-file-fs.md)
   - [@ohos.file.hash (File Hash Processing)](js-apis-file-hash.md)
-  - [@ohos.file.picker (Picker)](js-apis-file-picker.md)
+  - [@ohos.file.picker (File Picker)](js-apis-file-picker.md)
   - [@ohos.file.securityLabel (Data Label)](js-apis-file-securityLabel.md)
   - [@ohos.file.statvfs (File System Space Statistics)](js-apis-file-statvfs.md)
   - [@ohos.file.storageStatistics (Application Storage Statistics)](js-apis-file-storage-statistics.md)
@@ -265,9 +266,10 @@
   - [@ohos.net.socket (Socket Connection)](js-apis-socket.md)
   - [@ohos.net.webSocket (WebSocket Connection)](js-apis-webSocket.md)
   - [@ohos.request (Upload and Download)](js-apis-request.md)
+  - [@ohos.net.mdns (mDNS Management)](js-apis-net-mdns.md)
 
 - Connectivity
-  - [@ohos.bluetooth (Bluetooth) (To Be Deprecated Soon)](js-apis-bluetooth.md)
+  - [@ohos.bluetooth (Bluetooth)(To Be Deprecated Soon)](js-apis-bluetooth.md)
   - [@ohos.bluetoothManager (Bluetooth)(js-apis-bluetoothManager.md)
   - [@ohos.connectedTag (Active Tags)](js-apis-connectedTag.md)
   - [@ohos.nfc.cardEmulation (Standard NFC Card Emulation)](js-apis-cardEmulation.md)
@@ -276,8 +278,8 @@
   - [@ohos.rpc (RPC)](js-apis-rpc.md)
   - [@ohos.wifiManager (WLAN)](js-apis-wifiManager.md)
   - [@ohos.wifiManagerExt (WLAN Extension)](js-apis-wifiManagerExt.md)
-  - [@ohos.wifi (To Be Deprecated Soon)](js-apis-wifi.md)
-  - [@ohos.wifiext (To Be Deprecated Soon)](js-apis-wifiext.md)
+  - [@ohos.wifi (WLAN)(To Be Deprecated Soon)](js-apis-wifi.md)
+  - [@ohos.wifiext (WLAN Extension)(To Be Deprecated Soon)](js-apis-wifiext.md)
   - tag
     - [nfctech (Standard NFC Technologies)](js-apis-nfctech.md)
     - [tagSession (Standard NFC Tag Session)](js-apis-tagSession.md)
@@ -411,7 +413,6 @@
   - [@ohos.systemParameter (System Parameter)](js-apis-system-parameter.md)
   - [@ohos.systemTime (System Time and Time Zone)](js-apis-system-time.md)
   - [@ohos.usb (USB Management)](js-apis-usb-deprecated.md)
-  - [@ohos.usbV9 (USB Management)](js-apis-usb.md)
   - [@system.app (Application Context)](js-apis-system-app.md)
   - [@system.battery (Battery Information)](js-apis-system-battery.md)
   - [@system.bluetooth (Bluetooth)](js-apis-system-bluetooth.md)

en/application-dev/reference/apis/commonEventManager-definitions.md

@@ -65,11 +65,13 @@ Indicates that the device's thermal level has changed.
 - Required subscriber permissions: none
 
 
-## COMMON_EVENT_USER_PRESENT
+## COMMON_EVENT_USER_PRESENT<sup>(deprecated)</sup>
 (Reserved, not supported yet) Indicates that the user unlocks the device.
 - Value: **usual.event.USER_PRESENT**
 - Required subscriber permissions: none
-
+> NOTE
+>
+> This API is deprecated since API version 10.
 
 ## COMMON_EVENT_TIME_TICK
 Indicates that the system time has changed as time ticks by.
@@ -929,3 +931,116 @@ Indicates the result of applying a quick fix to the application.
 Indicates that the HTTP proxy configuration has changed.
 - Value: **usual.event.HTTP_PROXY_CHANGE**
 - Required subscriber permissions: none
+
+## COMMON_EVENT_SIM_STATE_CHANGED<sup>10+<sup>
+Indicates that the SIM card state has changed.
+- Value: **usual.event.SIM_STATE_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SMS_RECEIVED_COMPLETED<sup>10+<sup>
+Indicates that the SMS message is received.
+- Value: **usual.event.SMS_RECEIVED_COMPLETED**
+- Required subscriber permissions: ohos.permission.RECEIVE_SMS
+
+## COMMON_EVENT_SMS_EMERGENCY_CB_RECEIVE_COMPLETED<sup>10+<sup>
+Indicates that an emergency cell broadcast message is received.
+- Value: **usual.event.SMS_EMERGENCY_CB_RECEIVE_COMPLETED**
+- Required subscriber permissions: ohos.permission.RECEIVE_SMS
+
+## COMMON_EVENT_SMS_CB_RECEIVE_COMPLETED<sup>10+<sup>
+Indicates that a cell broadcast message is received.
+- Value: **usual.event.SMS_CB_RECEIVE_COMPLETED**
+- Required subscriber permissions: ohos.permission.RECEIVE_SMS
+
+## COMMON_EVENT_STK_COMMAND<sup>10+<sup>
+(Reserved, not supported yet) Indicates the STK command.
+- Value: **usual.event.STK_COMMAND**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_STK_SESSION_END<sup>10+<sup>
+(Reserved, not supported yet) Indicates that an STK session ends.
+- Value: **usual.event.STK_SESSION_END**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_STK_CARD_STATE_CHANGED<sup>10+<sup>
+(Reserved, not supported yet) Indicates that the STK card state has changed.
+- Value: **usual.event.STK_CARD_STATE_CHANGED**
+- Required subscriber permissions: ohos.permission
+
+## COMMON_EVENT_STK_ALPHA_IDENTIFIER<sup>10+<sup>
+(Reserved, not supported yet) Indicates the STK alpha indicator.
+- Value: **usual.event.STK_ALPHA_IDENTIFIER**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SMS_WAPPUSH_RECEIVE_COMPLETED<sup>10+<sup>
+Indicates that a WAP push message is received.
+- Value: **usual.event.SMS_WAPPUSH_RECEIVE_COMPLETED**
+- Required subscriber permissions: ohos.permission.RECEIVE_SMS
+
+## COMMON_EVENT_OPERATOR_CONFIG_CHANGED<sup>10+<sup>
+Indicates that the carrier configuration has been updated.
+- Value: **usual.event.OPERATOR_CONFIG_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SIM_CARD_DEFAULT_SMS_SUBSCRIPTION_CHANGED<sup>10+<sup>
+Indicates that the default SIM card for the SMS service has changed.
+- Value: **usual.event.DEFAULT_SMS_SUBSCRIPTION_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SIM_CARD_DEFAULT_DATA_SUBSCRIPTION_CHANGED<sup>10+<sup>
+Indicates that the default SIM card for the mobile data service has changed.
+- Value: **usual.event.DEFAULT_DATA_SUBSCRIPTION_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SIM_CARD_DEFAULT_MAIN_SUBSCRIPTION_CHANGED<sup>10+<sup>
+Indicates that the default primary SIM card has changed.
+- Value: **usual.event.SIM.DEFAULT_MAIN_SUBSCRIPTION_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SIM_CARD_DEFAULT_VOICE_SUBSCRIPTION_CHANGED<sup>10+<sup>
+Indicates that the default SIM card for the voice service has changed.
+- Value: **usual.event.DEFAULT_VOICE_SUBSCRIPTION_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_CALL_STATE_CHANGED<sup>10+<sup>
+Indicates that the call state has changed.
+- Value: **usual.event.CALL_STATE_CHANGED**
+- Required subscriber permissions: ohos.permission.GET_TELEPHONY_STATE
+
+## COMMON_EVENT_CELLULAR_DATA_STATE_CHANGED<sup>10+<sup>
+Indicates that the cellular data state has changed.
+- Value: **usual.event.CELLULAR_DATA_STATE_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_NETWORK_STATE_CHANGED<sup>10+<sup>
+Indicates that the network state has changed.
+- Value: **usual.event.NETWORK_STATE_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SIGNAL_INFO_CHANGED<sup>10+<sup>
+Indicates that the signal information is updated.
+- Value: **usual.event.SIGNAL_INFO_CHANGED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_INCOMING_CALL_MISSED<sup>10+<sup>
+Indicates a missed call.
+- Value: **usual.event.INCOMING_CALL_MISSED**
+- Required subscriber permissions: ohos.permission.GET_TELEPHONY_STATE
+
+## COMMON_EVENT_RADIO_STATE_CHANGE<sup>10+<sup>
+Indicates that the power-on and power-off status of the modem has changed.
+- Value: **usual.event.RADIO_STATE_CHANGE**
+
+## COMMON_EVENT_SCREEN_LOCKED <sup>10+<sup>
+
+Indicates that the screen is locked.
+
+- Value: **usual.event.SCREEN_LOCKED**
+- Required subscriber permissions: none
+
+## COMMON_EVENT_SCREEN_UNLOCKED<sup>10+<sup>
+
+Indicates that the screen is unlocked.
+
+- Value: **usual.event.SCREEN_UNLOCKED**
+- Required subscriber permissions: none

en/application-dev/reference/apis/development-intro.md

@@ -41,7 +41,7 @@ To call APIs to access these resources, you must apply for the corresponding per
 - If an application can call an API only after it has obtained a specific permission, the following description is provided for the API: "**Required permissions**: ohos.permission.xxxx"
 - If an application can call an API without any permission, no special description is provided.
 
-To determine whether an application can request a specific permission, see [Permission Application and Use](../../security/accesstoken-overview.md#permission-application-and-use).
+To determine whether an application can request a specific permission, see [Permission Application and Use](../../security/accesstoken-overview.md#applying-for-and-using-a-permission).
 
 ## System Capability Description
 

en/application-dev/reference/apis/js-apis-accessibility.md

@@ -68,20 +68,20 @@ Describes the target action supported by an accessibility application.
 | -------- | -------- |
 | click | Clicking.|
 | longClick | Long pressing.|
-| scrollForward | Scrolling forward.|
-| scrollBackward | Scrolling backward.|
-| focus | Obtaining focus.|
-| clearFocus | Clearing focus.|
-| clearSelection | Clearing selection.|
-| accessibilityFocus | Obtaining the accessibility focus.|
-| clearAccessibilityFocus | Clearing the accessibility focus.|
-| cut | Cut.|
-| copy | Copy.|
-| paste | Paste.|
-| select | Select.|
-| setText | Setting the text.|
-| delete | Delete.|
-| setSelection | Setting the selection.|
+| scrollForward | Scrolling forward. Not supported currently. |
+| scrollBackward | Scrolling backward. Not supported currently. |
+| focus | Obtaining focus. Not supported currently. |
+| clearFocus | Clearing focus. Not supported currently. |
+| clearSelection | Clearing selection. Not supported currently. |
+| accessibilityFocus | Obtaining the accessibility focus. |
+| clearAccessibilityFocus | Clearing the accessibility focus. |
+| cut | Cut. Not supported currently. |
+| copy | Copy. Not supported currently. |
+| paste | Paste. Not supported currently. |
+| select | Select. Not supported currently. |
+| setText | Setting the text. Not supported currently. |
+| delete | Delete. Not supported currently. |
+| setSelection | Setting the selection. Not supported currently. |
 
 ## Capability
 
@@ -94,7 +94,7 @@ Enumerates the capabilities of an accessibility application.
 | retrieve | Capability to retrieve the window content.|
 | touchGuide | Capability of touch guide mode.|
 | keyEventObserver | Capability to filter key events.|
-| zoom | Capability to control the display zoom level.|
+| zoom | Capability to control the display zoom level. Not supported currently. |
 | gesture | Capability to perform gesture actions.|
 
 ## CaptionsFontEdgeType<sup>8+</sup>
@@ -279,15 +279,15 @@ Describes a GUI change event.
 | bundleName | string | Yes| Yes| Target application name.|
 | componentType | string | Yes| Yes| Type of the event source component, for example, button or chart.|
 | pageId | number | Yes| Yes| Page ID of the event source.|
-| description | string | Yes| Yes| Event description.|
+| description | string | Yes| Yes| Event description. Not supported currently. |
 | triggerAction | [Action](#action) | Yes| Yes| Action that triggers the event.|
-| textMoveUnit | [TextMoveUnit](#textmoveunit) | Yes| Yes| Text movement unit.|
+| textMoveUnit | [TextMoveUnit](#textmoveunit) | Yes| Yes| Text movement unit. Not supported currently. |
 | contents | Array&lt;string&gt; | Yes| Yes| Array of contents.|
 | lastContent | string | Yes| Yes| Latest content.|
-| beginIndex | number | Yes| Yes| Sequence number of the first item displayed on the page.|
-| currentIndex | number | Yes| Yes| Sequence number of the current item.|
-| endIndex | number | Yes| Yes| Sequence number of the last item displayed on the page.|
-| itemCount | number | Yes| Yes| Total number of items.|
+| beginIndex | number | Yes| Yes| Sequence number of the first item displayed on the page. Not supported currently. |
+| currentIndex | number | Yes| Yes| Sequence number of the current item. Not supported currently. |
+| endIndex | number | Yes| Yes| Sequence number of the last item displayed on the page. Not supported currently. |
+| itemCount | number | Yes| Yes| Total number of items. Not supported currently. |
 
 ### constructor
 
@@ -323,13 +323,13 @@ Enumerates accessibility event types.
 | -------- | -------- |
 | click | Event of clicking a component.|
 | longClick | Event of long-pressing a component.|
-| select | Event of selecting a component.|
-| focus | Event indicating that the component obtains the focus.|
-| textUpdate | Event indicating that the component text has been updated.|
-| hoverEnter | Event indicating that the hover enters a component.|
-| hoverExit | Event indicating that the hover exits a component.|
-| scroll | Event of the scroll view.|
-| textSelectionUpdate | Event indicating that the selected text has been updated.|
+| select | Event of selecting a component. Not supported currently. |
+| focus | Event indicating that the component obtains the focus. Not supported currently. |
+| textUpdate | Event indicating that the component text has been updated. Not supported currently. |
+| hoverEnter | Event indicating that the hover enters a component. Not supported currently. |
+| hoverExit | Event indicating that the hover exits a component. Not supported currently. |
+| scroll | Event of the scroll view. Not supported currently. |
+| textSelectionUpdate | Event indicating that the selected text has been updated. Not supported currently. |
 | accessibilityFocus | Event indicating that the accessibility focus has been obtained.|
 | accessibilityFocusClear | Event indicating that the accessibility focus has been cleared.|
 

en/application-dev/reference/apis/js-apis-application-accessibilityExtensionAbility.md

@@ -16,9 +16,9 @@ import AccessibilityExtensionAbility from '@ohos.application.AccessibilityExtens
 
 **System capability**: SystemCapability.BarrierFree.Accessibility.Core
 
-| Name     | Type| Readable| Writable| Description                     |
-| --------- | -------- | ---- | ---- | ------------------------- |
-| context | [AccessibilityExtensionContext](js-apis-inner-application-accessibilityExtensionContext.md) | Yes| No| Context of the accessibility extension ability.|
+| Name     | Type                                      | Readable  | Writable  | Description          |
+| ------- | ---------------------------------------- | ---- | ---- | ------------ |
+| context | [AccessibilityExtensionContext](js-apis-inner-application-accessibilityExtensionContext.md) | Yes   | No   | Context of the accessibility extension ability.|
 
 ## AccessibilityEvent
 
@@ -28,10 +28,10 @@ Defines an accessibility event.
 
 ### Attributes
 
-| Name       | Type                                    | Readable  | Writable  | Description        |
-| --------- | ---------------------------------------- | ---- | ---- | ---------- |
-| eventType | [accessibility.EventType](js-apis-accessibility.md#EventType) \| [accessibility.WindowUpdateType](js-apis-accessibility.md#WindowUpdateType) \| [TouchGuideType](#touchguidetype) \| [GestureType](#gesturetype) \| [PageUpdateType](#pageupdatetype) | Yes   | No   | Event type.   |
-| target    | [AccessibilityElement](js-apis-inner-application-accessibilityExtensionContext.md#accessibilityelement9)                     | Yes   | No   | Target component where the event occurs.|
+| Name     | Type                                                        | Readable| Writable| Description                                                        |
+| --------- | ------------------------------------------------------------ | ---- | ---- | ------------------------------------------------------------ |
+| eventType | [accessibility.EventType](js-apis-accessibility.md#EventType) \| [accessibility.WindowUpdateType](js-apis-accessibility.md#WindowUpdateType)\| [TouchGuideType](#touchguidetype) \| [GestureType](#gesturetype) \| [PageUpdateType](#pageupdatetype) | Yes  | No  | Event type.<br>**EventType**: accessibility event type.<br>**WindowUpdateType**: Window update type.<br>**TouchGuideType**: touch guide event type.<br>**GestureType**: gesture type.<br>**PageUpdateType**: page update type, which is not supported currently.|
+| target    | [AccessibilityElement](js-apis-inner-application-accessibilityExtensionContext.md#accessibilityelement9) | Yes  | No  | Target component where the event occurs.                                        |
 | timeStamp | number                                                       | Yes  | No  | Timestamp of the event.                                                |
 
 ## GestureType
@@ -41,34 +41,34 @@ Enumerates gesture types.
 **System capability**: SystemCapability.BarrierFree.Accessibility.Core
 
 | Name           | Description                 |
-| ------------- | ------------ |
+| ------------- | ------------------- |
 | left          | Left gesture. String type.    |
-| leftThenRight | Left-then-right gesture. String type. |
-| leftThenUp    | Left-then-up gesture. String type. |
-| leftThenDown  | Left-then-down gesture. String type. |
+| leftThenRight | Left-then-right gesture. String type.|
+| leftThenUp    | Left-then-up gesture. String type.|
+| leftThenDown  | Left-then-down gesture. String type.|
 | right         | Right gesture. String type.    |
-| rightThenLeft | Right-then-left gesture. String type. |
-| rightThenUp   | Right-then-up gesture. String type. |
-| rightThenDown | Right-then-down gesture. String type. |
+| rightThenLeft | Right-then-left gesture. String type.|
+| rightThenUp   | Right-then-up gesture. String type.|
+| rightThenDown | Right-then-down gesture. String type.|
 | up            | Up gesture. String type.    |
-| upThenLeft    | Up-then-left gesture. String type. |
-| upThenRight   | Up-then-right gesture. String type. |
-| upThenDown    | Up-then-down gesture. String type. |
+| upThenLeft    | Up-then-left gesture. String type.|
+| upThenRight   | Up-then-right gesture. String type.|
+| upThenDown    | Up-then-down gesture. String type.|
 | down          | Down gesture. String type.    |
-| downThenLeft  | Down-then-left gesture. String type. |
-| downThenRight | Down-then-right gesture. String type. |
-| downThenUp    | Down-then-up gesture. String type. |
+| downThenLeft  | Down-then-left gesture. String type.|
+| downThenRight | Down-then-right gesture. String type.|
+| downThenUp    | Down-then-up gesture. String type.|
 
 ## PageUpdateType
 
-Enumerates the page update types.
+Enumerates the page update types. This API is not supported currently.
 
 **System capability**: SystemCapability.BarrierFree.Accessibility.Core
 
 | Name               | Description              |
-| ----------------- | --------- |
-| pageContentUpdate | Update of the page content. String type. |
-| pageStateUpdate   | Update of the page status. String type. |
+| ----------------- | ---------------- |
+| pageContentUpdate | Update of the page content. String type.|
+| pageStateUpdate   | Update of the page status. String type.|
 
 ## TouchGuideType
 
@@ -77,9 +77,9 @@ Enumerates the touch guide event types.
 **System capability**: SystemCapability.BarrierFree.Accessibility.Core
 
 | Name        | Description                 |
-| ---------- | ------------ |
-| touchBegin | Start of touch in touch guide mode. String type. |
-| touchEnd   | End of touch in touch guide mode. String type. |
+| ---------- | ------------------- |
+| touchBegin | Start of touch in touch guide mode. String type.|
+| touchEnd   | End of touch in touch guide mode. String type.|
 
 ## AccessibilityExtensionAbility.onConnect
 

en/application-dev/reference/apis/js-apis-application-want.md

@@ -23,10 +23,10 @@ import Want from '@ohos.application.Want';
 | abilityName  | string               | No  | Name of the ability. If both **bundleName** and **abilityName** are specified in a **Want** object, the **Want** object can match a specific ability. The value of **abilityName** must be unique in an application.|
 | uri          | string               | No  | URI information to match. If **uri** is specified in a **Want** object, the **Want** object will match the specified URI information, including **scheme**, **schemeSpecificPart**, **authority**, and **path**.|
 | type         | string               | No  | MIME type, that is, the type of the file to open, for example, **'text/xml'** and **'image/*'**. For details about the MIME type definition, see https://www.iana.org/assignments/media-types/media-types.xhtml?utm_source=ld246.com.  |
-| flags        | number               | No  | How the **Want** object will be handled. By default, numbers are passed in. For details, see [flags](js-apis-ability-wantConstant.md#wantConstant.Flags).|
-| action      | string               | No  | Action to take, such as viewing and sharing application details. In implicit **Want**, you can define this attribute and use it together with **uri** or **parameters** to specify the operation to be performed on the data. For details, see [action](js-apis-app-ability-wantConstant.md#wantConstant.Action). For details about the definition and matching rules of implicit Want, see [Matching Rules of Explicit Want and Implicit Want](application-models/explicit-implicit-want-mappings.md).                          |
-| parameters   | {[key: string]: any} | No  | Want parameters in the form of custom key-value (KV) pairs. By default, the following keys are carried:<br>- **ohos.aafwk.callerPid**: PID of the caller.<br>- **ohos.aafwk.param.callerToken**: token of the caller.<br>- **ohos.aafwk.param.callerUid**: UID in [bundleInfo](js-apis-bundle-BundleInfo.md#bundleinfo-1), that is, the application UID in the bundle information.<br>- **component.startup.newRules**: whether to enable the new control rule.<br>- **moduleName**: module name of the caller. No matter what this field is set to, the correct module name will be sent to the peer.<br>- **ohos.dlp.params.sandbox**: available only for DLP files.                                      |
-| entities    | Array\<string>       | No  | Additional category information (such as browser and video player) of the ability. It is a supplement to the **action** field for implicit Want. and is used to filter ability types. For details, see [entity](js-apis-app-ability-wantConstant.md#wantConstant.Entity).                                   |
+| flags        | number               | No  | How the **Want** object will be handled. By default, numbers are passed in. For details, see [flags](js-apis-ability-wantConstant.md#wantconstantflags).|
+| action      | string               | No  | Action to take, such as viewing and sharing application details. In implicit **Want**, you can define this attribute and use it together with **uri** or **parameters** to specify the operation to be performed on the data. For details, see [action](js-apis-ability-wantConstant.md#wantconstantaction). For details about the definition and matching rules of implicit Want, see [Matching Rules of Explicit Want and Implicit Want](application-models/explicit-implicit-want-mappings.md).                          |
+| parameters   | {[key: string]: any} | No  | Want parameters in the form of custom key-value (KV) pairs. By default, the following keys are carried:<br>- **ohos.aafwk.callerPid**: PID of the caller.<br>- **ohos.aafwk.param.callerToken**: token of the caller.<br>- **ohos.aafwk.param.callerUid**: UID in [bundleInfo](js-apis-bundle-BundleInfo.md#bundleinfo1), that is, the application UID in the bundle information.<br>- **component.startup.newRules**: whether to enable the new control rule.<br>- **moduleName**: module name of the caller. No matter what this field is set to, the correct module name will be sent to the peer.<br>- **ohos.dlp.params.sandbox**: available only for DLP files.                                      |
+| entities    | Array\<string>       | No  | Additional category information (such as browser and video player) of the ability. It is a supplement to the **action** field for implicit Want. and is used to filter ability types. For details, see [entity](js-apis-app-ability-wantConstant.md#wantconstantentity).                                   |
 
 **Example**
 

en/application-dev/reference/apis/js-apis-arkui-drawableDescriptor.md

+# @ohos.arkui.drawableDescriptor (DrawableDescriptor)
+
+The **DrawableDescriptor** module provides APIs for obtaining **pixelMap** objects, including the foreground, background, mask, and layered icons.
+
+> **NOTE**
+>
+> The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+>
+> You can preview how this component looks on a real device. The preview is not yet available in the DevEco Studio Previewer.
+
+## Modules to Import
+
+```js
+import { DrawableDescriptor, LayeredDrawableDescriptor } from '@ohos.arkui.drawableDescriptor';
+```
+
+## DrawableDescriptor.constructor
+constructor()
+
+Creates a **DrawableDescriptor** or **LayeredDrawableDescriptor** object. The globalization API [getDrawableDescriptor](js-apis-resource-manager.md##getdrawabledescriptor) or [getDrawableDescriptorByName](js-apis-resource-manager.md##getdrawabledescriptorbyname) is required for object construction.
+
+**System API**: This is a system API.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+### DrawableDescriptor
+
+Creates a **DrawableDescriptor** object when the passed resource ID or name belongs to a common image.
+
+### LayeredDrawableDescriptor
+
+Creates a **LayeredDrawableDescriptor** object when the passed resource ID or name belongs to a JSON file that contains foreground and background resources.
+
+**Example**
+```js
+@Entry
+@Component
+struct Index {
+  private resManager = getContext().resourceManager
+  let drawable1 = resManager.getDrawableDescriptor($r('app.media.icon').id)
+  let drawable2 = resManager.getDrawableDescriptorByName(icon)
+  let layeredDrawable1 = resManager.getDrawableDescriptor($r('app.media.file').id)
+  let layeredDrawable1 = resManager.getDrawableDescriptor(file)
+ }
+```
+
+## DrawableDescriptor.getPixelMap
+getPixelMap(): image.PixelMap;
+
+Obtains this **pixelMap** object.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Return value**
+
+| Type                             | Description             |
+| --------------------------------- | ---------------- |
+| [image.PixelMap](../apis/js-apis-image.md#pixelmap7) | **pixelMap** object.|
+
+**Example**
+  ```js
+  @State pixmap: PixelMap = drawable1.getPixelMap();
+  ```
+
+## LayeredDrawableDescriptor.getPixelMap
+getPixelMap(): image.PixelMap;
+
+Obtains the **pixelMap** object where the foreground, background, and mask are blended and cropped.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Return value**
+
+| Type                             | Description             |
+| --------------------------------- | ---------------- |
+| [image.PixelMap](../apis/js-apis-image.md#pixelmap7) | **pixelMap** object.|
+
+**Example**
+  ```js
+  @State pixmap: PixelMap = layeredDrawable1.getPixelMap();
+  ```
+
+## LayeredDrawableDescriptor.getForeground
+getForeground(): DrawableDescriptor;
+
+Obtains the **DrawableDescriptor** object of the foreground.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Return value**
+
+| Type                             | Description             |
+| --------------------------------- | ---------------- |
+| [DrawableDescriptor](#drawabledescriptor) | **DrawableDescriptor** object.|
+
+**Example**
+  ```js
+  @State drawable: DrawableDescriptor = layeredDrawable1.getForeground();
+  ```
+
+## LayeredDrawableDescriptor.getBackground
+getBackground(): DrawableDescriptor;
+
+Obtains the **DrawableDescriptor** object of the background.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Return value**
+
+| Type                             | Description             |
+| --------------------------------- | ---------------- |
+| [DrawableDescriptor](#drawabledescriptor) | **DrawableDescriptor** object.|
+
+**Example**
+  ```js
+  @State drawable: DrawableDescriptor = layeredDrawable1.getBackground();
+  ```
+
+## LayeredDrawableDescriptor.getMask
+getMask(): DrawableDescriptor;
+
+Obtains the **DrawableDescriptor** object of the mask.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Return value**
+
+| Type                             | Description             |
+| --------------------------------- | ---------------- |
+| [DrawableDescriptor](#drawabledescriptor) | **DrawableDescriptor** object.|
+
+**Example**
+  ```js
+  @State drawable: DrawableDescriptor = layeredDrawable1.getMask();
+  ```
+<!--no_check-->
\ No newline at end of file

en/application-dev/reference/apis/js-apis-audio.md

@@ -2121,7 +2121,7 @@ audioManager.off('deviceChange', (deviceChanged) => {
 });
 ```
 
-### on('interrupt')<sup>(deprecated)</sup>
+### on('interrupt')
 
 on(type: 'interrupt', interrupt: AudioInterrupt, callback: Callback\<InterruptAction>): void
 
@@ -2129,10 +2129,6 @@ Subscribes to audio interruption events. When the application's audio is interru
 
 Same as [on('audioInterrupt')](#onaudiointerrupt9), this API is used to listen for focus changes. However, this API is used in scenarios without audio streams (no **AudioRenderer** instance is created), such as frequency modulation (FM) and voice wakeup.
 
-> **NOTE**
->
-> This API is supported since API version 7 and deprecated since API version 9.
-
 **System capability**: SystemCapability.Multimedia.Audio.Renderer
 
 **Parameters**
@@ -2163,16 +2159,12 @@ audioManager.on('interrupt', interAudioInterrupt, (InterruptAction) => {
 });
 ```
 
-### off('interrupt')<sup>(deprecated)</sup>
+### off('interrupt')
 
 off(type: 'interrupt', interrupt: AudioInterrupt, callback?: Callback\<InterruptAction>): void
 
 Unsubscribes from audio interruption events.
 
-> **NOTE**
->
-> This API is supported since API version 7 and deprecated since API version 9.
-
 **System capability**: SystemCapability.Multimedia.Audio.Renderer
 
 **Parameters**
@@ -3953,21 +3945,20 @@ Obtains the output device with the highest priority based on the audio renderer
 let rendererInfo = {
     content : audio.ContentType.CONTENT_TYPE_MUSIC,
     usage : audio.StreamUsage.STREAM_USAGE_MEDIA,
-    rendererFlags : 0 };
+    rendererFlags : 0 }
 
 async function getPreferOutputDevice() {
   audioRoutingManager.getPreferOutputDeviceForRendererInfo(rendererInfo, (err, desc) => {
     if (err) {
-      console.error(`Result ERROR: ${JSON.stringify(err)}`);
+      console.error(`Result ERROR: ${err}`);
     } else {
-      console.info('device descriptor: ' + JSON.stringify(desc));
+      console.info(`device descriptor: ${desc}`);
     }
   });
 }
 ```
 
-### getPreferOutputDeviceForRendererInfo<sup>9+</sup>
-
+### getPreferOutputDeviceForRendererInfo<sup>10+</sup>
 getPreferOutputDeviceForRendererInfo(rendererInfo: AudioRendererInfo): Promise&lt;AudioDeviceDescriptors&gt;
 
 Obtains the output device with the highest priority based on the audio renderer information. This API uses a promise to return the result.
@@ -3986,19 +3977,27 @@ Obtains the output device with the highest priority based on the audio renderer
 | --------------------- | --------------------------- |
 | Promise&lt;[AudioDeviceDescriptors](#audiodevicedescriptors)&gt;   | Promise used to return the information about the output device with the highest priority.|
 
+**Error codes**
+
+For details about the error codes, see [Audio Error Codes](../errorcodes/errorcode-audio.md).
+
+| ID| Error Message|
+| ------- | --------------------------------------------|
+| 6800101 | if input parameter value error              |
+
 **Example**
 
 ```js
 let rendererInfo = {
     content : audio.ContentType.CONTENT_TYPE_MUSIC,
     usage : audio.StreamUsage.STREAM_USAGE_MEDIA,
-    rendererFlags : 0 };
+    rendererFlags : 0 }
 
 async function getPreferOutputDevice() {
   audioRoutingManager.getPreferOutputDeviceForRendererInfo(rendererInfo).then((desc) => {
-    console.info('device descriptor: ' + JSON.stringify(desc));
+    console.info(`device descriptor: ${desc}`);
   }).catch((err) => {
-    console.error(`Result ERROR: ${JSON.stringify(err)}`);
+    console.error(`Result ERROR: ${err}`);
   })
 }
 ```
@@ -4009,6 +4008,8 @@ on(type: 'preferOutputDeviceChangeForRendererInfo', rendererInfo: AudioRendererI
 
 Subscribes to the change of the output device with the highest priority. This API uses an asynchronous callback to return the result.
 
+**System capability**: SystemCapability.Multimedia.Audio.Device
+
 **Parameters**
 
 | Name  | Type                                                | Mandatory| Description                                      |
@@ -4017,16 +4018,24 @@ Subscribes to the change of the output device with the highest priority. This AP
 | rendererInfo  | [AudioRendererInfo](#audiorendererinfo8)        | Yes  | Audio renderer information.             |
 | callback | Callback<[AudioDeviceDescriptors](#audiodevicedescriptors)\> | Yes  | Callback used to return the information about the output device with the highest priority.                        |
 
+**Error codes**
+
+For details about the error codes, see [Audio Error Codes](../errorcodes/errorcode-audio.md).
+
+| ID| Error Message|
+| ------- | --------------------------------------------|
+| 6800101 | if input parameter value error              |
+
 **Example**
 
 ```js
 let rendererInfo = {
     content : audio.ContentType.CONTENT_TYPE_MUSIC,
     usage : audio.StreamUsage.STREAM_USAGE_MEDIA,
-    rendererFlags : 0 };
+    rendererFlags : 0 }
 
 audioRoutingManager.on('preferOutputDeviceChangeForRendererInfo', rendererInfo, (desc) => {
-  console.info('device descriptor: ' + JSON.stringify(desc));
+  console.info(`device descriptor: ${desc}`);
 });
 ```
 
@@ -4045,6 +4054,14 @@ Unsubscribes from the change of the output device with the highest priority.
 | type     | string                                              | Yes  | Event type. The value **'preferOutputDeviceChangeForRendererInfo'** means the event triggered when the output device with the highest priority changes.|
 | callback | Callback<[AudioDeviceDescriptors](#audiodevicedescriptors)> | No  | Callback used for unsubscription.                        |
 
+**Error codes**
+
+For details about the error codes, see [Audio Error Codes](../errorcodes/errorcode-audio.md).
+
+| ID| Error Message|
+| ------- | --------------------------------------------|
+| 6800101 | if input parameter value error              |
+
 **Example**
 
 ```js
@@ -5107,18 +5124,18 @@ audioRenderer.setVolume(0.5, (err, data)=>{
 
 on(type: 'audioInterrupt', callback: Callback\<InterruptEvent>): void
 
-Subscribes to audio interruption events. This API uses a callback to get interrupt events.
+Subscribes to audio interruption events. This API uses a callback to obtain interrupt events.
 
-Same as [on('interrupt')](#oninterruptdeprecated), this API has obtained the focus before **start**, **pause**, or **stop** of **AudioRenderer** is called. Therefore, you do not need to request the focus.
+Same as [on('interrupt')](#oninterrupt), this API is used to listen for focus changes. The **AudioRenderer** instance proactively gains the focus when the **start** event occurs and releases the focus when the **pause** or **stop** event occurs. Therefore, you do not need to request to gain or release the focus.
 
 **System capability**: SystemCapability.Multimedia.Audio.Interrupt
 
 **Parameters**
 
 | Name     | Type                                           | Mandatory | Description                                                  |
-| -------- | -------------------------------------------- | --------- | ------------------------------------------------------------ |
-| type     | string                                       | Yes       | Event type. The value **'audioInterrupt'** means the audio interruption event, which is triggered when audio playback is interrupted. |
-| callback | Callback<[InterruptEvent](#interruptevent9)> | Yes       | Callback used to return the audio interruption event.        |
+| -------- | ---------------------------------------------- | --------- | ------------------------------------------------------------ |
+| type     | string                                         | Yes       | Event type. The value **'audioInterrupt'** means the audio interruption event, which is triggered when audio rendering is interrupted. |
+| callback | Callback\<[InterruptEvent](#interruptevent9)\> | Yes       | Callback used to return the audio interruption event.        |
 
 **Error codes**
 
@@ -5131,50 +5148,68 @@ For details about the error codes, see [Audio Error Codes](../errorcodes/errorco
 **Example**
 
 ```js
-let isPlay;
-let started;
+let isPlaying; // An identifier specifying whether rendering is in progress.
+let isDucked; // An identifier specifying whether the audio volume is reduced.
 onAudioInterrupt();
 
 async function onAudioInterrupt(){
   audioRenderer.on('audioInterrupt', async(interruptEvent) => {
     if (interruptEvent.forceType == audio.InterruptForceType.INTERRUPT_FORCE) {
+      // The system forcibly interrupts audio rendering. The application must update the status and displayed content accordingly.
       switch (interruptEvent.hintType) {
         case audio.InterruptHint.INTERRUPT_HINT_PAUSE:
-          console.info('Force paused. Stop writing');
-          isPlay = false;
+          // The audio stream has been paused and temporarily loses the focus. It will receive the interruptEvent corresponding to resume when it is able to regain the focus.
+          console.info('Force paused. Update playing status and stop writing');
+          isPlaying = false; // A simplified processing indicating several operations for switching the application to the paused state.
           break;
         case audio.InterruptHint.INTERRUPT_HINT_STOP:
-          console.info('Force stopped. Stop writing');
-          isPlay = false;
+          // The audio stream has been stopped and permanently loses the focus. The user must manually trigger the operation to resume rendering.
+          console.info('Force stopped. Update playing status and stop writing');
+          isPlaying = false; // A simplified processing indicating several operations for switching the application to the paused state.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_DUCK:
+          // The audio stream is rendered at a reduced volume.
+          console.info('Force ducked. Update volume status');
+          isDucked = true; // A simplified processing indicating several operations for updating the volume status.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_UNDUCK:
+          // The audio stream is rendered at the normal volume.
+          console.info('Force ducked. Update volume status');
+          isDucked = false; // A simplified processing indicating several operations for updating the volume status.
+          break;
+        default:
+          console.info('Invalid interruptEvent');
           break;
       }
     } else if (interruptEvent.forceType == audio.InterruptForceType.INTERRUPT_SHARE) {
+      // The application can choose to take action or ignore.
       switch (interruptEvent.hintType) {
         case audio.InterruptHint.INTERRUPT_HINT_RESUME:
+          // It is recommended that the application continue rendering. (The audio stream has been forcibly paused and temporarily lost the focus. It can resume rendering now.)
           console.info('Resume force paused renderer or ignore');
-          await audioRenderer.start().then(async function () {
-            console.info('AudioInterruptMusic: renderInstant started :SUCCESS ');
-            started = true;
-          }).catch((err) => {
-            console.error(`AudioInterruptMusic: renderInstant start :ERROR : ${err}`);
-            started = false;
-          });
-          if (started) {
-            isPlay = true;
-            console.info(`AudioInterruptMusic Renderer started : isPlay : ${isPlay}`);
-          } else {
-            console.error('AudioInterruptMusic Renderer start failed');
-          }
+          // To continue rendering, the application must perform the required operations.
           break;
         case audio.InterruptHint.INTERRUPT_HINT_PAUSE:
+          // It is recommended that the application pause rendering.
           console.info('Choose to pause or ignore');
-          if (isPlay == true) {
-            isPlay == false;
-            console.info('AudioInterruptMusic: Media PAUSE : TRUE');
-          } else {
-            isPlay = true;
-            console.info('AudioInterruptMusic: Media PLAY : TRUE');
-          }
+          // To pause rendering, the application must perform the required operations.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_STOP:
+          // It is recommended that the application stop rendering.
+          console.info('Choose to stop or ignore');
+          // To stop rendering, the application must perform the required operations.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_DUCK:
+          // It is recommended that the application reduce the volume for rendering.
+          console.info('Choose to duck or ignore');
+          // To decrease the volume for rendering, the application must perform the required operations.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_UNDUCK:
+          // It is recommended that the application resume rendering at the normal volume.
+          console.info('Choose to unduck or ignore');
+          // To resume rendering at the normal volume, the application must perform the required operations.
+          break;
+        default:
           break;
       }
    }
@@ -5850,6 +5885,84 @@ audioCapturer.getBufferSize().then((data) => {
 
 ```
 
+### on('audioInterrupt')<sup>10+</sup>
+
+on(type: 'audioInterrupt', callback: Callback\<InterruptEvent>): void
+
+Subscribes to audio interruption events. This API uses a callback to get interrupt events.
+
+Same as [on('interrupt')](#oninterrupt), this API is used to listen for focus changes. The **AudioCapturer** instance proactively gains the focus when the **start** event occurs and releases the focus when the **pause** or **stop** event occurs. Therefore, you do not need to request to gain or release the focus.
+
+**System capability**: SystemCapability.Multimedia.Audio.Interrupt
+
+**Parameters**
+
+| Name     | Type                                           | Mandatory | Description                                                  |
+| -------- | ---------------------------------------------- | --------- | ------------------------------------------------------------ |
+| type     | string                                         | Yes       | Event type. The value **'audioInterrupt'** means the audio interruption event, which is triggered when audio capturing is interrupted. |
+| callback | Callback\<[InterruptEvent](#interruptevent9)\> | Yes       | Callback used to return the audio interruption event.        |
+
+**Error codes**
+
+For details about the error codes, see [Audio Error Codes](../errorcodes/errorcode-audio.md).
+
+| ID      | Error Message                  |
+| ------- | ------------------------------ |
+| 6800101 | if input parameter value error |
+
+**Example**
+
+```js
+let isCapturing; // An identifier specifying whether capturing is in progress.
+onAudioInterrupt();
+
+async function onAudioInterrupt(){
+  audioCapturer.on('audioInterrupt', async(interruptEvent) => {
+    if (interruptEvent.forceType == audio.InterruptForceType.INTERRUPT_FORCE) {
+      // The system forcibly interrupts audio capturing. The application must update the status and displayed content accordingly.
+      switch (interruptEvent.hintType) {
+        case audio.InterruptHint.INTERRUPT_HINT_PAUSE:
+          // The audio stream has been paused and temporarily loses the focus. It will receive the interruptEvent corresponding to resume when it is able to regain the focus.
+          console.info('Force paused. Update capturing status and stop reading');
+          isCapturing = false; // A simplified processing indicating several operations for switching the application to the paused state.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_STOP:
+          // The audio stream has been stopped and permanently loses the focus. The user must manually trigger the operation to resume capturing.
+          console.info('Force stopped. Update capturing status and stop reading');
+          isCapturing = false; // A simplified processing indicating several operations for switching the application to the paused state.
+          break;
+        default:
+          console.info('Invalid interruptEvent');
+          break;
+      }
+    } else if (interruptEvent.forceType == audio.InterruptForceType.INTERRUPT_SHARE) {
+      // The application can choose to take action or ignore.
+      switch (interruptEvent.hintType) {
+        case audio.InterruptHint.INTERRUPT_HINT_RESUME:
+          // It is recommended that the application continue capturing. (The audio stream has been forcibly paused and temporarily lost the focus. It can resume capturing now.)
+          console.info('Resume force paused renderer or ignore');
+          // To continue capturing, the application must perform the required operations.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_PAUSE:
+          // It is recommended that the application pause capturing.
+          console.info('Choose to pause or ignore');
+          // To pause capturing, the application must perform the required operations.
+          break;
+        case audio.InterruptHint.INTERRUPT_HINT_STOP:
+          // It is recommended that the application stop capturing.
+          console.info('Choose to stop or ignore');
+          // To stop capturing, the application must perform the required operations.
+          break;
+        default:
+          break;
+      }
+   }
+  });
+}
+
+```
+
+
 ### on('markReach')<sup>8+</sup>
 
 on(type: "markReach", frame: number, callback: Callback&lt;number&gt;): void
@@ -6306,7 +6419,7 @@ Describes the callback invoked for audio interruption or focus gain events.
 
 > **NOTE**
 >
-> This API is supported since API version 7 and deprecated since API version 9.
+> This API is supported since API version 7 and deprecated since API version 9. You are advised to use [InterruptEvent](#interruptevent9).
 
 **System capability**: SystemCapability.Multimedia.Audio.Renderer
 

en/application-dev/reference/apis/js-apis-bluetoothManager.md

@@ -547,7 +547,7 @@ startBluetoothDiscovery(): void
 
 Starts Bluetooth scan to discover remote devices.
 
-**Rquired permissions**: ohos.permission.DISCOVER_BLUETOOTH and ohos.permission.LOCATION and ohos.permission.APPROXIMATELY_LOCATION
+**Required permissions**: ohos.permission.DISCOVER_BLUETOOTH and ohos.permission.LOCATION and ohos.permission.APPROXIMATELY_LOCATION
 
 **System capability**: SystemCapability.Communication.Bluetooth.Core
 
@@ -652,6 +652,98 @@ try {
 ```
 
 
+## bluetoothManager.setDevicePinCode<sup>10+</sup><a name="setDevicePinCode"></a>
+
+setDevicePinCode(device: string, code: string, callback: AsyncCallback&lt;void&gt;): void
+
+Sets the PIN for the device when [PinType](#pintype10) is **PIN_TYPE_ENTER_PIN_CODE** or **PIN_TYPE_PIN_16_DIGITS**.
+
+**Required permissions**: ohos.permission.MANAGE_BLUETOOTH
+
+**System capability**: SystemCapability.Communication.Bluetooth.Core
+
+**Parameters**
+
+| Name   | Type     | Mandatory  | Description                              |
+| ------ | ------- | ---- | -------------------------------- |
+| device | string  | Yes   | MAC address of the remote device, for example, XX:XX:XX:XX:XX:XX.|
+| code   | string  | Yes   | PIN to set.       |
+| callback   | AsyncCallback&lt;void&gt;  | Yes   | Callback invoked to return the result. If the operation is successful, **err** is **undefined**. Otherwise, **err** is an error object.       |
+
+**Error codes**
+
+For details about the error codes, see [Bluetooth Error Codes](../errorcodes/errorcode-bluetoothManager.md).
+
+| ID| Error Message|
+| -------- | ---------------------------- |
+|2900001 | Service stopped.                         |
+|2900003 | Bluetooth switch is off.                 |
+|2900099 | Operation failed.                        |
+
+**Example**
+
+```js
+//callback
+try {
+    bluetoothManager.setDevicePinCode('11:22:33:44:55:66', '12345', (err, data) => {
+        console.info('setDevicePinCode,device name err:' + JSON.stringify(err) + ',device name:' + JSON.stringify(data));
+    });
+} catch (err) {
+    console.error("errCode:" + err.code + ",errMessage:" + err.message);
+}
+```
+
+
+## bluetoothManager.setDevicePinCode<sup>10+</sup><a name="setDevicePinCode"></a>
+
+setDevicePinCode(device: string, code: string): Promise&lt;void&gt;
+
+Sets the PIN for the device when [PinType](#pintype10) is **PIN_TYPE_ENTER_PIN_CODE** or **PIN_TYPE_PIN_16_DIGITS**. This API uses a promise to return the result.
+
+**Required permissions**: ohos.permission.MANAGE_BLUETOOTH
+
+**System capability**: SystemCapability.Communication.Bluetooth.Core
+
+**Parameters**
+
+| Name   | Type     | Mandatory  | Description                              |
+| ------ | ------- | ---- | -------------------------------- |
+| device | string  | Yes   | MAC address of the remote device, for example, XX:XX:XX:XX:XX:XX.|
+| code   | string  | Yes   | PIN to set.       |
+
+**Return value**
+
+| Type                 | Description           |
+| ------------------- | ------------- |
+| Promise&lt;void&gt; | Promise used to return the result.|
+
+**Error codes**
+
+For details about the error codes, see [Bluetooth Error Codes](../errorcodes/errorcode-bluetoothManager.md).
+
+| ID| Error Message|
+| -------- | ---------------------------- |
+|2900001 | Service stopped.                         |
+|2900003 | Bluetooth switch is off.                 |
+|2900099 | Operation failed.                        |
+
+**Example**
+
+```js
+//promise
+try {
+    bluetoothManager.setDevicePinCode('11:22:33:44:55:66', '12345').then(() => {
+        console.info('setDevicePinCode');
+    }, error => {
+        console.info('setDevicePinCode: errCode:' + error.code + ',errMessage' + error.message);
+    })
+
+} catch (err) {
+    console.error("errCode:" + err.code + ",errMessage:" + err.message);
+}
+```
+
+
 ## bluetoothManager.on('bluetoothDeviceFind')
 
 on(type: "bluetoothDeviceFind", callback: Callback&lt;Array&lt;string&gt;&gt;): void
@@ -1385,7 +1477,7 @@ Creates a **GattServer** instance.
 
 | Type                       | Description                                  |
 | ------------------------- | ------------------------------------ |
-| [GattServer](#gattserver) | **GattServer** instance created. Before using an API of the server, you must create a **GattSever** instance.|
+| [GattServer](#gattserver) | **GattServer** instance created. Before using an API of this class, you must create a **GattSever** instance.|
 
 **Example**
 
@@ -2333,17 +2425,6 @@ Obtains the network sharing status.
 | --------------------- | --------------------------------- |
 | boolean | Returns **true** if tethering is available over a Bluetooth PAN; return **false** otherwise.|
 
-**Error codes**
-
-For details about the error codes, see [Bluetooth Error Codes](../errorcodes/errorcode-bluetoothManager.md).
-
-| ID| Error Message|
-| -------- | ---------------------------- |
-|2900001 | Service stopped.                         |
-|2900003 | Bluetooth switch is off.                 |
-|2900004 | Profile is not supported.                |
-|2900099 | Operation failed.                        |
-
 **Example**
 
 ```js
@@ -4022,11 +4103,12 @@ Defines the characteristic API parameters.
 | characteristicUuid  | string                                   | Yes   | Yes   | UUID of the characteristic, for example, **00002a11-0000-1000-8000-00805f9b34fb**.|
 | characteristicValue | ArrayBuffer                              | Yes   | Yes   | Binary value of the characteristic.                     |
 | descriptors         | Array&lt;[BLEDescriptor](#bledescriptor)&gt; | Yes   | Yes   | List of descriptors of the characteristic.               |
+| properties<sup>10+</sup>  | [GattProperties](#gattproperties10) |   Yes  | Yes    | Properties of the characteristic.    |
 
 
 ## BLEDescriptor
 
-Defines the descriptor API parameters.
+Defines the BLE descriptor.
 
 **System capability**: SystemCapability.Communication.Bluetooth.Core
 
@@ -4229,6 +4311,7 @@ Defines the scan result.
 | deviceId | string      | Yes   | No   | Address of the scanned device, for example, XX:XX:XX:XX:XX:XX.|
 | rssi     | number      | Yes   | No   | RSSI of the device.                   |
 | data     | ArrayBuffer | Yes   | No   | Advertisement packets sent by the device.                   |
+| deviceName<sup>10+</sup>  | string | Yes   | No   | Name of the device detected.                   |
 
 
 ## BluetoothState
@@ -4308,6 +4391,7 @@ Defines the pairing request parameters.
 | -------- | ------ | ---- | ---- | ----------- |
 | deviceId | string | Yes   | No   | ID of the device to pair.|
 | pinCode  | string | Yes   | No   | Key for the device pairing.  |
+| pinType<sup>10+</sup> | [PinType](#pintype10) | Yes   | No   | Type of the device to pair.  |
 
 
 ## BondStateParam<a name="BondStateParam"></a>
@@ -4334,6 +4418,21 @@ Defines the profile state change parameters.
 | state    | [ProfileConnectionState](#profileconnectionstate) | Yes  | No  | Profile connection state of the device.|
 
 
+## GattProperties<sup>10+</sup><a name="GattProperties"></a>
+
+Defines the properties of a GATT characteristic.
+
+**System capability**: SystemCapability.Communication.Bluetooth.Core
+
+| Name      | Type  | Read-only  | Mandatory  | Description         |
+| -------- | ------ | ---- | ---- | ----------- |
+| write<sup>10+</sup>    | boolean | Yes  | Yes   | Permits writes of the characteristic value (with a response).|
+| writeNoResponse<sup>10+</sup> | boolean | Yes   | Yes   | Permits writes of the characteristic value (without a response).|
+| read<sup>10+</sup> | boolean   | Yes   | Yes   | Permits reads of the characteristic value.|
+| notify<sup>10+</sup> | boolean   | Yes   | Yes   | Permits notifications of the characteristic value.|
+| indicate<sup>10+</sup> | boolean   | Yes   | Yes   | Permits notifications of the characteristic value without acknowledgement.|
+
+
 ## DeviceClass<a name="DeviceClass"></a>
 
 Defines the class of a Bluetooth device.
@@ -4347,7 +4446,6 @@ Defines the class of a Bluetooth device.
 | classOfDevice   | number                              | Yes   | No   | Class of the device.         |
 
 
-
 ## MajorClass<a name="MajorClass"></a>
 
 Enumerates the major classes of Bluetooth devices.
@@ -4489,3 +4587,21 @@ Enumerates the Bluetooth profiles. API version 9 is added with **PROFILE_HID_HOS
 | PROFILE_HANDS_FREE_AUDIO_GATEWAY | 4 | HFP profile. |
 | PROFILE_HID_HOST | 6 | Human Interface Device (HID) profile. |
 | PROFILE_PAN_NETWORK | 7 | PAN profile. |
+
+
+## PinType<sup>10+</sup><a name="PinType"></a>
+
+Enumerates the Bluetooth pairing types.
+
+**System capability**: SystemCapability.Communication.Bluetooth.Core
+
+| Name                              | Value   | Description             |
+| -------------------------------- | ------ | --------------- |
+| PIN_TYPE_ENTER_PIN_CODE<sup>10+</sup> | 0 | The user needs to enter the PIN displayed on the peer device.|
+| PIN_TYPE_ENTER_PASSKEY<sup>10+</sup>  | 1 | The user needs to enter the PASSKEY displayed on the peer device. |
+| PIN_TYPE_CONFIRM_PASSKEY<sup>10+</sup>  | 2 | The user needs to confirm the PASSKEY displayed on the local device. |
+| PIN_TYPE_NO_PASSKEY_CONSENT<sup>10+</sup>  | 3 | There is no PASSKEY, and the user needs to accept or reject the pairing request. |
+| PIN_TYPE_NOTIFY_PASSKEY<sup>10+</sup>   | 4 | The user needs to enter the PASSKEY displayed on the local device on the peer device. |
+| PIN_TYPE_DISPLAY_PIN_CODE<sup>10+</sup>    | 5 | The user needs to enter the PIN displayed on the peer device for Bluetooth 2.0 devices. |
+| PIN_TYPE_OOB_CONSENT<sup>10+</sup>    | 6 | The user needs to accept or reject the out of band (OOB) pairing request. |
+| PIN_TYPE_PIN_16_DIGITS<sup>10+</sup>    | 7 | The user needs to enter the 16-digit PIN displayed on the peer device. |

en/application-dev/reference/apis/js-apis-bundleManager-remoteAbilityInfo.md

 # RemoteAbilityInfo
 
-The **RemoteAbilityInfo** module provides information about a remote ability, which can be obtained through [distributedBundle.getRemoteAbilityInfo](js-apis-distributedBundle.md).
+The **RemoteAbilityInfo** module provides information about a remote ability, which can be obtained through [distributedBundle.getRemoteAbilityInfo](js-apis-distributedBundleManager.md#distributedbundlegetremoteabilityinfo).
 
 > **NOTE**
 >

en/application-dev/reference/apis/js-apis-file-fileUri.md

-# @ohos.file.fileUri (File URI)
+# @ohos.file.fileuri (File URI)
 
 The **fileUri** module allows the uniform resource identifier (URI) of a file to be obtained based on the file path. With the file URI, you can use the APIs provided by [@ohos.file.fs](js-apis-file-fs.md) to operate the file.
 
@@ -9,7 +9,7 @@ The **fileUri** module allows the uniform resource identifier (URI) of a file to
 ## Modules to Import
 
 ```js
-import fileUri from "@ohos.file.fileUri";
+import fileuri from "@ohos.file.fileuri";
 ```
 
 Before using this module, you need to obtain the path of the file in the application sandbox. The following is an example:
@@ -57,5 +57,5 @@ For details about the error codes, see [File Management Error Codes](../errorcod
 
   ```js
 let filePath = pathDir + "test.txt";
-let uri = fileUri.getUriFromPath(filePath);
+let uri = fileuri.getUriFromPath(filePath);
   ```