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

Signed-off-by: Nxieqiongyang <xieqiongyang@huawei.com>

CODEOWNERS

@@ -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/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/Readme-EN.md

@@ -17,7 +17,6 @@
     - ExtensionAbility Component
       - [ExtensionAbility Component Overview](extensionability-overview.md)
       - [ServiceExtensionAbility](serviceextensionability.md)
-      - [DataShareExtensionAbility (for System Applications Only)](datashareextensionability.md)
       - [FormExtensionAbility (Widget)](widget-development-stage.md)
       - [AccessibilityExtensionAbility](accessibilityextensionability.md)
       - [EnterpriseAdminExtensionAbility](enterprise-extensionAbility.md)

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/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/extensionability-overview.md

@@ -25,6 +25,12 @@ An [ExtensionAbilityType](../reference/apis/js-apis-bundleManager.md#extensionab
 
 - [EnterpriseAdminExtensionAbility](../reference/apis/js-apis-EnterpriseAdminExtensionAbility.md): ExtensionAbility component of the enterprise_admin type, which provides APIs for processing enterprise management events, such as application installation events on devices and events indicating too many incorrect screen-lock password attempts.
 
+> **NOTE**<br>
+> 1. Third-party applications cannot implement ServiceExtensionAbility, DataShareExtensionAbility, StaticSubscriberExtensionAbility, or WindowExtensionAbility.
+>
+> 2. To implement transaction processing in the background for a third-party application, use background tasks rather than ServiceExtensionAbility. For details, see [Background Task](../task-management/background-task-overview.md).
+>
+> 3. Third-party applications can use other types of ExtensionAbility components that have been defined.
 
 ## Using ExtensionAbility of the Specified 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/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/stage-model-development-overview.md

@@ -10,7 +10,7 @@ The following figure shows the basic concepts used in the stage model.
 
 - [UIAbility component](uiability-overview.md) and [ExtensionAbility component](extensionability-overview.md)
   
-  The stage model provides two types of application components: UIAbility and ExtensionAbility. Both have specific classes and support object-oriented development. They are the specific implementation of the abstract ability concept on the stage model. They are also units scheduled by the Ability Manager Service (AMS), which schedules their lifecycles as well.
+  The stage model provides two types of application components: UIAbility and ExtensionAbility. Both have specific classes and support object-oriented development.
   
   - UIAbility has the UI and is mainly used for user interaction. For example, with UIAbility, the Gallery application can display images in the liquid layout. After a user selects an image, it uses a new UI to display the image details. The user can touch the **Back** button to return to the liquid layout. The lifecycle of the UIAbility component contains the creation, destruction, foreground, and background states. Display-related states are exposed through WindowStage events.
   
@@ -22,6 +22,7 @@ The following figure shows the basic concepts used in the stage model.
 - [Context](application-context-stage.md)
 
   In the stage model, Context and its derived classes provide a variety of resources and capabilities that can be called during the runtime. The UIAbility component and ExtensionAbility derived classes have different Context classes. These classes, which all inherit from the base class Context, provide different capabilities.
+
 - [AbilityStage](abilitystage.md)
 
   Each HAP of the Entry or Feature type has an AbilityStage class instance during the runtime. When the code in the HAP is loaded to the process for the first time, the system creates an AbilityStage class instance first. Each UIAbility class defined in the HAP is associated with this class instance after instantiation. Through this class instance, you can obtain the runtime information of the UIAbility instances in the HAP.

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/application-models/uiability-overview.md

@@ -5,10 +5,25 @@
 
 UIAbility is a type of application component that provides the UI for user interaction.
 
-UIAbility is the basic unit scheduled by the system and provides a window for applications to draw UIs. An application can contain one or more UIAbility components. For example, for a payment application, you can use two UIAbility components to carry the entry and payment functionalities. You are advised to use one UIAbility component to carry the same functional module, with multiple pages (if necessary).
+The following design philosophy is behind UIAbility:
+
+1. Native support for [cross-device migration](hop-cross-device-migration.md) and [multi-device collaboration](hop-multi-device-collaboration.md) at the application component level
+
+2. Support for multiple device types and window forms
+
+For details, see [Interpretation of the Application Model](application-model-description.md).
+
+The UIAbility division principles and suggestions are as follows:
+
+UIAbility is the basic unit scheduled by the system and provides a window for applications to draw UIs. An application can contain one or more UIAbility components. For example, for a payment application, you can use two UIAbility components to carry the entry and payment functionalities.
 
 Each UIAbility component instance is displayed as a mission in Recents.
 
+You can develop a single UIAbility or multiple UIAbilities for your application based on service requirements.
+
+- If you want only one mission to be displayed in Recents, use one UIAbility and multiple pages.
+
+- If you want multiple missions to be displayed in Recents or multiple windows to be opened simultaneously, use multiple UIAbilities.
 
 ## Privacy Statement Configuration
 

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/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/reference/apis/Readme-EN.md

@@ -173,6 +173,7 @@
   - [@ohos.promptAction (Prompt)](js-apis-promptAction.md)
   - [@ohos.router (Page Routing)](js-apis-router.md)
   - [@ohos.measure (Text Measurement)](js-apis-measure.md)
+  - [@ohos.uiAppearance (UI Appearance)](js-apis-uiappearance.md)
 
 - Graphics 
   - [@ohos.animation.windowAnimationManager (Window Animation Management)](js-apis-windowAnimationManager.md)
@@ -227,7 +228,7 @@
   - [@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)
 
@@ -266,6 +267,7 @@
   - [@ohos.request (Upload and Download)](js-apis-request.md)
 
 - Connectivity
+  - [@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)
@@ -274,8 +276,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)
@@ -340,7 +342,7 @@
   - [@ohos.systemParameterEnhance (System Parameter)](js-apis-system-parameterEnhance.md)
   - [@ohos.thermal (Thermal Management)](js-apis-thermal.md)
   - [@ohos.update (Update)](js-apis-update.md)
-  - [@ohos.usbManager (USB Management)](js-apis-usbManager.md)
+  - [@ohos.usbManager (USB Manager)](js-apis-usbManager.md)
   - [@ohos.vibrator (Vibrator)](js-apis-vibrator.md)
 
 - Account Management
@@ -390,7 +392,6 @@
 
 - APIs No Longer Maintained
   - [@ohos.backgroundTaskManager (Background Task Management)](js-apis-backgroundTaskManager.md)
-  - [@ohos.bluetooth (Bluetooth)](js-apis-bluetooth.md)
   - [@ohos.bundle (Bundle)](js-apis-Bundle.md)
   - [@ohos.bundle.innerBundleManager (innerBundleManager)](js-apis-Bundle-InnerBundleManager.md)
   - [@ohos.bundleState (Device Usage Statistics)](js-apis-deviceUsageStatistics.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/js-apis-app-ability-abilityManager.md

@@ -79,7 +79,7 @@ try {
         }
     });
 } catch (paramError) {
-    console.error('error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}');
+    console.error('error.code: ${paramError.code}, error.message: ${paramError.message}');
 }
 ```
 
@@ -135,7 +135,7 @@ try {
         console.error('updateConfiguration fail, err: ${JSON.stringify(err)}');
     });
 } catch (paramError) {
-    console.error('error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}');
+    console.error('error.code: ${paramError.code}, error.message: ${paramError.message}');
 }
 ```
 
@@ -177,7 +177,7 @@ try {
         }
     });
 } catch (paramError) {
-    console.error('error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}');
+    console.error('error.code: ${paramError.code}, error.message: ${paramError.message}');
 }
 ```
 
@@ -217,7 +217,7 @@ try {
         console.error('getAbilityRunningInfos fail, err: ${JSON.stringify(err)}');
     });
 } catch (paramError) {
-    console.error('error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}');
+    console.error('error.code: ${paramError.code}, error.message: ${paramError.message}');
 }
 ```
 
@@ -262,7 +262,7 @@ try {
         }
     });
 } catch (paramError) {
-    console.error('error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}');
+    console.error('error.code: ${paramError.code}, error.message: ${paramError.message}');
 }
 ```
 
@@ -310,7 +310,7 @@ try {
         console.error('getExtensionRunningInfos fail, err: ${JSON.stringify(err)}');
     });
 } catch (paramError) {
-    console.error('error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}');
+    console.error('error.code: ${paramError.code}, error.message: ${paramError.message}');
 }
 ```
 

en/application-dev/reference/apis/js-apis-app-ability-missionManager.md

@@ -306,7 +306,7 @@ Obtains the information about a given mission. This API uses an asynchronous cal
 
     missionManager.getMissionInfo('', testMissionId, (error, mission) => {
         if (error) {
-            console.error('getMissionInfo failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+            console.error('getMissionInfo failed, error.code: ${error.code}, error.message: ${error.message}');
         } else {
             console.log('mission.missionId = ${mission.missionId}');
             console.log('mission.runningState = ${mission.runningState}');
@@ -392,7 +392,7 @@ Obtains information about all missions. This API uses an asynchronous callback t
   try {
     missionManager.getMissionInfos('', 10, (error, missions) => {
       if (error) {
-          console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+          console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
       } else {
         console.log('size = ${missions.length}');
         console.log('missions = ${JSON.stringify(missions)}');

en/application-dev/reference/apis/js-apis-app-ability-startOptions.md

@@ -33,7 +33,7 @@ import StartOptions from '@ohos.app.ability.StartOptions';
   try {
     missionManager.getMissionInfos('', 10, (error, missions) => {
       if (error.code) {
-          console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+          console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
           return;
       }
       console.log('size = ${missions.length}');

en/application-dev/reference/apis/js-apis-app-ability-uiAbility.md

@@ -375,10 +375,10 @@ For details about the error codes, see [Ability Error Codes](../errorcodes/error
             console.log('Caller call() called');
           })
           .catch((callErr) => {
-            console.log('Caller.call catch error, error.code: ${JSON.stringify(callErr.code)}, error.message: ${JSON.stringify(callErr.message)}');
+            console.log('Caller.call catch error, error.code: ${callErr.code}, error.message: ${callErr.message}');
           });
       }).catch((err) => {
-        console.log('Caller GetCaller error, error.code: ${JSON.stringify(err.code)}, error.message: ${JSON.stringify(err.message)}');
+        console.log('Caller GetCaller error, error.code: ${err.code}, error.message: ${err.message}');
       });
     }
   }
@@ -456,10 +456,10 @@ For details about the error codes, see [Ability Error Codes](../errorcodes/error
             data.readParcelable(retmsg);
           })
           .catch((callErr) => {
-            console.log('Caller.callWithResult catch error, error.code: ${JSON.stringify(callErr.code)}, error.message: ${JSON.stringify(callErr.message)}');
+            console.log('Caller.callWithResult catch error, error.code: ${callErr.code}, error.message: ${callErr.message}');
           });
       }).catch((err) => {
-        console.log('Caller GetCaller error, error.code: ${JSON.stringify(err.code)}, error.message: ${JSON.stringify(err.message)}');
+        console.log('Caller GetCaller error, error.code: ${err.code}, error.message: ${err.message}');
       });
     }
   }
@@ -498,10 +498,10 @@ Releases the caller interface of the target ability.
         try {
           caller.release();
         } catch (releaseErr) {
-          console.log('Caller.release catch error, error.code: ${JSON.stringify(releaseErr.code)}, error.message: ${JSON.stringify(releaseErr.message)}');
+          console.log('Caller.release catch error, error.code: ${releaseErr.code}, error.message: ${releaseErr.message}');
         }
       }).catch((err) => {
-        console.log('Caller GetCaller error, error.code: ${JSON.stringify(err.code)}, error.message: ${JSON.stringify(err.message)}');
+        console.log('Caller GetCaller error, error.code: ${err.code}, error.message: ${err.message}');
       });
     }
   }
@@ -538,10 +538,10 @@ Registers a callback that is invoked when the stub on the target ability is disc
                 console.log(' Caller OnRelease CallBack is called ${str}');
             });
           } catch (error) {
-            console.log('Caller.onRelease catch error, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+            console.log('Caller.onRelease catch error, error.code: ${error.code}, error.message: ${error.message}');
           }
       }).catch((err) => {
-        console.log('Caller GetCaller error, error.code: ${JSON.stringify(err.code)}, error.message: ${JSON.stringify(err.message)}');
+        console.log('Caller GetCaller error, error.code: ${err.code}, error.message: ${err.message}');
       });
     }
   }
@@ -587,10 +587,10 @@ For details about the error codes, see [Ability Error Codes](../errorcodes/error
                 console.log(' Caller OnRelease CallBack is called ${str}');
             });
           } catch (error) {
-            console.log('Caller.on catch error, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+            console.log('Caller.on catch error, error.code: ${error.code}, error.message: ${error.message}');
           }
       }).catch((err) => {
-        console.log('Caller GetCaller error, error.code: ${JSON.stringify(err.code)}, error.message: ${JSON.stringify(err.message)}');
+        console.log('Caller GetCaller error, error.code: ${err.code}, error.message: ${err.message}');
       });
     }
   }
@@ -637,10 +637,10 @@ For other IDs, see [Ability Error Codes](../errorcodes/errorcode-ability.md).
             caller.on('release', onReleaseCallBack);
             caller.off('release', onReleaseCallBack);
           } catch (error) {
-            console.log('Caller.on or Caller.off catch error, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+            console.log('Caller.on or Caller.off catch error, error.code: ${error.code}, error.message: ${error.message}');
           }
       }).catch((err) => {
-        console.log('Caller GetCaller error, error.code: ${JSON.stringify(err.code)}, error.message: ${JSON.stringify(err.message)}');
+        console.log('Caller GetCaller error, error.code: ${err.code}, error.message: ${err.message}');
       });
     }
   }
@@ -686,10 +686,10 @@ For other IDs, see [Ability Error Codes](../errorcodes/errorcode-ability.md).
             caller.on('release', onReleaseCallBack);
             caller.off('release');
           } catch (error) {  
-            console.error('Caller.on or Caller.off catch error, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+            console.error('Caller.on or Caller.off catch error, error.code: ${error.code}, error.message: ${error.message}');
           }
       }).catch((err) => {
-        console.error('Caller GetCaller error, error.code: ${JSON.stringify(err.code)}, error.message: ${JSON.stringify(err.message)}');
+        console.error('Caller GetCaller error, error.code: ${err.code}, error.message: ${err.message}');
       });
     }
   }
@@ -759,7 +759,7 @@ For details about the error codes, see [Ability Error Codes](../errorcodes/error
       try {
         this.callee.on(method, funcCallBack);
       } catch (error) {
-        console.log('Callee.on catch error, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.log('Callee.on catch error, error.code: ${error.code}, error.message: ${error.message}');
       }
     }
   }
@@ -798,7 +798,7 @@ For details about the error codes, see [Ability Error Codes](../errorcodes/error
       try {
         this.callee.off(method);
       } catch (error) {
-        console.log('Callee.off catch error, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.log('Callee.off catch error, error.code: ${error.code}, error.message: ${error.message}');
       }
     }
   }

en/application-dev/reference/apis/js-apis-app-ability-wantAgent.md

@@ -186,10 +186,10 @@ try {
     WantAgent.getWantAgent(wantAgentInfo).then((data) => {
     wantAgent = data;
 }).catch((err) => {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 });
 } catch (err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -280,7 +280,7 @@ function getWantAgentCallback(err, data) {
     // getBundleName callback
     function getBundleNameCallback(err, data) {
         if(err) {
-            console.error('getBundleName failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getBundleName failed! ${err.code} ${err.message}');
         } else {
             console.info('getBundleName ok! ${JSON.stringify(data)}');
         }
@@ -288,13 +288,13 @@ function getWantAgentCallback(err, data) {
     try {
         WantAgent.getBundleName(wantAgent, getBundleNameCallback);
     } catch(err) {
-        console.error('getBundleName failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getBundleName failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -391,16 +391,16 @@ function getWantAgentCallback(err, data) {
         WantAgent.getBundleName(wantAgent).then((data)=>{
             console.info('getBundleName ok! ${JSON.stringify(data)}');
         }).catch((err)=>{
-            console.error('getBundleName failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getBundleName failed! ${err.code} ${err.message}');
         });
     } catch(err){
-        console.error('getBundleName failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getBundleName failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -492,7 +492,7 @@ function getWantAgentCallback(err, data) {
     // getUid callback
     function getUidCallback(err, data) {
         if(err) {
-            console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getUid failed! ${err.code} ${err.message}');
         } else {
             console.info('getUid ok! ${JSON.stringify(data)}');
         }
@@ -500,13 +500,13 @@ function getWantAgentCallback(err, data) {
     try {
         WantAgent.getUid(wantAgent, getUidCallback);
     } catch(err) {
-        console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getUid failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -603,16 +603,16 @@ function getWantAgentCallback(err, data) {
         WantAgent.getUid(wantAgent).then((data)=>{
             console.info('getUid ok! ${JSON.stringify(data)}');
         }).catch((err)=>{
-            console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getUid failed! ${err.code} ${err.message}');
         });
     } catch(err){
-        console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getUid failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -704,7 +704,7 @@ function getWantAgentCallback(err, data) {
     // getWant callback
     function getWantCallback(err, data) {
         if(err) {
-            console.error('getWant failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getWant failed! ${err.code} ${err.message}');
         } else {
             console.info('getWant ok! ${JSON.stringify(data)}');
         }
@@ -712,13 +712,13 @@ function getWantAgentCallback(err, data) {
     try {
         WantAgent.getWant(wantAgent, getWantCallback);
     } catch(err) {
-        console.error('getWant failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getWant failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -817,16 +817,16 @@ function getWantAgentCallback(err, data) {
         WantAgent.getUid(wantAgent).then((data)=>{
             console.info('getUid ok! ${JSON.stringify(data)}');
         }).catch((err)=>{
-            console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getUid failed! ${err.code} ${err.message}');
         });
     } catch(err){
-        console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getUid failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -917,7 +917,7 @@ function getWantAgentCallback(err, data) {
     // cancel callback
     function cancelCallback(err, data) {
         if(err) {
-            console.error('cancel failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('cancel failed! ${err.code} ${err.message}');
         } else {
             console.info('cancel ok!');
         }
@@ -925,13 +925,13 @@ function getWantAgentCallback(err, data) {
     try {
         WantAgent.cancel(wantAgent, cancelCallback);
     } catch(err) {
-        console.error('cancel failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('cancel failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -1028,16 +1028,16 @@ function getWantAgentCallback(err, data) {
         WantAgent.cancel(wantAgent).then((data)=>{
             console.info('cancel ok!');
         }).catch((err)=>{
-            console.error('cancel failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('cancel failed! ${err.code} ${err.message}');
         });
     } catch(err){
-        console.error('cancel failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('cancel failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -1131,7 +1131,7 @@ function getWantAgentCallback(err, data) {
     // trigger callback
     function triggerCallback(err, data) {
         if(err) {
-            console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getUid failed! ${err.code} ${err.message}');
         } else {
             console.info('getUid ok! ${JSON.stringify(data)}');
         }
@@ -1139,13 +1139,13 @@ function getWantAgentCallback(err, data) {
     try {
         WantAgent.trigger(wantAgent, triggerInfo, triggerCallback);
     } catch(err) {
-        console.error('getUid failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getUid failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -1239,7 +1239,7 @@ function getWantAgentCallback(err, data) {
     // equal callback
     function equalCallback(err, data) {
         if(err) {
-            console.error('equal failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('equal failed! ${err.code} ${err.message}');
         } else {
             console.info('equal ok! ${JSON.stringify(data)}');
         }
@@ -1247,13 +1247,13 @@ function getWantAgentCallback(err, data) {
     try {
         WantAgent.equal(wantAgent1,wantAgent2,equalCallback);
     } catch(err) {
-        console.error('equal failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('equal failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -1353,16 +1353,16 @@ function getWantAgentCallback(err, data) {
         WantAgent.equal(wantAgent1,wantAgent2).then((data)=>{
             console.info('equal ok! ${JSON.stringify(data)}');
         }).catch((err)=>{
-            console.error('equal failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('equal failed! ${err.code} ${err.message}');
         })
     } catch(err){
-        console.error('equal failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('equal failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -1451,7 +1451,7 @@ function getWantAgentCallback(err, data) {
     // getOperationTypeCallback callback
     function getOperationTypeCallback(err, data) {
         if(err) {
-            console.error('getOperationType failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getOperationType failed! ${err.code} ${err.message}');
         } else {
             console.info('getOperationType ok! ${JSON.stringify(data)}');
         }
@@ -1459,13 +1459,13 @@ function getWantAgentCallback(err, data) {
     try {
         WantAgent.getOperationTypeCallback(wantAgent, getOperationTypeCallback);
     } catch(err) {
-        console.error('getOperationTypeCallback failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getOperationTypeCallback failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 
@@ -1560,16 +1560,16 @@ function getWantAgentCallback(err, data) {
         WantAgent.getOperationType(wantAgent).then((data)=>{
             console.info('getOperationType ok! ${JSON.stringify(data)}');
         }).catch((err)=>{
-            console.error('getOperationType failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+            console.error('getOperationType failed! ${err.code} ${err.message}');
         });
     } catch(err){
-        console.error('getOperationType failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+        console.error('getOperationType failed! ${err.code} ${err.message}');
     }
 }
 try {
     WantAgent.getWantAgent(wantAgentInfo, getWantAgentCallback);
 } catch(err) {
-    console.error('getWantAgent failed! ${JSON.stringify(err.code)} ${JSON.stringify(err.message)}');
+    console.error('getWantAgent failed! ${err.code} ${err.message}');
 }
 ```
 

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

@@ -170,7 +170,7 @@ Obtains the information about a given mission. This API uses an asynchronous cal
   let allMissions=missionManager.getMissionInfos('',10).catch(function(err){console.log(err);});
       missionManager.getMissionInfo('', allMissions[0].missionId, (error, mission) => {
         if (error.code) {
-          console.error('getMissionInfo failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+          console.error('getMissionInfo failed, error.code: ${error.code}, error.message: ${error.message}');
           return;
         }
 
@@ -247,7 +247,7 @@ Obtains information about all missions. This API uses an asynchronous callback t
 
   missionManager.getMissionInfos('', 10, (error, missions) => {
       if (error.code) {
-          console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+          console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
           return;
       }
       console.log('size = ${missions.length}');
@@ -319,7 +319,7 @@ Obtains the snapshot of a given mission. This API uses an asynchronous callback
 
   missionManager.getMissionInfos('', 10, (error, missions) => {
     if (error.code) {
-        console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
         return;
     }
     console.log('size = ${missions.length}');
@@ -328,7 +328,7 @@ Obtains the snapshot of a given mission. This API uses an asynchronous callback
 
     missionManager.getMissionSnapShot('', id, (error, snapshot) => {
       if (error.code) {
-          console.error('getMissionSnapShot failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+          console.error('getMissionSnapShot failed, error.code: ${error.code}, error.message: ${error.message}');
           return;
       }
       console.log('bundleName = ${snapshot.ability.bundleName}');
@@ -408,7 +408,7 @@ Locks a given mission. This API uses an asynchronous callback to return the resu
 
   missionManager.getMissionInfos('', 10, (error, missions) => {
     if (error.code) {
-        console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
         return;
     }
     console.log('size = ${missions.length}');
@@ -492,7 +492,7 @@ Unlocks a given mission. This API uses an asynchronous callback to return the re
 
   missionManager.getMissionInfos('', 10, (error, missions) => {
     if (error.code) {
-        console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
         return;
     }
     console.log('size = ${missions.length}');
@@ -580,7 +580,7 @@ Clears a given mission, regardless of whether it is locked. This API uses an asy
 
   missionManager.getMissionInfos('', 10, (error, missions) => {
     if (error.code) {
-        console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
         return;
     }
     console.log('size = ${missions.length}');
@@ -716,7 +716,7 @@ Switches a given mission to the foreground. This API uses an asynchronous callba
 
   missionManager.getMissionInfos('', 10, (error, missions) => {
     if (error.code) {
-        console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
         return;
     }
     console.log('size = ${missions.length}');
@@ -757,7 +757,7 @@ Switches a given mission to the foreground, with the startup parameters for the
 
   missionManager.getMissionInfos('', 10, (error, missions) => {
     if (error.code) {
-        console.error('getMissionInfos failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+        console.error('getMissionInfos failed, error.code: ${error.code}, error.message: ${error.message}');
         return;
     }
     console.log('size = ${missions.length}');

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-BundlePackInfo.md

@@ -5,6 +5,8 @@ The **BundlePackInfo** module provides information in the **pack.info** file. Th
 > **NOTE**
 >
 > The initial APIs of this module are supported since API version 9. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+>
+> The APIs provided by this module are system APIs.
 
 ## BundlePackInfo
 
@@ -63,10 +65,10 @@ The **BundlePackInfo** module provides information in the **pack.info** file. Th
 | ------------------ | ------------------------------------------------- | ---- | ---- | ---------------------------------- |
 | mainAbility | string | Yes| No| Name of the main ability.|
 | apiVersion         | [ApiVersion](#apiversion)                         | Yes  | No  | API version of the module.                 |
-| deviceType         | Array\<string>                                    | Yes  | No  | Device types supported by the module.                |
+| deviceTypes         | Array\<string>                                    | Yes  | No  | Device types supported by the module.                |
 | distro             | [ModuleDistroInfo](#moduledistroinfo)             | Yes  | No  | Distribution information of the module.                |
 | abilities          | Array\<[ModuleAbilityInfo](#moduleabilityinfo)>   | Yes  | No  | Ability information of the module.              |
-| extensionAbilities | Array\<[ExtensionAbilities](#extensionability)> | Yes  | No  | ExtensionAbility information of the module.|
+| extensionAbilities | Array\<[ExtensionAbility](#extensionability)> | Yes  | No  | ExtensionAbility information of the module.|
 
 ## ModuleDistroInfo
 
@@ -123,7 +125,7 @@ The **BundlePackInfo** module provides information in the **pack.info** file. Th
 
 ## ApiVersion
 
-**System API**: This is a system API and cannot be called by third-party applications.
+**System API**: This is a system API.
 
 **System capability**: SystemCapability.BundleManager.BundleFrameWork.FreeInstall
 

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

@@ -32,3 +32,4 @@ The **ApplicationInfo** module defines the application information. A system app
 | appDistributionType       | string                                                       | Yes  | No  | Distribution type of the application signing certificate. The options are **app_gallery**, **enterprise**, **os_integration**, and **crowdtesting**.   |
 | appProvisionType          | string                                                       | Yes  | No  | Type of the application signing certificate file. The options are **debug** and **release**.          |
 | systemApp          | boolean                                                       | Yes  | No  | Whether the application is a system application.          |
+| bundleType                |[BundleType](js-apis-bundleManager.md#bundletype)             | Yes  | No  | Bundle type, which can be **APP** (common application) or **ATOMIC_SERVICE** (atomic service).                               |

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

@@ -26,3 +26,28 @@ The **HapModuleInfo** module defines the HAP module information. A system applic
 | deviceTypes                       | Array\<string>                                               | Yes  | No  | Types of devices where the module can run.  |
 | installationFree                  | boolean                                                      | Yes  | No  | Whether installation-free is supported.      |
 | hashValue                         | string                                                       | Yes  | No  | Hash value of the module.             |
+| moduleType                        | [ModuleType](js-apis-bundleManager.md#moduletype)            | Yes  | No  | Type of the module.     |
+| preloads                          | Array\<[PreloadItem](#preloaditem)>                          | Yes  | No  | Preloaded modules in the atomic service.|
+| dependencies                      | Array\<[Dependency](#dependency)>                            | Yes  | No  | Dynamic shared libraries on which the module depends. |
+
+## PreloadItem
+
+Describes the preloaded module information in the atomic service.
+
+ **System capability**: SystemCapability.BundleManager.BundleFramework.Core
+
+| Name     | Type          | Readable| Writable| Description                       |
+| --------- | -------------- | ---- | ---- | --------------------------- |
+|moduleName | string         | Yes  | No  | Name of the module automatically preloaded by the system.|
+
+## Dependency
+
+Describes the information about the dynamic shared library on which the module depends.
+
+ **System capability**: SystemCapability.BundleManager.BundleFramework.Core
+
+| Name       | Type  | Readable| Writable| Description                  |
+| ----------- | ------ | ---- | ---- | ---------------------- |
+| bundleName  | string | Yes  | No  | Name of the shared bundle on which the current module depends.      |
+| moduleName  | string | Yes  | No  | Module name of the shared bundle on which the current module depends.|
+| versionCode | number | Yes  | No  | Version number of the shared bundle.  |

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

@@ -49,7 +49,7 @@ Enumerates the application flags, which indicate the type of application informa
 
  **System capability**: SystemCapability.BundleManager.BundleFramework.Core
 
- **System API**: This is a system API and cannot be called by third-party applications.
+ **System API**: This is a system API.
 
 | Name                                | Value        | Description                                                        |
 | ------------------------------------ | ---------- | ------------------------------------------------------------ |
@@ -64,7 +64,7 @@ Enumerates the ability flags, which indicate the type of ability information to
 
  **System capability**: SystemCapability.BundleManager.BundleFramework.Core
 
- **System API**: This is a system API and cannot be called by third-party applications.
+ **System API**: This is a system API.
 
 | Name                             | Value        | Description                                                        |
 | --------------------------------- | ---------- | ------------------------------------------------------------ |
@@ -81,7 +81,7 @@ Enumerates the Extension ability flags, which indicate the type of Extension abi
 
  **System capability**: SystemCapability.BundleManager.BundleFramework.Core
 
- **System API**: This is a system API and cannot be called by third-party applications.
+ **System API**: This is a system API.
 
 | Name                                       | Value        | Description                                                        |
 | ------------------------------------------- | ---------- | ------------------------------------------------------------ |
@@ -187,6 +187,39 @@ Enumerates the display orientations of the ability. This attribute applies only
 | AUTO_ROTATION_PORTRAIT_RESTRICTED  |11|Switched-determined auto rotation in the vertical direction.|
 | LOCKED                             |12|Locked.|
 
+### CompatiblePolicy
+
+Defines the version compatibility type of the shared library.
+
+ **System capability**: SystemCapability.BundleManager.BundleFramework.Core
+
+| Name                  | Value  | Description                            |
+| ---------------------- | ---- | -------------------------------- |
+| BACKWARD_COMPATIBILITY | 1    | The shared library is backward compatible.|
+
+### ModuleType
+
+Enumerates the module types.
+
+ **System capability**: SystemCapability.BundleManager.BundleFramework.Core
+
+| Name   | Value  | Description                |
+| ------- | ---- | -------------------- |
+| ENTRY   | 1    | Main module of the application.  |
+| FEATURE | 2    | Dynamic feature module of the application.|
+| SHARED  | 3    | Dynamic shared library module of the application. |
+
+### BundleType
+
+Enumerates the bundle types.
+
+ **System capability**: SystemCapability.BundleManager.BundleFramework.Core
+
+| Name          | Value  | Description           |
+| -------------- | ---- | --------------- |
+| APP            | 0    | The bundle is a common application.   |
+| ATOMIC_SERVICE | 1    | The bundle is an atomic service.|
+
 ## APIs
 
 ### bundleManager.getBundleInfoForSelf
@@ -1077,7 +1110,7 @@ For details about the error codes, see [Bundle Error Codes](../errorcodes/errorc
 | ID| Error Message                            |
 | -------- | ------------------------------------- |
 | 17700001 | The specified bundleName is not found. |
-| 17700003 | The specified extensionAbility is not found.    |
+| 17700003 | The specified ability is not found.    |
 | 17700004 | The specified userId is invalid.       |
 | 17700026 | The specified bundle is disabled.      |
 | 17700029 | The specified ability is disabled.     |
@@ -3036,47 +3069,3 @@ try {
     hilog.error(0x0000, 'testTag', 'getAllSharedBundleInfo failed. Cause: %{public}s', err.message);
 }
 ```
-
-## CompatiblePolicy
-
-Defines the version compatibility type of the shared library.
-
- **System capability**: SystemCapability.BundleManager.BundleFramework.Core
-
-| Name                  | Value  | Description                            |
-| ---------------------- | ---- | -------------------------------- |
-| BACKWARD_COMPATIBILITY | 1    | The shared library is backward compatible.|
-
-## ModuleType
-
-Enumerates the module types.
-
- **System capability**: SystemCapability.BundleManager.BundleFramework.Core
-
-| Name   | Value  | Description                |
-| ------- | ---- | -------------------- |
-| ENTRY   | 1    | Main module of the application.  |
-| FEATURE | 2    | Dynamic feature module of the application.|
-| SHARED  | 3    | Dynamic shared library module of the application. |
-
-## BundleType
-
-Enumerates the bundle types.
-
- **System capability**: SystemCapability.BundleManager.BundleFramework.Core
-
-| Name          | Value  | Description           |
-| -------------- | ---- | --------------- |
-| APP            | 0    | The bundle is a common application.   |
-| ATOMIC_SERVICE | 1    | The bundle is an atomic service.|
-
-## AtomicServiceModuleType
-
-Enumerates the module types of an atomic service.
-
- **System capability**: SystemCapability.BundleManager.BundleFramework.Core
-
-| Name  | Value  | Description                       |
-| ------ | ---- | --------------------------- |
-| NORMAL | 0    | Page package in the atomic service.    |
-| MAIN   | 1    | Landing page package in the atomic service.|

en/application-dev/reference/apis/js-apis-data-preferences.md

-# @ohos.data.preferences (Preferences)
+# @ohos.data.preferences (User Preferences)
 
-The **Preferences** module provides APIs for processing data in the form of key-value (KV) pairs and supports persistence of the KV pairs when required.
+The **user preferences** module provides APIs for processing data in the form of key-value (KV) pairs and supports persistence of the KV pairs when required.
 
 The key is of the string type, and the value can be a number, a string, a Boolean value, or an array of numbers, strings, or Boolean values.
 
@@ -181,7 +181,7 @@ The deleted **Preferences** instance cannot be used for data operations. Otherwi
 
 **Error codes**
 
-For details about the following error codes, see [Preference Error Codes](../errorcodes/errorcode-preferences.md).
+For details about the error codes, see [User Preference Error Codes](../errorcodes/errorcode-preferences.md).
 
 | ID| Error Message                      |
 | -------- | ------------------------------|
@@ -213,6 +213,7 @@ Stage model:
 
 ```ts
 import UIAbility from '@ohos.app.ability.UIAbility';
+
 class EntryAbility extends UIAbility {
     onWindowStageCreate(windowStage) {
         try {
@@ -257,7 +258,7 @@ The deleted **Preferences** instance cannot be used for data operations. Otherwi
 
 **Error codes**
 
-For details about the following error codes, see [Preference Error Codes](../errorcodes/errorcode-preferences.md).
+For details about the error codes, see [User Preference Error Codes](../errorcodes/errorcode-preferences.md).
 
 | ID| Error Message                      |
 | -------- | ------------------------------|
@@ -288,6 +289,7 @@ Stage model:
 
 ```ts
 import UIAbility from '@ohos.app.ability.UIAbility';
+
 class EntryAbility extends UIAbility {
     onWindowStageCreate(windowStage) {
         try{
@@ -348,6 +350,7 @@ Stage model:
 
 ```ts
 import UIAbility from '@ohos.app.ability.UIAbility';
+
 class EntryAbility extends UIAbility {
     onWindowStageCreate(windowStage) {
         try {
@@ -500,7 +503,7 @@ try {
     promise.then((data) => {
         console.info("Got the value of 'startup'. Data: " + data);
     }).catch((err) => {
-        console.info("Failed to get value of 'startup'. code =" + err.code + ", message =" + err.message);
+        console.info("Failed to obtain the value of 'startup'. code =" + err.code + ", message =" + err.message);
     })
 } catch(err) {
     console.info("Failed to obtain the value of 'startup'. code =" + err.code + ", message =" + err.message);

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

@@ -299,7 +299,7 @@ try {
 
 getBundlePackInfo(bundleName: string, bundlePackFlag : BundlePackFlag): Promise\<BundlePackInfo>;
 
-Obtains **bundlePackInfo** based on **bundleName** and **bundleFlag**. This API uses a promise to return the result.
+Obtains **bundlePackInfo** based on **bundleName** and **BundlePackFlag**. This API uses a promise to return the result.
 
 **System API**: This is a system API.
 

en/application-dev/reference/apis/js-apis-inner-application-appStateData.md

@@ -20,7 +20,7 @@ import appManager from '@ohos.app.ability.appManager';
 function getForegroundAppInfos() {
     appManager.getForegroundApplications((error, data) => {
         if (error && error.code) {
-            console.log('getForegroundApplications failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+            console.log('getForegroundApplications failed, error.code: ${error.code}, error.message: ${error.message}');
             return;
         }
         for (let i = 0; i < data.length; i++) {

en/application-dev/reference/apis/js-apis-inner-application-continueCallback.md

@@ -38,7 +38,7 @@ Called when the mission continuation is complete.
 
   distributedMissionManager.continueMission(continueDeviceInfo, continueCallback, (error) => {
       if (error && error.code) {
-          console.error('continueMission failed, error.code: ${JSON.stringify(error.code)}, error.message: ${JSON.stringify(error.message)}');
+          console.error('continueMission failed, error.code: ${error.code}, error.message: ${error.message}');
       }
       console.log('continueMission finished');
   });