Merge branch 'OpenHarmony-3.1-Release' of gitee.com:openharmony/docs into OpenHarmony-3.1-Release

Signed-off-by: N廖康康 <liaokangkang@huawei.com>

CODEOWNERS

@@ -222,7 +222,7 @@ zh-cn/application-dev/reference/apis/js-apis-data-preferences.md @ge-yafang
 zh-cn/application-dev/reference/apis/js-apis-data-storage.md @ge-yafang
 zh-cn/application-dev/reference/apis/js-apis-system-storage.md @ge-yafang
 zh-cn/application-dev/reference/apis/js-apis-data-rdb.md @ge-yafang
-zh-cn/application-dev/reference/apis/js-apis-settings.md @sun-yue14
+zh-cn/application-dev/reference/apis/js-apis-settings.md @ge-yafang
 zh-cn/application-dev/reference/apis/js-apis-data-resultset.md @ge-yafang
 zh-cn/application-dev/reference/apis/js-apis-document.md @qinxiaowang
 zh-cn/application-dev/reference/apis/js-apis-environment.md @qinxiaowang
@@ -258,7 +258,7 @@ zh-cn/application-dev/reference/apis/js-apis-hitracechain.md @zengyawen
 zh-cn/application-dev/reference/apis/js-apis-hitracemeter.md @zengyawen
 zh-cn/application-dev/reference/apis/js-apis-inputmethod.md @sun-yue14
 zh-cn/application-dev/reference/apis/js-apis-inputmethodengine.md @sun-yue14
-zh-cn/application-dev/reference/apis/js-apis-pasteboard.md @sun-yue14
+zh-cn/application-dev/reference/apis/js-apis-pasteboard.md @ge-yafang
 zh-cn/application-dev/reference/apis/js-apis-screen-lock.md @sun-yue14
 zh-cn/application-dev/reference/apis/js-apis-system-time.md @sun-yue14
 zh-cn/application-dev/reference/apis/js-apis-wallpaper.md @sun-yue14

en/application-dev/Readme-EN.md

@@ -7,16 +7,15 @@
     - [OpenHarmony Release Notes](../release-notes/Readme.md)
 - Quick Start
     - Getting Started
-      - [Preparations](quick-start/start-overview.md)
-      - [Getting Started with eTS in the Traditional Coding Approach](quick-start/start-with-ets.md)
-      - [Getting Started with eTS in the Low-Code Approach](quick-start/start-with-ets-low-code.md)
-      - [Getting Started with JavaScript in the Traditional Coding Approach](quick-start/start-with-js.md)
-      - [Getting Started with JavaScript in the Low-Code Approach](quick-start/start-with-js-low-code.md)
+        - [Preparations](quick-start/start-overview.md)
+        - [Getting Started with eTS in the Traditional Coding Approach](quick-start/start-with-ets.md)
+        - [Getting Started with eTS in the Low-Code Approach](quick-start/start-with-ets-low-code.md)
+        - [Getting Started with JavaScript in the Traditional Coding Approach](quick-start/start-with-js.md)
+        - [Getting Started with JavaScript in the Low-Code Approach](quick-start/start-with-js-low-code.md)
     - Development Fundamentals
-      - [Application Package Structure Configuration File (FA Model)](quick-start/package-structure.md)
-      - [Application Package Structure Configuration File (Stage Model)](quick-start/stage-structure.md)
-      - [Resource File Categories](quick-start/basic-resource-file-categories.md)
-      - [SysCap](quick-start/syscap.md)
+        - [Application Package Structure Configuration File (FA Model)](quick-start/package-structure.md)
+        - [Application Package Structure Configuration File (Stage Model)](quick-start/stage-structure.md)
+        - [SysCap](quick-start/syscap.md)
 - Development
     - [Ability Development](ability/Readme-EN.md)
     - [UI Development](ui/Readme-EN.md)
@@ -33,20 +32,16 @@
     - [Device Usage Statistics](device-usage-statistics/Readme-EN.md)
     - [DFX](dfx/Readme-EN.md)
     - [Internationalization](internationalization/Readme-EN.md)
-    - [Native APIs](napi/Readme-EN.md)
+    - [Using Native APIs in Application Projects](napi/Readme-EN.md)
 - Tools
     - [DevEco Studio (OpenHarmony) User Guide](quick-start/deveco-studio-user-guide-for-openharmony.md)
 - Hands-On Tutorials
     - [Samples](https://gitee.com/openharmony/app_samples/blob/master/README.md)
-    - [Codelabs](https://gitee.com/openharmony/codelabs/blob/master)
+    - [Codelabs](https://gitee.com/openharmony/codelabs)
 - API References
-    - [Component Reference (JavaScript-based Web-like Development Paradigm)](reference/arkui-js/Readme-EN.md)
     - [Component Reference (TypeScript-based Declarative Development Paradigm)](reference/arkui-ts/Readme-EN.md)
+    - [Component Reference (JavaScript-based Web-like Development Paradigm)](reference/arkui-js/Readme-EN.md)
     - APIs
-      - [JS and TS APIs](reference/apis/Readme-EN.md)
-      - Native APIs
-        -   [Standard Libraries](reference/native-lib/third_party_libc/musl.md)
-        -   [Node_API](reference/native-lib/third_party_napi/napi.md)
+      -   [JS and TS APIs](reference/apis/Readme-EN.md)
 - Contribution
     - [How to Contribute](../contribute/documentation-contribution.md)
-

en/application-dev/ability/fa-dataability.md

 # Data Ability Development
+
 ## When to Use
+
 A Data ability helps applications manage access to data stored by themselves and other applications. It also provides APIs for sharing data with other applications either on the same device or across devices.
 
 Data ability providers can customize data access-related APIs such as data inserting, deleting, updating, and querying, as well as file opening, and share data with other applications through these open APIs.
 
+
 ## Available APIs
 
 **Table 1** Data ability lifecycle APIs
@@ -18,7 +21,7 @@ Data ability providers can customize data access-related APIs such as data inser
 |denormalizeUri?(uri: string, callback: AsyncCallback\<string>): void|Converts a normalized URI generated by **normalizeUri** into a denormalized URI.|
 |insert?(uri: string, valueBucket: rdb.ValuesBucket, callback: AsyncCallback\<number>): void|Inserts a data record into the database.|
 |openFile?(uri: string, mode: string, callback: AsyncCallback\<number>): void|Opens a file.|
-|getFileTypes?(uri: string, mimeTypeFilter: string, callback: AsyncCallback\<Array\<string>>): void|Obtains the MIME type of a file.|
+|getFileTypes?(uri: string, mimeTypeFilter: string, callback: AsyncCallback<Array\<string>>): void|Obtains the MIME type of a file.|
 |getType?(uri: string, callback: AsyncCallback\<string>): void|Obtains the MIME type matching the data specified by the URI.|
 |executeBatch?(ops: Array\<DataAbilityOperation>, callback: AsyncCallback\<Array\<DataAbilityResult>>): void|Operates data in the database in batches.|
 |call?(method: string, arg: string, extras: PacMap, callback: AsyncCallback\<PacMap>): void|Calls a custom API.|
@@ -115,7 +118,7 @@ Import the basic dependency packages and obtain the URI string for communicating
 
 The basic dependency packages include:
 - @ohos.ability.featureAbility
-- @ohos.data.dataability
+- @ohos.data.dataAbility
 - @ohos.data.rdb
 
 #### Data Ability API Development
@@ -129,7 +132,7 @@ The basic dependency packages include:
    import featureAbility from '@ohos.ability.featureAbility'
    import ohos_data_ability from '@ohos.data.dataAbility'
    import ohos_data_rdb from '@ohos.data.rdb'
-   
+
    var urivar = "dataability:///com.ix.DataAbility"
    var DAHelper = featureAbility.acquireDataAbilityHelper(
     urivar

en/application-dev/ability/stage-ability.md

 # Ability Development
 ## When to Use
-Unlike the FA model, the [stage model](stage-brief.md) requires you to declare the application package structure in the `module.json` and `app.json` files during application development. For details about the configuration file, see [Application Package Structure Configuration File](../quick-start/stage-structure.md). To develop abilities based on the stage model, implement the following logic:
-- Create abilities for an application that involves screen viewing and human-machine interaction. You must implement the following scenarios: ability lifecycle callbacks, obtaining ability configuration, requesting permissions, and notifying environment changes.
+Ability development in the [stage model](stage-brief.md) is significantly different from that in the FA model. The stage model requires you to declare the application package structure in the `module.json` and `app.json` files during application development. For details about the configuration file, see [Application Package Structure Configuration File](../quick-start/stage-structure.md). To develop an ability based on the stage model, implement the following logic:
+- Create an ability that supports screen viewing and human-machine interaction. You must implement the following scenarios: ability lifecycle callbacks, obtaining ability configuration, requesting permissions, and notifying environment changes.
 - Start an ability. You need to implement ability startup on the same device, on a remote device, or with a specified UI page.
 - Call abilities. For details, see [Call Development](stage-call.md).
 - Connect to and disconnect from a Service Extension ability. For details, see [Service Extension Ability Development](stage-serviceextension.md).
 - Continue the ability on another device. For details, see [Ability Continuation Development](stage-ability-continuation.md).
 
 ### Launch Type
-The ability supports three launch types: singleton, multi-instance, and instance-specific. Each launch type, specified by `launchType` in the `module.json` file, specifies the action that can be performed when the ability is started.
+An ability can be launched in the **standard**, **singleton**, or **specified** mode, as configured by `launchType` in the `module.json` file. Depending on the launch type, the action performed when the ability is started differs, as described below.
 
-| Launch Type    | Description    |Description            |
+| Launch Type    | Description    |Action            |
 | ----------- | -------  |---------------- |
 | standard    | Multi-instance  | A new instance is started each time an ability starts.|
-| singleton   | Singleton  | Only one instance exists in the system. If an instance already exists when an ability is started, that instance is reused.|
+| singleton   | Singleton  | The ability has only one instance in the system. If an instance already exists when an ability is started, that instance is reused.|
 | specified   | Instance-specific| The internal service of an ability determines whether to create multiple instances during running.|
 
 By default, the singleton mode is used. The following is an example of the `module.json` file:
@@ -58,7 +58,7 @@ To create Page abilities for an application in the stage model, you must impleme
    ```
    import AbilityStage from "@ohos.application.AbilityStage"
    ```
-2. Implement the `AbilityStage` class.
+2. Implement the `AbilityStage` class. The default relative path generated by the APIs is **entry\src\main\ets\Application\AbilityStage.ts**.
    ```ts
    export default class MyAbilityStage extends AbilityStage {
     onCreate() {
@@ -70,7 +70,7 @@ To create Page abilities for an application in the stage model, you must impleme
    ```js
    import Ability from '@ohos.application.Ability'
    ```
-4. Implement the lifecycle callbacks of the `Ability` class.
+4. Implement the lifecycle callbacks of the `Ability` class. The default relative path generated by the APIs is **entry\src\main\ets\MainAbility\MainAbility.ts**.
 
    In the `onWindowStageCreate(windowStage)` API, use `loadContent` to set the application page to be loaded. For details about how to use the `Window` APIs, see [Window Development](../windowmanager/window-guidelines.md).
    ```ts
@@ -78,29 +78,29 @@ To create Page abilities for an application in the stage model, you must impleme
     onCreate(want, launchParam) {
         console.log("MainAbility onCreate")
     }
-   
+
     onDestroy() {
         console.log("MainAbility onDestroy")
     }
-   
+
     onWindowStageCreate(windowStage) {
         console.log("MainAbility onWindowStageCreate")
-   
-        windowStage.loadContent("pages/index").then((data) => {
-            console.log("MainAbility load content succeed with data: " + JSON.stringify(data))
+
+        windowStage.loadContent("pages/index").then(() => {
+            console.log("MainAbility load content succeed")
         }).catch((error) => {
             console.error("MainAbility load content failed with error: "+ JSON.stringify(error))
         })
     }
-   
+
     onWindowStageDestroy() {
         console.log("MainAbility onWindowStageDestroy")
     }
-   
+
     onForeground() {
         console.log("MainAbility onForeground")
     }
-   
+
     onBackground() {
         console.log("MainAbility onBackground")
     }
@@ -140,14 +140,14 @@ export default class MainAbility extends Ability {
         console.log("MainAbility ability name" + abilityInfo.name)
 
         let config = this.context.config
-        console.log("MyAbilityStage config language" + config.language)
+        console.log("MainAbility config language" + config.language)
     }
 }
 ```
 ### Requesting Permissions
-If an application needs to obtain user privacy information or use system capabilities, for example, obtaining location information or using the camera to take photos or record videos, it must request the permission from consumers. During application development, you need to specify the involved sensitive permissions, declare the required permissions in `module.json`, and use the `requestPermissionsFromUser` API to request the permission from consumers in the form of a dialog box. The following uses the permissions for calendar access as an example.
+If an application needs to obtain user privacy information or use system capabilities, for example, obtaining location information or using the camera to take photos or record videos, it must request the respective permission from consumers. During application development, you need to specify the involved sensitive permissions, declare the required permissions in `module.json`, and use the `requestPermissionsFromUser` API to request the permission from consumers in the form of a dialog box. The following uses the permission for calendar access as an example.
 
-Declare the required permissions in the `module.json` file.
+Declare the required permission in the `module.json` file.
 ```json
 "requestPermissions": [
     {
@@ -155,7 +155,7 @@ Declare the required permissions in the `module.json` file.
     }
 ]
 ```
-Request the permissions from consumers in the form of a dialog box:
+Request the permission from consumers in the form of a dialog box:
 ```ts
 let context = this.context
 let permissions: Array<string> = ['ohos.permission.READ_CALENDAR']
@@ -166,11 +166,11 @@ context.requestPermissionsFromUser(permissions).then((data) => {
 })
 ```
 ### Notifying of Environment Changes
-Environment changes include changes of global configurations and ability configurations. Currently, the global configurations include the system language and color mode. The change of global configurations is generally triggered by the configuration item in **Settings** or the icon in **Control Panel**. The ability configuration is specific to a single `Ability` instance, including the display ID, screen resolution, and screen orientation. The configuration is related to the display where the ability is located, and the change is generally triggered by the window. For details on the configuration, see [Configuration](../reference/apis/js-apis-configuration.md).
+Environment changes include changes of global configurations and ability configurations. Currently, the global configurations include the system language and color mode. The change of global configurations is generally triggered by configuration items in **Settings** or icons in **Control Panel**. The ability configuration is specific to a single `Ability` instance, including the display ID, screen resolution, and screen orientation. The configuration is related to the display where the ability is located, and the change is generally triggered by the window. For details on the configuration, see [Configuration](../reference/apis/js-apis-configuration.md).
 
 For an application in the stage model, when the configuration changes, its abilities are not restarted, but the `onConfigurationUpdated(config: Configuration)` callback is triggered. If the application needs to perform processing based on the change, you can overwrite `onConfigurationUpdated`. Note that the `Configuration` object in the callback contains all the configurations of the current ability, not only the changed configurations.
 
-The following example shows the implement of the `onConfigurationUpdated` callback in the `AbilityStage` class. The callback is triggered when the system language and color mode are changed.  
+The following example shows the implementation of the `onConfigurationUpdated` callback in the `AbilityStage` class. The callback is triggered when the system language and color mode are changed.  
 ```ts
 import Ability from '@ohos.application.Ability'
 import ConfigurationConstant from '@ohos.application.ConfigurationConstant'
@@ -184,7 +184,7 @@ export default class MyAbilityStage extends AbilityStage {
 }
 ```
 
-The following example shows the implement of the `onConfigurationUpdated` callback in the `Ability` class. The callback is triggered when the system language, color mode, or display parameters (such as the direction and density) change.  
+The following example shows the implementation of the `onConfigurationUpdated` callback in the `Ability` class. The callback is triggered when the system language, color mode, or display parameters (such as the direction and density) change.  
 ```ts
 import Ability from '@ohos.application.Ability'
 import ConfigurationConstant from '@ohos.application.ConfigurationConstant'
@@ -205,7 +205,7 @@ export default class MainAbility extends Ability {
 ```
 ## Starting an Ability
 ### Available APIs
-The `Ability` class has the `context` attribute, which belongs to the `AbilityContext` class. The `AbilityContext` class has the `abilityInfo`, `currentHapModuleInfo`, and other attributes and the APIs used for starting abilities. For details, see [AbilityContext](../reference/apis/js-apis-ability-context.md).
+The `Ability` class has the `context` attribute, which belongs to the `AbilityContext` class. The `AbilityContext` class has the `abilityInfo`, `currentHapModuleInfo`, and other attributes as well as the APIs used for starting abilities. For details, see [AbilityContext](../reference/apis/js-apis-ability-context.md).
 
 **Table 3** AbilityContext APIs
 |API|Description|
@@ -227,17 +227,16 @@ var want = {
     "bundleName": "com.example.MyApplication",
     "abilityName": "MainAbility"
 };
-context.startAbility(want).then((data) => {
-    console.log("Succeed to start ability with data: " + JSON.stringify(data))
+context.startAbility(want).then(() => {
+    console.log("Succeed to start ability")
 }).catch((error) => {
     console.error("Failed to start ability with error: "+ JSON.stringify(error))
 })
 ```
 
 ### Starting an Ability on a Remote Device
-This feature applies only to system applications, since the `getTrustedDeviceListSync` API of the `DeviceManager` class is open only to system applications.
+>This feature applies only to system applications, since the `getTrustedDeviceListSync` API of the `DeviceManager` class is open only to system applications.
 In the cross-device scenario, you must specify the ID of the remote device. The sample code is as follows:
-
 ```ts
 let context = this.context
 var want = {
@@ -245,8 +244,8 @@ var want = {
     "bundleName": "com.example.MyApplication",
     "abilityName": "MainAbility"
 };
-context.startAbility(want).then((data) => {
-    console.log("Succeed to start remote ability with data: " + JSON.stringify(data))
+context.startAbility(want).then(() => {
+    console.log("Succeed to start remote ability")
 }).catch((error) => {
     console.error("Failed to start remote ability with error: " + JSON.stringify(error))
 })
@@ -268,9 +267,9 @@ function getRemoteDeviceId() {
     }
 }
 ```
-Request the permission `ohos.permission.DISTRIBUTED_DATASYNC ` from consumers. This permission is used for data synchronization. For details about the sample code for requesting the permission, see [Requesting Permissions](##requesting-permissions).
+Request the permission `ohos.permission.DISTRIBUTED_DATASYNC` from consumers. This permission is used for data synchronization. For details about the sample code for requesting the permission, see [Requesting Permissions](##requesting-permissions).
 ### Starting an Ability with the Specified Page
-If the launch type of an ability is set to `singleton` and the ability has been started, the `onNewWant` callback is triggered when the ability is started again. You can pass start options through the `want`. For example, to start an ability with the specified page, use the `uri` or `parameters` parameter in the `want` to pass the page information. Currently, the ability in the stage model cannot directly use the `router` capability. You must pass the start options to the custom component and invoke the `router` method to display the specified page during the custom component lifecycle management. The sample code is as follows:
+If the launch type of an ability is set to `singleton` and the ability has been started, the `onNewWant` callback rather than the `onCreate` callback is triggered when the ability is started again. You can pass start options through the `want`. For example, to start an ability with the specified page, use the `uri` or `parameters` parameter in the `want` to pass the page information. Currently, the ability in the stage model cannot directly use the `router` capability. You must pass the start options to the custom component and invoke the `router` method to display the specified page during the custom component lifecycle management. The sample code is as follows:
 
 When using `startAbility` to start an ability again, use the `uri` parameter in the `want` to pass the page information.
 ```ts
@@ -312,7 +311,7 @@ struct Index {
     console.info('Index onPageShow')
     let newWant = globalThis.newWant
     if (newWant.hasOwnProperty("uri")) {
-      router.push({ uri: newWant.uri });
+      router.push({ url: newWant.uri });
       globalThis.newWant = undefined
     }
   }

en/application-dev/ability/stage-serviceextension.md

@@ -26,7 +26,7 @@ OpenHarmony does not support creation of a Service Extension ability for third-p
 
 1. Create a Service Extension ability.
 
-2. Customize a class that inherits from **ServiceExtensionAbility** in the .ts file in the directory where the Service Extension ability is defined and override the lifecycle callbacks of the base class. The code sample is as follows:
+2. Customize a class that inherits from **ServiceExtensionAbility** in the .ts file in the directory where the Service Extension ability is defined (**entry\src\main\ets\ServiceExtAbility\ServiceExtAbility.ts** by default) and override the lifecycle callbacks of the base class. The code sample is as follows:
 
   ```js
   import rpc from '@ohos.rpc'

en/application-dev/application-dev-guide-for-gitee.md

@@ -53,8 +53,8 @@ To make you better understand how functions work together and jumpstart your app
 API references encompass all components and APIs available in OpenHarmony, helping you use and integrate APIs more effectively.
 
 They are organized as follows:
--   [Component Reference (JavaScript-based Web-like Development Paradigm)](reference/arkui-js/Readme-EN.md)
 -   [Component Reference (TypeScript-based Declarative Development Paradigm)](reference/arkui-ts/Readme-EN.md)
+-   [Component Reference (JavaScript-based Web-like Development Paradigm)](reference/arkui-js/Readme-EN.md)
 -   APIs
     - [JS and TS APIs](reference/apis/Readme-EN.md)
     - Native APIs

en/application-dev/application-dev-guide.md

@@ -53,8 +53,8 @@ To make you better understand how functions work together and jumpstart your app
 API references encompass all components and APIs available in OpenHarmony, helping you use and integrate APIs more effectively.
 
 They are organized as follows:
--   [Component Reference (JavaScript-based Web-like Development Paradigm)](reference/arkui-js/js-components-common-attributes.md)
 -   [Component Reference (TypeScript-based Declarative Development Paradigm)](reference/arkui-ts/ts-universal-events-click.md)
+-   [Component Reference (JavaScript-based Web-like Development Paradigm)](reference/arkui-js/js-components-common-attributes.md)
 -   [JS and TS APIs](reference/apis/js-apis-DataUriUtils.md)
 -   Native APIs
     -   [Standard Libraries](reference/native-lib/third_party_libc/musl.md)

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

@@ -37,7 +37,7 @@
    "reqPermissions":[
      {
         "name":"ohos.permission.ACCELEROMETER",
-        "reason"":"", 
+        "reason":"", 
         "usedScene":{
          "ability": ["sensor.index.MainAbility",".MainAbility"],
          "when":"inuse"
@@ -45,7 +45,7 @@
      },
      {
         "name":"ohos.permission.GYROSCOPE",
-        "reason"":"", 
+        "reason":"", 
         "usedScene":{
          "ability": ["sensor.index.MainAbility",".MainAbility"],
          "when":"inuse"
@@ -53,7 +53,7 @@
      },
      {
         "name":"ohos.permission.ACTIVITY_MOTION",
-        "reason"":"ACTIVITY_MOTION_TEST", 
+        "reason":"ACTIVITY_MOTION_TEST", 
         "usedScene":{
          "ability": ["sensor.index.MainAbility",".MainAbility"],
          "when":"inuse"
@@ -61,7 +61,7 @@
      },
      {
         "name":"ohos.permission.READ_HEALTH_DATA",
-        "reason"":"HEALTH_DATA_TEST", 
+        "reason":"HEALTH_DATA_TEST", 
         "usedScene":{
          "ability": ["sensor.index.MainAbility",".MainAbility"],
          "when":"inuse"

en/application-dev/media/audio-playback.md

@@ -39,38 +39,38 @@ function printfDescription(obj) {
 
 // Set the player callbacks.
 function setCallBack(audioPlayer) {
-    audioPlayer.on('dataLoad', () => {              // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
+    audioPlayer.on('dataLoad', () => { // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
         console.info('audio set source success');
-        audioPlayer.play();                         // The play() API can be invoked only after the 'dataLoad' event callback is complete. The 'play' event callback is then triggered.
+        audioPlayer.play(); // The play() API can be invoked only after the 'dataLoad' event callback is complete. The 'play' event callback is then triggered.
     });
-    audioPlayer.on('play', () => {                  // Set the 'play' event callback.
+    audioPlayer.on('play', () => { // Set the 'play' event callback.
         console.info('audio play success');
-        audioPlayer.pause();                        // Trigger the 'pause' event callback and pause the playback.
+        audioPlayer.pause(); // Trigger the 'pause' event callback and pause the playback.
     });
-    audioPlayer.on('pause', () => {                 // Set the 'pause' event callback.
+    audioPlayer.on('pause', () => { // Set the 'pause' event callback.
         console.info('audio pause success');
-        audioPlayer.seek(5000);                     // Trigger the 'timeUpdate' event callback, and seek to 5000 ms for playback.
+        audioPlayer.seek(5000); // Trigger the 'timeUpdate' event callback, and seek to 5000 ms for playback.
     });
-    audioPlayer.on('stop', () => {                  // Set the 'stop' event callback.
+    audioPlayer.on('stop', () => { // Set the 'stop' event callback.
         console.info('audio stop success');
-        audioPlayer.reset();                        // Trigger the 'reset' event callback, and reconfigure the src attribute to switch to the next song.
+        audioPlayer.reset(); // Trigger the 'reset' event callback, and reconfigure the src attribute to switch to the next song.
     });
-    audioPlayer.on('reset', () => {                 // Set the 'reset' event callback.
+    audioPlayer.on('reset', () => { // Set the 'reset' event callback.
         console.info('audio reset success');
-        audioPlayer.release();                      // Release the AudioPlayer resources.
+        audioPlayer.release(); // Release the AudioPlayer instance.
         audioPlayer = undefined;
     });
-    audioPlayer.on('timeUpdate', (seekDoneTime) => {// Set the 'timeUpdate' event callback.
+    audioPlayer.on('timeUpdate', (seekDoneTime) => { // Set the 'timeUpdate' event callback.
         if (typeof(seekDoneTime) == 'undefined') {
             console.info('audio seek fail');
             return;
         }
         console.info('audio seek success, and seek time is ' + seekDoneTime);
-        audioPlayer.setVolume(0.5);                 // Trigger the 'volumeChange' event callback.
+        audioPlayer.setVolume(0.5); // Trigger the 'volumeChange' event callback.
     });
-    audioPlayer.on('volumeChange', () => {          // Set the 'volumeChange' event callback.
+    audioPlayer.on('volumeChange', () => { // Set the 'volumeChange' event callback.
         console.info('audio volumeChange success');
-        audioPlayer.getTrackDescription((error, arrlist) => {  // Obtain the audio track information in callback mode.
+        audioPlayer.getTrackDescription((error, arrlist) => { // Obtain the audio track information in callback mode.
             if (typeof (arrlist) != 'undefined') {
                 for (let i = 0; i < arrlist.length; i++) {
                     printfDescription(arrlist[i]);
@@ -78,13 +78,13 @@ function setCallBack(audioPlayer) {
             } else {
                 console.log(`audio getTrackDescription fail, error:${error.message}`);
             }
-            audioPlayer.stop();                      // Trigger the 'stop' event callback to stop the playback.
+            audioPlayer.stop(); // Trigger the 'stop' event callback to stop the playback.
         });
     });
-    audioPlayer.on('finish', () => {                 // Set the 'finish' event callback, which is triggered when the playback is complete.
+    audioPlayer.on('finish', () => { // Set the 'finish' event callback, which is triggered when the playback is complete.
         console.info('audio play finish');
     });
-    audioPlayer.on('error', (error) => {             // Set the 'error' event callback.
+    audioPlayer.on('error', (error) => { // Set the 'error' event callback.
         console.info(`audio error called, errName is ${error.name}`);
         console.info(`audio error called, errCode is ${error.code}`);
         console.info(`audio error called, errMessage is ${error.message}`);
@@ -92,10 +92,10 @@ function setCallBack(audioPlayer) {
 }
 
 async function audioPlayerDemo() {
-    // 1. Create an audioPlayer instance.
+    // 1. Create an AudioPlayer instance.
     let audioPlayer = media.createAudioPlayer();
-    setCallBack(audioPlayer);                          // Set the event callbacks.
-    // 2. Set the URI of the audio file selected by the user.
+    setCallBack(audioPlayer); // Set the event callbacks.
+    // 2. Set the URI of the audio file.
     let fdPath = 'fd://'
     // The stream in the path can be pushed to the device by running the "hdc file send D:\xxx\01.mp3 /data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile" command.
     let path = '/data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile/01.mp3';
@@ -119,23 +119,23 @@ import fileIO from '@ohos.fileio'
 export class AudioDemo {
   // Set the player callbacks.
   setCallBack(audioPlayer) {
-    audioPlayer.on('dataLoad', () => {              // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
+    audioPlayer.on('dataLoad', () => { // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
       console.info('audio set source success');
-      audioPlayer.play();                           // Call the play() API to start the playback and trigger the 'play' event callback.
+      audioPlayer.play(); // Call the play() API to start the playback and trigger the 'play' event callback.
     });
-    audioPlayer.on('play', () => {                  // Set the 'play' event callback.
+    audioPlayer.on('play', () => { // Set the 'play' event callback.
       console.info('audio play success');
     });
-    audioPlayer.on('finish', () => {                // Set the 'finish' event callback, which is triggered when the playback is complete.
+    audioPlayer.on('finish', () => { // Set the 'finish' event callback, which is triggered when the playback is complete.
       console.info('audio play finish');
-      audioPlayer.release();                        // Release the AudioPlayer resources.
+      audioPlayer.release(); // Release the AudioPlayer instance.
       audioPlayer = undefined;
     });
   }
 
   async audioPlayerDemo() {
-    let audioPlayer = media.createAudioPlayer();     // Create an AudioPlayer instance.
-    this.setCallBack(audioPlayer);                   // Set the event callbacks.
+    let audioPlayer = media.createAudioPlayer(); // Create an AudioPlayer instance.
+    this.setCallBack(audioPlayer); // Set the event callbacks.
     let fdPath = 'fd://'
     // The stream in the path can be pushed to the device by running the "hdc file send D:\xxx\01.mp3 /data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile" command.
     let path = '/data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile/01.mp3';
@@ -161,20 +161,20 @@ export class AudioDemo {
 // Set the player callbacks.
   private isNextMusic = false;
   setCallBack(audioPlayer) {
-    audioPlayer.on('dataLoad', () => {              // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
+    audioPlayer.on('dataLoad', () => { // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
       console.info('audio set source success');
-      audioPlayer.play();                           // Call the play() API to start the playback and trigger the 'play' event callback.
+      audioPlayer.play(); // Call the play() API to start the playback and trigger the 'play' event callback.
     });
-    audioPlayer.on('play', () => {                  // Set the 'play' event callback.
+    audioPlayer.on('play', () => { // Set the 'play' event callback.
       console.info('audio play success');
-      audioPlayer.reset();                          // Call the reset() API and trigger the 'reset' event callback.
+      audioPlayer.reset(); // Call the reset() API and trigger the 'reset' event callback.
     });
-    audioPlayer.on('reset', () => {                 // Set the 'reset' event callback.
+    audioPlayer.on('reset', () => { // Set the 'reset' event callback.
       console.info('audio play success');
-      if (!this.isNextMusic) {                      // When isNextMusic is false, changing songs is implemented.
-        this.nextMusic(audioPlayer);                // Changing songs is implemented.
+      if (!this.isNextMusic) { // When isNextMusic is false, changing songs is implemented.
+        this.nextMusic(audioPlayer); // Changing songs is implemented.
       } else {
-        audioPlayer.release();                      // Release the AudioPlayer instance.
+        audioPlayer.release(); // Release the AudioPlayer instance.
         audioPlayer = undefined;
       }
     });
@@ -197,8 +197,8 @@ export class AudioDemo {
   }
 
   async audioPlayerDemo() {
-    let audioPlayer = media.createAudioPlayer();       // Create an AudioPlayer instance.
-    this.setCallBack(audioPlayer);                     // Set the event callbacks.
+    let audioPlayer = media.createAudioPlayer(); // Create an AudioPlayer instance.
+    this.setCallBack(audioPlayer); // Set the event callbacks.
     let fdPath = 'fd://'
     // The stream in the path can be pushed to the device by running the "hdc file send D:\xxx\01.mp3 /data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile" command.
     let path = '/data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile/01.mp3';
@@ -223,19 +223,19 @@ import fileIO from '@ohos.fileio'
 export class AudioDemo {
   // Set the player callbacks.
   setCallBack(audioPlayer) {
-    audioPlayer.on('dataLoad', () => {              // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
+    audioPlayer.on('dataLoad', () => { // Set the 'dataLoad' event callback, which is triggered when the src attribute is set successfully.
       console.info('audio set source success');
-      audioPlayer.loop = true;                      // Set the loop playback attribute.
-      audioPlayer.play();                           // Call the play() API to start the playback and trigger the 'play' event callback.
+      audioPlayer.loop = true; // Set the loop playback attribute.
+      audioPlayer.play(); // Call the play() API to start the playback and trigger the 'play' event callback.
     });
-    audioPlayer.on('play', () => {                  // Sets the 'play' event callback to start loop playback.
+    audioPlayer.on('play', () => { // Set the 'play' event callback to start loop playback.
       console.info('audio play success');
     });
   }
 
   async audioPlayerDemo() {
-    let audioPlayer = media.createAudioPlayer();      // Create an AudioPlayer instance.
-    this.setCallBack(audioPlayer);                    // Set the event callbacks.
+    let audioPlayer = media.createAudioPlayer(); // Create an AudioPlayer instance.
+    this.setCallBack(audioPlayer); // Set the event callbacks.
     let fdPath = 'fd://'
     // The stream in the path can be pushed to the device by running the "hdc file send D:\xxx\01.mp3 /data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile" command.
     let path = '/data/app/el1/bundle/public/ohos.acts.multimedia.audio.audioplayer/ohos.acts.multimedia.audio.audioplayer/assets/entry/resources/rawfile/01.mp3';

en/application-dev/quick-start/Readme-EN.md

@@ -6,10 +6,7 @@
   - [Getting Started with eTS in the Low-Code Approach](start-with-ets-low-code.md)
   - [Getting Started with JavaScript in the Traditional Coding Approach](start-with-js.md)
   - [Getting Started with JavaScript in the Low-Code Approach](start-with-js-low-code.md)
-  
 - Development Fundamentals
   - [Application Package Structure Configuration File (FA Model)](package-structure.md)
   - [Application Package Structure Configuration File (Stage Model)](stage-structure.md)
-  - [Resource File Categories](basic-resource-file-categories.md)
   - [SysCap](syscap.md)
-

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

@@ -99,50 +99,6 @@ Example of the **module.json** file:
                 "resource": "$profile:config_file2"
             }
         ],
-        "metadata": [
-            {
-                "name": "string",
-                "value": "string",
-                "resource": "$profile:config_file1"
-            },
-            {
-                "name": "string",
-                "value": "string",
-                "resource": "$profile:config_file2"
-            }
-        ],
-        "abilities": [
-            {
-                "name": "MainAbility",
-                "srcEntrance" : "./login/MyMainAbility.ts",
-                "description": "$string:description_main_ability",
-                "icon": "$media:icon",
-                "label": "HiMusic",
-                "visible": true,
-                "skills": [
-                    {
-                        "actions": [
-                            "action.system.home"
-                        ],
-                        "entities": [
-                            "entity.system.home"
-                        ],
-                        "uris": [ ]
-                    }
-                ],
-                "backgroundModes": [
-                    "dataTransfer",
-                    "audioPlayback",
-                    "audioRecording",
-                    "location",
-                    "bluetoothInteraction",
-                    "multiDeviceConnection",
-                    "wifiInteraction",
-                    "voip",
-                    "taskKeeping"
-                ],
-            }
-        ],
         "abilities": [
             {
                 "name": "MainAbility",

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

@@ -1141,8 +1141,8 @@ SystemCapability.BundleManager.BundleFramework
 **Example**
 
 ```js
-let bundleName = com.example.myapplication;
-let abilityName = com.example.myapplication.MainAbility;
+let bundleName = "com.example.myapplication";
+let abilityName = "com.example.myapplication.MainAbility";
 bundle.getAbilityIcon(bundleName, abilityName)
 .then((data) => {
     console.info('Operation successful. Data: ' + JSON.stringify(data));
@@ -1176,8 +1176,8 @@ SystemCapability.BundleManager.BundleFramework
 **Example**
 
 ```js
-let bundleName = com.example.myapplication;
-let abilityName = com.example.myapplication.MainAbility;
+let bundleName = "com.example.myapplication";
+let abilityName = "com.example.myapplication.MainAbility";
 bundle.getAbilityIcon(bundleName, abilityName, (err, data) => {
     if (err) {
         console.error('Operation failed. Cause: ' + JSON.stringify(err));

en/application-dev/reference/apis/js-apis-ability-context.md

@@ -126,7 +126,7 @@ var options = {
   windowMode: 0,
 };
 this.context.startAbility(want, options)
-.then((data) => {
+.then(() => {
     console.log('Operation successful.')
 }).catch((error) => {
     console.log('Operation failed.');
@@ -273,7 +273,7 @@ var options = {
 };
 var accountId = 11;
 this.context.startAbility(want, accountId, options)
-.then((data) => {
+.then(() => {
     console.log('Operation successful.')
 }).catch((error) => {
     console.log('Operation failed.');
@@ -352,7 +352,7 @@ Starts an ability with **options** specified. This API uses a promise to return
 | Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
 | want | [Want](js-apis-featureAbility.md#Want) | Yes| Information about the **Want** used for starting an ability.|
-| options | StartOptions | Yes| Parameters used for starting the ability.|
+| options | StartOptions | No | Parameters used for starting the ability.|
 
 **Return value**
 
@@ -511,8 +511,8 @@ Terminates this ability. This API uses a promise to return the result.
 **Example**
 
 ```js
-this.context.terminateSelf(want).then((data) => {
-    console.log('success:' + JSON.stringify(data));
+this.context.terminateSelf(want).then(() => {
+    console.log('success:');
 }).catch((error) => {
     console.log('failed:' + JSON.stringify(error));
 });
@@ -571,7 +571,7 @@ this.context.terminateSelfWithResult(
 {
     want: {bundleName: "com.extreme.myapplication", abilityName: "MainAbilityDemo"},
     resultCode: 100
-}).then((result) => {
+}).then(() => {
     console.log("terminateSelfWithResult")
 })
 ```
@@ -595,7 +595,7 @@ Uses the **AbilityInfo.AbilityType.SERVICE** template to connect this ability to
 
 | Type| Description|
 | -------- | -------- |
-| number | ID of the connection between the two abilities.|
+| number | Result code of the ability connection.|
 
 **Example**
 ```js
@@ -606,7 +606,7 @@ var want = {
 }
 var options = {
   onConnect: (elementName, remote) => {
-    console.log('connectAbility onConnect, elementName: ' + elementName + ', remote: ' remote)
+    console.log('connectAbility onConnect, elementName: ' + elementName + ', remote: ' + remote)
   },
   onDisconnect: (elementName) => {
     console.log('connectAbility onDisconnect, elementName: ' + elementName)
@@ -615,8 +615,8 @@ var options = {
     console.log('connectAbility onFailed, code: ' + code)
   }
 }
-this.context.connectAbility(want, options) {
-  console.log('code: ' + code)
+let result = this.context.connectAbility(want, options) {
+  console.log('code: ' + result)
 }
 ```
 
@@ -652,7 +652,7 @@ var want = {
 var accountId = 111;
 var options = {
   onConnect: (elementName, remote) => {
-    console.log('connectAbility onConnect, elementName: ' + elementName + ', remote: ' remote)
+    console.log('connectAbility onConnect, elementName: ' + elementName + ', remote: ' + remote)
   },
   onDisconnect: (elementName) => {
     console.log('connectAbility onDisconnect, elementName: ' + elementName)
@@ -768,8 +768,8 @@ Sets the label of the ability in the mission. This API uses a promise to return
 **Example**
     
 ```js
-this.context.setMissionLabel("test").then((data) => {
-    console.log('success:' + JSON.stringify(data));
+this.context.setMissionLabel("test").then(() => {
+    console.log('success:');
 }).catch((error) => {
     console.log('failed:' + JSON.stringify(error));
 });

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

 #  	Ability Access Control
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**
+> **NOTE**
+>
 > The initial APIs of this module are supported since API version 8. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
 ## Modules to Import
 
-```
+```js
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 ```
 
@@ -72,6 +73,8 @@ grantUserGrantedPermission(tokenID: number, permissionName: string, permissionFl
 
 Grants a user granted permission to an application. This API uses a promise to return the result.
 
+This is a system API.
+
 **Required permissions**: ohos.permission.GRANT_SENSITIVE_PERMISSIONS
 
 **System capability**: SystemCapability.Security.AccessToken
@@ -109,6 +112,8 @@ grantUserGrantedPermission(tokenID: number, permissionName: string, permissionFl
 
 Grants a user granted permission to an application. This API uses an asynchronous callback to return the result.
 
+This is a system API.
+
 **Required permissions**: ohos.permission.GRANT_SENSITIVE_PERMISSIONS
 
 **System capability**: SystemCapability.Security.AccessToken
@@ -139,6 +144,8 @@ revokeUserGrantedPermission(tokenID: number, permissionName: string, permissionF
 
 Revokes a user granted permission given to an application. This API uses a promise to return the result.
 
+This is a system API.
+
 **Required permissions**: ohos.permission.REVOKE_SENSITIVE_PERMISSIONS
 
 **System capability**: SystemCapability.Security.AccessToken
@@ -175,6 +182,8 @@ revokeUserGrantedPermission(tokenID: number, permissionName: string, permissionF
 
 Revokes a user granted permission given to an application. This API uses an asynchronous callback to return the result.
 
+This is a system API.
+
 **Required permissions**: ohos.permission.REVOKE_SENSITIVE_PERMISSIONS
 
 **System capability**: SystemCapability.Security.AccessToken
@@ -204,6 +213,8 @@ getPermissionFlags(tokenID: number, permissionName: string): Promise<number&g
 
 Obtains the flags of the specified permission of a given application. This API uses a promise to return the result.
 
+This is a system API.
+
 **Required permissions**: ohos.permission.GET_SENSITIVE_PERMISSIONS, GRANT_SENSITIVE_PERMISSIONS, or REVOKE_SENSITIVE_PERMISSIONS
 
 **System capability**: SystemCapability.Security.AccessToken

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

 # Want
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**
-> The initial APIs of this module are supported since API version 8. Newly added APIs will be marked with a superscript to indicate their earliest API version.
-
-**Want** is the basic communication component of the system.
+The **Want** module provides the basic communication component of the system.
 
+> **NOTE**
+> 
+> The initial APIs of this module are supported since API version 8. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
 ## Modules to Import
 
-  
 ```
 import Want from '@ohos.application.Want';
 ```
@@ -20,11 +19,55 @@ import Want from '@ohos.application.Want';
 | Name       | Readable/Writable| Type                | Mandatory| Description                                                        |
 | ----------- | -------- | -------------------- | ---- | ------------------------------------------------------------ |
 | deviceId    | Read only    | string               | No  | ID of the device running the ability.                               |
-| bundleName   | Read only    | string               | No  | Bundle name of the ability. If both **bundleName** and **abilityName** are specified in a **Want** object, the **Want** object can directly match the specified ability.|
-| abilityName  | Read only    | string               | No  | Name of the ability. If both **bundleName** and **abilityName** are specified in a **Want** object, the **Want** object can directly match the specified ability.|
+| bundleName   | Read only    | string               | No  | Bundle name of the ability. If both **bundleName** and **abilityName** are specified in a **Want** object, the **Want** object can match a specific ability.|
+| abilityName  | Read only    | string               | No  | Name of the ability. If both **bundleName** and **abilityName** are specified in a **Want** object, the **Want** object can match a specific ability.|
 | uri          | Read only    | string               | No  | URI information to match. If **uri** is specified in a **Want** object, the **Want** object will match the specified URI information, including **scheme**, **schemeSpecificPart**, **authority**, and **path**.|
-| type         | Read only    | string               | No  | MIME type, for example, **text/plain** or **image/***.  |
-| flags        | Read only    | number               | No  | How the **Want** object will be handled. By default, numbers are passed in. For details, see [flags](js-apis-featureAbility.md#flags).|
+| type         | Read only    | string               | No  | MIME type, for example, **text/plain** or **image/***. |
+| flags        | Read only    | number               | No  | How the **Want** object will be handled. For details, see [flags](js-apis-featureAbility.md#flags).|
 | action      | Read only    | string               | No  | Action option.                          |
-| parameters   | Read only    | {[key: string]: any} | No  | List of parameters in the **Want** object.                                      |
-| entities    | Read only    | Array\<string>       | No  | List of entities.                                   |                              |
+| parameters   | Read only    | {[key: string]: any} | No  | List of parameters in the **Want** object. |
+| entities    | Read only    | Array\<string>       | No  | List of entities.                                   |
+| extensionAbilityType<sup>9+</sup> |  Read only   | bundle.ExtensionAbilityType | No  | Type of the Extension ability.                |
+| extensionAbilityName<sup>9+<sup> | Read only     | string               | No   | Description of the Extension ability name in the **Want** object.                                   |
+
+**Example**
+
+- Basic usage
+
+  ```js
+  var want = {
+        "deviceId": "", // An empty deviceId indicates the local device.
+        "bundleName": "com.extreme.test",
+        "abilityName": "MainAbility",
+        "uri": "pages/second" // uri is optional and can be used to pass the destination URI.
+    };
+    this.context.startAbility(want, (error) => {
+        // Start an ability explicitly. The bundleName, abilityName, and moduleName parameters work together to uniquely identify an ability.
+        console.log("error.code = " + error.code)
+    })
+  ```
+
+- Passing a file descriptor (FD)
+
+  ```js
+  var fd;
+    try {
+        fd = fileio.openSync("/data/storage/el2/base/haps/pic.png");
+    } catch(e) {
+        console.log("openSync fail:" + JSON.stringify(e));
+    }
+    var want = {
+        "deviceId": "", // An empty deviceId indicates the local device.
+        "bundleName": "com.extreme.test",
+        "abilityName": "MainAbility",
+        "parameters": {
+          "keyFd":{"type":"FD", "value":fd}
+        }
+    };
+    this.context.startAbility(want, (error) => {
+        // Start an ability explicitly. The bundleName, abilityName, and moduleName parameters work together to uniquely identify an ability.
+        console.log("error.code = " + error.code)
+    })
+  ```
+
+  
\ No newline at end of file

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

@@ -21,8 +21,8 @@ import Ability from '@ohos.application.Ability';
 | Name| Type| Readable| Writable| Description| 
 | -------- | -------- | -------- | -------- | -------- |
 | context | [AbilityContext](js-apis-ability-context.md) | Yes| No| Context of an ability.| 
-| launchWant | [Want](js-apis-featureAbility.md#Want)| Yes| No| Parameters for starting the ability.| 
-| lastRequestWant | [Want](js-apis-featureAbility.md#Want)| Yes| No| Parameters used when the ability was started last time.| 
+| launchWant | [Want](js-apis-application-want.md)| Yes| No| Parameters for starting the ability.| 
+| lastRequestWant | [Want](js-apis-application-want.md)| Yes| No| Parameters used when the ability was started last time.| 
 
 
 ## Ability.onCreate
@@ -37,7 +37,7 @@ Called to initialize the service logic when an ability is created.
 
   | Name| Type| Mandatory| Description| 
   | -------- | -------- | -------- | -------- |
-  | want | [Want](js-apis-featureAbility.md#Want)| Yes| Information related to this ability, including the ability name and bundle name.| 
+  | want | [Want](js-apis-application-want.md)| Yes| Information related to this ability, including the ability name and bundle name.| 
   | param | AbilityConstant.LaunchParam | Yes| Parameters for starting the ability, and the reason for the last abnormal exit.| 
 
 **Example**
@@ -222,7 +222,7 @@ Called when the ability startup mode is set to singleton.
 
   | Name| Type| Mandatory| Description| 
   | -------- | -------- | -------- | -------- |
-  | want | [Want](js-apis-featureAbility.md#Want)| Yes| Want parameters, such as the ability name and bundle name.| 
+  | want | [Want](js-apis-application-want.md)| Yes| Want parameters, such as the ability name and bundle name.| 
 
 **Example**
     

en/application-dev/reference/apis/js-apis-bundle-AbilityInfo.md

 # AbilityInfo
 
+Unless otherwise specified, ability information is obtained through **GET_BUNDLE_DEFAULT**.
+
 > **NOTE**
 >
 > The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 >
-> API version 9 is a canary version for trial use. The APIs of this version may be unstable.
-
-Provides the ability information. 
+>  API version 9 is a canary version for trial use. The APIs of this version may be unstable. 
 
 ## AbilityInfo
 
- **System capability**: SystemCapability.BundleManager.BundleFramework
+**System capability**: SystemCapability.BundleManager.BundleFramework
 
 | Name                 | Type                                                    | Readable| Writable| Description                                     |
 | --------------------- | -------------------------------------------------------- | ---- | ---- | ----------------------------------------- |
@@ -23,22 +23,23 @@ Provides the ability information.
 | iconId                | number                                                   | Yes  | No  | Ability icon ID.                          |
 | moduleName            | string                                                   | Yes  | No  | Name of the HAP file to which the ability belongs.                 |
 | process               | string                                                   | Yes  | No  | Process in which the ability runs. If this parameter is not set, the bundle name is used.|
-| targetAbility         | string                                                   | Yes  | No  | Target ability that the ability alias points to.             |
-| backgroundModes       | number                                                   | Yes  | No  | Background service mode of the ability.                       |
+| targetAbility         | string                                                   | Yes  | No  | Target ability that the ability alias points to. |
+| backgroundModes       | number                                                   | Yes  | No  | Background service mode of the ability.    |
 | isVisible             | boolean                                                  | Yes  | No  | Whether the ability can be called by other applications.        |
-| formEnabled           | boolean                                                  | Yes  | No  | Whether the ability provides the service widget capability.              |
-| type                  | AbilityType                                              | Yes  | No  | Ability type.                              |
+| formEnabled           | boolean                                                  | Yes  | No  | Whether the ability provides the service widget capability. |
+| type                  | AbilityType                                              | Yes  | No  | Ability type.           |
 | orientation           | DisplayOrientation                                       | Yes  | No  | Ability display orientation.                        |
 | launchMode            | LaunchMode                                               | Yes  | No  | Ability launch mode.                        |
-| permissions           | Array\<string>                                           | Yes  | No  | Permissions required for other applications to call the ability.|
+| permissions           | Array\<string>                                           | Yes  | No  | Permissions required for other applications to call the ability.<br>The value is obtained by passing **GET_ABILITY_INFO_WITH_PERMISSION**.|
 | deviceTypes           | Array\<string>                                           | Yes  | No  | Device types supported by the ability.                    |
 | deviceCapabilities    | Array\<string>                                           | Yes  | No  | Device capabilities required for the ability.                    |
-| readPermission        | string                                                   | Yes  | No  | Permission required for reading the ability data.                |
-| writePermission       | string                                                   | Yes  | No  | Permission required for writing data to the ability.                |
-| applicationInfo       | ApplicationInfo                                          | Yes  | No  | Application configuration information.                       |
-| uri                   | string                                                   | Yes  | No  | URI of the ability.       |
+| readPermission        | string                                                   | Yes  | No  | Permission required for reading the ability data. |
+| writePermission       | string                                                   | Yes  | No  | Permission required for writing data to the ability. |
+| applicationInfo       | ApplicationInfo     | Yes  | No  | Application configuration information.<br>The value is obtained by passing **GET_ABILITY_INFO_WITH_APPLICATION**.|
+| uri                   | string                                                   | Yes  | No  | URI of the ability. |
 | labelId               | number                                                   | Yes  | No  | Ability label ID.                          |
-| subType               | AbilitySubType                                           | Yes  | No  | Subtype of the template that can be used by the ability.          |
-| metaData<sup>8+</sup> | Array\<[CustomizeData](js-apis-bundle-CustomizeData.md)> | Yes  | No  | Custom metadata of the ability.                      |
-| metadata<sup>9+</sup> | Array\<[Metadata](js-apis-bundle-Metadata.md)>           | Yes  | No  | Metadata of the ability.                          |
+| subType               | AbilitySubType                                           | Yes  | No  | Subtype of the template that can be used by the ability. |
+| metaData<sup>8+</sup> | Array\<[CustomizeData](js-apis-bundle-CustomizeData.md)> | Yes  | No  | Custom metadata of the ability.<br>The value is obtained by passing **GET_ABILITY_INFO_WITH_METADATA**.|
+| metadata<sup>9+</sup> | Array\<[Metadata](js-apis-bundle-Metadata.md)>           | Yes  | No  | Metadata of the ability.<br>The value is obtained by passing **GET_ABILITY_INFO_WITH_METADATA**.|
 | enabled<sup>8+</sup>  | boolean                                                  | Yes  | No  | Whether the ability is enabled.                          |
+

en/application-dev/reference/apis/js-apis-bundle-ApplicationInfo.md

 # ApplicationInfo
 
+The **ApplicationInfo** module provides application information. Unless otherwise specified, all attributes are obtained through **GET_BUNDLE_DEFAULT**.
+
 > **NOTE**
-> 
+>
 > The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 >
-> API version 9 is a canary version for trial use. The APIs of this version may be unstable.
-
-Provides the application information. 
+>  API version 9 is a canary version for trial use. The APIs of this version may be unstable. 
 
 ## ApplicationInfo
 
 **System capability**: SystemCapability.BundleManager.BundleFramework
 
-| Name                      | Type                                                        | Readable| Writable| Description                                      |
-| -------------------------- | ------------------------------------------------------------ | ---- | ---- | ------------------------------------------ |
-| name                       | string                                                       | Yes  | No  | Application name.                            |
-| description                | string                                                       | Yes  | No  | Application description.                            |
-| descriptionId              | number                                                       | Yes  | No  | Application description ID.                          |
-| systemApp                  | boolean                                                      | Yes  | No  | Whether the application is a system application. The default value is **false**.       |
-| enabled                    | boolean                                                      | Yes  | No  | Whether the application is enabled. The default value is **true**.      |
-| label                      | string                                                       | Yes  | No  | Application label.                            |
-| labelId                    | string                                                       | Yes  | No  | Application label ID.                          |
-| icon                       | string                                                       | Yes  | No  | Application icon.                            |
-| iconId                     | string                                                       | Yes  | No  | Application icon ID.                          |
-| process                    | string                                                       | Yes  | No  | Process in which the application runs. If this parameter is not set, the bundle name is used.|
-| supportedModes             | number                                                       | Yes  | No  | Running modes supported by the application.                    |
-| moduleSourceDirs           | Array\<string>                                               | Yes  | No  | Relative paths for storing application resources.              |
-| permissions                | Array\<string>                                               | Yes  | No  | Permissions required for accessing the application.                    |
-| moduleInfos                | Array\<[ModuleInfo](js-apis-bundle-ModuleInfo.md)>           | Yes  | No  | Application module information.                        |
-| entryDir                   | string                                                       | Yes  | No  | Path for storing application files.                    |
-| codePath<sup>8+</sup>      | string                                                       | Yes  | No  | Installation directory of the application.                        |
-| metaData<sup>8+</sup>      | Map\<string, Array\<[CustomizeData](js-apis-bundle-CustomizeData.md)>> | Yes  | No  | Custom metadata of the application.                    |
-| metadata<sup>9+</sup>      | Map\<string, Array\<[Metadata](js-apis-bundle-Metadata.md)>> | Yes  | No  | Metadata of the application.                          |
-| removable<sup>8+</sup>     | boolean                                                      | Yes  | No  | Whether the application is removable.                    |
-| accessTokenId<sup>8+</sup> | number                                                       | Yes  | No  | Access token ID of the application.                   |
-| uid<sup>8+</sup>           | number                                                       | Yes  | No  | UID of the application.                             |
-| entityType<sup>8+</sup>    | string                                                       | Yes  | No  | Entity type of the application.                        |
+| Name                      | Type                                                        | Readable| Writable| Description                                                        |
+| -------------------------- | ------------------------------------------------------------ | ---- | ---- | ------------------------------------------------------------ |
+| name                       | string                                                       | Yes  | No  | Application name.                                              |
+| description                | string                                                       | Yes  | No  | Application description.                                              |
+| descriptionId              | number                                                       | Yes  | No  | Application description ID.                                            |
+| systemApp                  | boolean                                                      | Yes  | No  | Whether the application is a system application. The default value is **false**.                         |
+| enabled                    | boolean                                                      | Yes  | No  | Whether the application is enabled. The default value is **true**.                        |
+| label                      | string                                                       | Yes  | No  | Application label.                                              |
+| labelId | string                                                       | Yes  | No  | Application label ID. |
+| icon                       | string                                                       | Yes  | No  | Application icon.                                              |
+| iconId | string                                                       | Yes  | No  | Application icon ID. |
+| process                    | string                                                       | Yes  | No  | Process in which the application runs. If this parameter is not set, the bundle name is used.                  |
+| supportedModes             | number                                                       | Yes  | No  | Running modes supported by the application.                                      |
+| moduleSourceDirs           | Array\<string>                                               | Yes  | No  | Relative paths for storing application resources.                                |
+| permissions                | Array\<string>                                               | Yes  | No  | Permissions required for accessing the application.<br>The value is obtained by passing **GET_APPLICATION_INFO_WITH_PERMISSION**.|
+| moduleInfos                | Array\<[ModuleInfo](js-apis-bundle-ModuleInfo.md)>           | Yes  | No  | Application module information.                                          |
+| entryDir                   | string                                                       | Yes  | No  | Path for storing application files.                                      |
+| codePath<sup>8+</sup>      | string                                                       | Yes  | No  | Installation directory of the application.                                          |
+| metaData<sup>8+</sup>      | Map\<string, Array\<[CustomizeData](js-apis-bundle-CustomizeData.md)>> | Yes  | No  | Custom metadata of the application.<br>The value is obtained by passing **GET_APPLICATION_INFO_WITH_METADATA**.|
+| metadata<sup>9+</sup>      | Map\<string, Array\<[Metadata](js-apis-bundle-Metadata.md)>> | Yes  | No  | Metadata of the application.<br>The value is obtained by passing **GET_APPLICATION_INFO_WITH_METADATA**.|
+| removable<sup>8+</sup>     | boolean                                                      | Yes  | No  | Whether the application is removable.                                      |
+| accessTokenId<sup>8+</sup> | number                                                       | Yes  | No  | Access token ID of the application.                                     |
+| uid<sup>8+</sup>           | number                                                       | Yes  | No  | UID of the application.                                               |
+| entityType<sup>8+</sup>    | string                                                       | Yes  | No  | Entity type of the application.                                          |

en/application-dev/reference/apis/js-apis-bundle-BundleInfo.md

 # BundleInfo
 
+The **BundleInfo** module provides bundle information. Unless otherwise specified, all attributes are obtained through **GET_BUNDLE_DEFAULT**.
+
 > **NOTE**
 >
 > The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 >
-> API version 9 is a canary version for trial use. The APIs of this version may be unstable.
-
-Provides the application bundle information.
+>  API version 9 is a canary version for trial use. The APIs of this version may be unstable. 
 
 ## BundleInfo
 
  **System capability**: SystemCapability.BundleManager.BundleFramework
 
-| Name                             | Type                                                        | Readable| Writable| Description                                      |
-| --------------------------------- | ------------------------------------------------------------ | ---- | ---- | ------------------------------------------ |
-| name                              | string                                                       | Yes  | No  | Bundle name.                              |
-| type                              | string                                                       | Yes  | No  | Bundle type.                                |
-| appId                             | string                                                       | Yes  | No  | ID of the application to which the bundle belongs.                      |
-| uid                               | number                                                       | Yes  | No  | UID of the application to which the bundle belongs.                     |
-| installTime                       | number                                                       | Yes  | No  | Time when the HAP file was installed.                             |
-| updateTime                        | number                                                       | Yes  | No  | Time when the HAP file was updated.                             |
-| appInfo                           | ApplicationInfo         | Yes  | No  | Application configuration information.                        |
-| abilityInfos                      | Array\<[AbilityInfo](js-apis-bundle-AbilityInfo.md)>         | Yes  | No  | Ability configuration information.                         |
-| reqPermissions                    | Array\<string>                                               | Yes  | No  | Permissions to request from the system for running the application.          |
-| reqPermissionDetails              | Array\<[ReqPermissionDetail](#reqpermissiondetail)>          | Yes  | No  | Detailed information of the permissions to request from the system.|
-| vendor                            | string                                                       | Yes  | No  | Vendor of the bundle.                            |
-| versionCode                       | number                                                       | Yes  | No  | Version number of the bundle.                            |
-| versionName                       | string                                                       | Yes  | No  | Version description of the bundle.                  |
-| compatibleVersion                 | number                                                       | Yes  | No  | Earliest SDK version required for running the bundle.           |
-| targetVersion                     | number                                                       | Yes  | No  | Latest SDK version required for running the bundle.             |
-| isCompressNativeLibs              | boolean                                                      | Yes  | No  | Whether to compress the native library of the bundle. The default value is **true**.        |
-| hapModuleInfos                    | Array\<[HapModuleInfo](js-apis-bundle-HapModuleInfo.md)>     | Yes  | No  | Module configuration information.                            |
-| entryModuleName                   | string                                                       | Yes  | No  | Name of the entry module.                           |
-| cpuAbi                            | string                                                       | Yes  | No  | cpuAbi information of the bundle.                        |
-| isSilentInstallation              | string                                                       | Yes  | No  | Whether the application can be installed in silent mode.                          |
-| minCompatibleVersionCode          | number                                                       | Yes  | No  | Earliest version compatible with the bundle in the distributed scenario.        |
-| entryInstallationFree             | boolean                                                      | Yes  | No  | Whether installation-free is supported for the entry module.                       |
-| reqPermissionStates<sup>8+</sup>  | Array\<number>                                               | Yes  | No  | Permission grant state.                        |
-| extensionAbilityInfo<sup>9+</sup> | Array\<[ExtensionAbilityInfo](js-apis-bundle-ExtensionAbilityInfo.md)> | Yes  | No  | Extension ability information.                       |
+| Name                             | Type                                                        | Readable| Writable| Description                                                        |
+| --------------------------------- | ------------------------------------------------------------ | ---- | ---- | ------------------------------------------------------------ |
+| name                              | string                                                       | Yes  | No  | Bundle name.                                                |
+| type                              | string                                                       | Yes  | No  | Bundle type.                                                  |
+| appId                             | string                                                       | Yes  | No  | ID of the application to which the bundle belongs.                                        |
+| uid                               | number                                                       | Yes  | No  | UID of the application to which the bundle belongs.                                       |
+| installTime                       | number                                                       | Yes  | No  | Time when the HAP file was installed.                                               |
+| updateTime                        | number                                                       | Yes  | No  | Time when the HAP file was updated.                                               |
+| appInfo                           | ApplicationInfo         | Yes  | No  | Application configuration information.                                          |
+| abilityInfos                      | Array\<[AbilityInfo](js-apis-bundle-AbilityInfo.md)>         | Yes  | No  | Ability configuration information.<br>The value is obtained by passing **GET_BUNDLE_WITH_ABILITIES**.|
+| reqPermissions                    | Array\<string>                                               | Yes  | No  | Permissions to request from the system for running the application.<br>The value is obtained by passing **GET_BUNDLE_WITH_REQUESTED_PERMISSION**.|
+| reqPermissionDetails              | Array\<[ReqPermissionDetail](#reqpermissiondetail)>          | Yes  | No  | Detailed information of the permissions to request from the system.<br>The value is obtained by passing **GET_BUNDLE_WITH_REQUESTED_PERMISSION**.|
+| vendor                            | string                                                       | Yes  | No  | Vendor of the bundle.                                              |
+| versionCode                       | number                                                       | Yes  | No  | Version number of the bundle.                                              |
+| versionName                       | string                                                       | Yes  | No  | Version description of the bundle.                                    |
+| compatibleVersion                 | number                                                       | Yes  | No  | Earliest SDK version required for running the bundle.                             |
+| targetVersion                     | number                                                       | Yes  | No  | Latest SDK version required for running the bundle.                               |
+| isCompressNativeLibs              | boolean                                                      | Yes  | No  | Whether to compress the native library of the bundle. The default value is **true**.                          |
+| hapModuleInfos                    | Array\<[HapModuleInfo](js-apis-bundle-HapModuleInfo.md)>     | Yes  | No  | Module configuration information.                                              |
+| entryModuleName                   | string                                                       | Yes  | No  | Name of the entry module.                                             |
+| cpuAbi                            | string                                                       | Yes  | No  | CPU and ABI information of the bundle.                                          |
+| isSilentInstallation              | string                                                       | Yes  | No  | Whether the application can be installed in silent mode.                                            |
+| minCompatibleVersionCode          | number                                                       | Yes  | No  | Earliest version compatible with the bundle in the distributed scenario.                          |
+| entryInstallationFree             | boolean                                                      | Yes  | No  | Whether installation-free is supported for the entry module.                                         |
+| reqPermissionStates<sup>8+</sup>  | Array\<number>                                               | Yes  | No  | Permission grant state.                                          |
+| extensionAbilityInfo<sup>9+</sup> | Array\<[ExtensionAbilityInfo](js-apis-bundle-ExtensionAbilityInfo.md)> | Yes  | No  | Extension ability information.<br>The value is obtained by passing **GET_BUNDLE_WITH_EXTENSION_ABILITY**.|
+
+
 
 ## ReqPermissionDetail
 
@@ -51,6 +53,8 @@ Provides the detailed information of the permissions to request from the system.
 | reason                | string                  | Yes  | Yes  | Reason for requesting the permission.  |
 | usedScene             | [UsedScene](#usedscene) | Yes  | Yes  | Application scenario and timing for using the permission.|
 
+
+
 ## UsedScene
 
 Describes the application scenario and timing for using the permission.

en/application-dev/reference/apis/js-apis-bundle-ExtensionAbilityInfo.md

 # ExtensionAbilityInfo
 
+The **ExtensionAbilityInfo** module provides Extension ability information. Unless otherwise specified, all attributes are obtained through **GET_BUNDLE_DEFAULT**.
+
 > **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.
 >
-> API version 9 is a canary version for trial use. The APIs of this version may be unstable.
-
-Provides the Extension ability information.
+>  API version 9 is a canary version for trial use. The APIs of this version may be unstable. 
 
 ## ExtensionAbilityInfo
 
@@ -24,7 +24,7 @@ Provides the Extension ability information.
 | extensionAbilityType | bundle.ExtensionAbilityType                          | Yes  | No  | Type of the Extension ability.                              |
 | permissions          | Array\<string>                                       | Yes  | No  | Permissions required for other applications to call the Extension ability.|
 | applicationInfo      | ApplicationInfo | Yes  | No  | Application information of the Extension ability.                                |
-| metaData             | Array\<[Metadata](js-apis-bundle-Metadata.md)>       | Yes  | No  | Metadata of the Extension ability.                          |
+| metadata             | Array\<[Metadata](js-apis-bundle-Metadata.md)>       | Yes  | No  | Metadata of the Extension ability.                          |
 | enabled              | boolean                                              | Yes  | No  | Whether the Extension ability is enabled.                          |
-| readPermission       | string                                               | Yes  | No  | Permission required for reading the Extension ability data.                |
+| readPermission       | string                                               | Yes  | No  | Permission required for reading data from the Extension ability.                |
 | writePermission      | string                                               | Yes  | No  | Permission required for writing data to the Extension ability.                |

en/application-dev/reference/apis/js-apis-bundle-HapModuleInfo.md

 # HapModuleInfo
 
+The **HapModuleInfo** module provides module information. Unless otherwise specified, all attributes are obtained through **GET_BUNDLE_DEFAULT**.
+
 > **NOTE**
 >
 > The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 >
-> API version 9 is a canary version for trial use. The APIs of this version may be unstable.
-
-Provides the HAP module information.
+>  API version 9 is a canary version for trial use. The APIs of this version may be unstable. 
 
 ## HapModuleInfo
 

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

@@ -1438,4 +1438,4 @@ Defines the **HuksResult** structure.
 | errorCode  | number            | Yes  | Error code.  |
 | outData    | Uint8Array        | No  | Output data.|
 | properties | Array\<HuksParam> | No  | Properties.    |
-| certChains | Array\<string>    | No  | Certificate chain.  |
+| certChains | Array\<string>    | No  | Reserved.  |

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

@@ -4,7 +4,6 @@
 >
 > The initial APIs of this module are supported since API version 6. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
-
 The multimedia subsystem provides a set of simple and easy-to-use APIs for you to access the system and use media resources.
 
 This subsystem offers various media services covering audio and video, which provide the following capabilities:
@@ -61,7 +60,7 @@ Creates a **VideoPlayer** instance in asynchronous mode. This API uses a callbac
 let videoPlayer
 
 media.createVideoPlayer((error, video) => {
-   if (typeof(video) != 'undefined') {
+   if (video != null) {
        videoPlayer = video;
        console.info('video createVideoPlayer success');
    } else {
@@ -90,7 +89,7 @@ Creates a **VideoPlayer** instance in asynchronous mode. This API uses a promise
 let videoPlayer
 
 media.createVideoPlayer().then((video) => {
-   if (typeof(video) != 'undefined') {
+   if (video != null) {
        videoPlayer = video;
        console.info('video createVideoPlayer success');
    } else {
@@ -106,7 +105,7 @@ media.createVideoPlayer().then((video) => {
 createAudioRecorder(): AudioRecorder
 
 Creates an **AudioRecorder** instance to control audio recording.
-Only one **AudioRecorder** instance can be created for a device.
+Only one **AudioRecorder** instance can be created per device.
 
 **System capability**: SystemCapability.Multimedia.Media.AudioRecorder
 
@@ -214,13 +213,13 @@ For details about the audio playback demo, see [Audio Playback Development](../.
 
 **System capability**: SystemCapability.Multimedia.Media.AudioPlayer
 
-| Name       | Type                     | Readable| Writable| Description                                                        |
-| ----------- | ------------------------- | ---- | ---- | ------------------------------------------------------------ |
-| src         | string                    | Yes  | Yes  | Audio media URL. The mainstream video formats (MPEG-4, MPEG-TS, WebM, and MKV) are supported.<br>**Example of supported URIs**:<br>1. FD playback: fd://xx<br>![](figures/en-us_image_url.png)<br>2. HTTP network playback: http://xx<br>3. HTTPS network playback: https://xx<br>4. HLS network playback: http://xx or https://xx<br>**Note**:<br>To use media materials, you must declare the read permission. Otherwise, the media materials cannot be played properly.|
-| loop        | boolean                   | Yes  | Yes  | Whether to loop audio playback. The value **true** means to loop audio playback, and **false** means the opposite.                |
-| currentTime | number                    | Yes  | No  | Current audio playback position.                                        |
-| duration    | number                    | Yes  | No  | Audio duration.                                                  |
-| state       | [AudioState](#audiostate) | Yes  | No  | Audio playback state.                                            |
+| Name                           | Type                               | Readable| Writable| Description                                                        |
+| ------------------------------- | ----------------------------------- | ---- | ---- | ------------------------------------------------------------ |
+| src                             | string                              | Yes  | Yes  | Audio file URI. The mainstream audio formats (MPEG-4, MPEG-TS, WebM, and MKV) are supported.<br>**Examples of supported URI schemes**:<br>1. FD: fd://xx<br>![](figures/en-us_image_url.png)<br>2. HTTP: http://xx<br>3. HTTPS: https://xx<br>4. HLS: http://xx or https://xx<br>**NOTE**<br>To use media materials, you must declare the read permission. Otherwise, the media materials cannot be played properly.|
+| loop                            | boolean                             | Yes  | Yes  | Whether to loop audio playback. The value **true** means to loop audio playback, and **false** means the opposite.                |
+| currentTime                     | number                              | Yes  | No  | Current audio playback position.                      |
+| duration                        | number                              | Yes  | No  | Audio duration.                                |
+| state                           | [AudioState](#audiostate)           | Yes  | No  | Audio playback state. This state cannot be used as the condition for triggering the call of **play()**, **pause()**, or **stop()**.|
 
 ### play<a name=audioplayer_play></a>
 
@@ -308,7 +307,7 @@ Seeks to the specified playback position.
 
 ```js
 audioPlayer.on('timeUpdate', (seekDoneTime) => {    // Set the 'timeUpdate' event callback.
-    if (typeof (seekDoneTime) == 'undefined') {
+    if (seekDoneTime == null) {
         console.info('audio seek fail');
         return;
     }
@@ -381,7 +380,7 @@ function printfDescription(obj) {
 }
 
 audioPlayer.getTrackDescription((error, arrlist) => {
-    if (typeof (arrlist) != 'undefined') {
+    if (arrlist != null) {
         for (let i = 0; i < arrlist.length; i++) {
             printfDescription(arrlist[i]);
         }
@@ -417,7 +416,7 @@ function printfDescription(obj) {
 }
 
 audioPlayer.getTrackDescription().then((arrlist) => {
-    if (typeof (arrlist) != 'undefined') {
+    if (arrlist != null) {
         arrayDescription = arrlist;
     } else {
         console.log('audio getTrackDescription fail');
@@ -492,7 +491,7 @@ audioPlayer.on('reset', () => {               // Set the 'reset' event callback.
     audioPlayer = undefined;
 });
 audioPlayer.on('timeUpdate', (seekDoneTime) => {  // Set the 'timeUpdate' event callback.
-    if (typeof(seekDoneTime) == "undefined") {
+    if (seekDoneTime == null) {
         console.info('audio seek fail');
         return;
     }
@@ -547,7 +546,7 @@ Subscribes to the 'timeUpdate' event.
 
 ```js
 audioPlayer.on('timeUpdate', (seekDoneTime) => {    // Set the 'timeUpdate' event callback.
-    if (typeof (seekDoneTime) == 'undefined') {
+    if (seekDoneTime == null) {
         console.info('audio seek fail');
         return;
     }
@@ -560,7 +559,7 @@ audioPlayer.seek(30000); // Seek to 30000 ms.
 
 on(type: 'error', callback: ErrorCallback): void
 
-Subscribes to the audio playback error event.
+Subscribes to audio playback error events.
 
 **System capability**: SystemCapability.Multimedia.Media.AudioPlayer
 
@@ -588,13 +587,13 @@ Enumerates the audio playback states. You can obtain the state through the **sta
 
 **System capability**: SystemCapability.Multimedia.Media.AudioPlayer
 
-| Name              | Type  | Description          |
-| ------------------ | ------ | -------------- |
-| idle               | string | The audio player is idle.|
-| playing            | string | Audio playback is in progress.|
-| paused             | string | Audio playback is paused.|
-| stopped            | string | Audio playback is stopped.|
-| error<sup>8+</sup> | string | Audio playback is in the error state.    |
+| Name              | Type  | Description                                          |
+| ------------------ | ------ | ---------------------------------------------- |
+| idle               | string | No audio playback is in progress.|
+| playing            | string | Audio playback is in progress.          |
+| paused             | string | Audio playback is paused.         |
+| stopped            | string | Audio playback is stopped.     |
+| error<sup>8+</sup> | string | Audio playback is in the error state.                                    |
 
 ## VideoPlayer<sup>8+</sup>
 
@@ -608,13 +607,13 @@ For details about the video playback demo, see [Video Playback Development](../.
 
 | Name                    | Type                              | Readable| Writable| Description                                                        |
 | ------------------------ | ---------------------------------- | ---- | ---- | ------------------------------------------------------------ |
-| url<sup>8+</sup>         | string                             | Yes  | Yes  | Video media URL. The mainstream video formats (MPEG-4, MPEG-TS, WebM, and MKV) are supported.<br>**Example of supported URIs**:<br>1. FD playback: fd://xx<br>![](figures/en-us_image_url.png)<br>2. HTTP network playback: http://xx<br>3. HTTPS network playback: https://xx<br>4. HLS network playback: http://xx or https://xx<br>**Note**:<br>To use media materials, you must declare the read permission. Otherwise, the media materials cannot be played properly.|
+| url<sup>8+</sup>         | string                             | Yes  | Yes  | Video media URL. The mainstream video formats (MPEG-4, MPEG-TS, WebM, and MKV) are supported.<br>**Example of supported URIs**:<br>1. FD: fd://xx<br>![](figures/en-us_image_url.png)<br>2. HTTP: http://xx<br>3. HTTPS: https://xx<br>4. HLS: http://xx or https://xx<br>**NOTE**<br>To use media materials, you must declare the read permission. Otherwise, the media materials cannot be played properly.|
 | loop<sup>8+</sup>        | boolean                            | Yes  | Yes  | Whether to loop video playback. The value **true** means to loop video playback, and **false** means the opposite.                |
-| currentTime<sup>8+</sup> | number                             | Yes  | No  | Current video playback position.                                        |
-| duration<sup>8+</sup>    | number                             | Yes  | No  | Video duration. The value **-1** indicates the live streaming mode.                              |
+| currentTime<sup>8+</sup> | number                             | Yes  | No  | Current video playback position.                      |
+| duration<sup>8+</sup>    | number                             | Yes  | No  | Video duration. The value **-1** indicates the live mode.            |
 | state<sup>8+</sup>       | [VideoPlayState](#videoplaystate8) | Yes  | No  | Video playback state.                                            |
-| width<sup>8+</sup>       | number                             | Yes  | No  | Video width.                                                    |
-| height<sup>8+</sup>      | number                             | Yes  | No  | Video height.                                                    |
+| width<sup>8+</sup>       | number                             | Yes  | No  | Video width.                                  |
+| height<sup>8+</sup>      | number                             | Yes  | No  | Video height.                                  |
 
 ### setDisplaySurface<sup>8+</sup>
 
@@ -635,7 +634,7 @@ Sets **SurfaceId**. This API uses a callback to return the result.
 
 ```js
 videoPlayer.setDisplaySurface(surfaceId, (err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('setDisplaySurface success!');
     } else {
         console.info('setDisplaySurface fail!');
@@ -691,7 +690,7 @@ Prepares for video playback. This API uses a callback to return the result.
 
 ```js
 videoPlayer.prepare((err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('prepare success!');
     } else {
         console.info('prepare fail!');
@@ -741,7 +740,7 @@ Starts to play video resources. This API uses a callback to return the result.
 
 ```js
 videoPlayer.play((err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('play success!');
     } else {
         console.info('play fail!');
@@ -791,7 +790,7 @@ Pauses video playback. This API uses a callback to return the result.
 
 ```js
 videoPlayer.pause((err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('pause success!');
     } else {
         console.info('pause fail!');
@@ -841,7 +840,7 @@ Stops video playback. This API uses a callback to return the result.
 
 ```js
 videoPlayer.stop((err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('stop success!');
     } else {
         console.info('stop fail!');
@@ -891,7 +890,7 @@ Switches the video resource to be played. This API uses a callback to return the
 
 ```js
 videoPlayer.reset((err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('reset success!');
     } else {
         console.info('reset fail!');
@@ -942,7 +941,7 @@ Seeks to the specified playback position. The next key frame at the specified po
 
 ```js
 videoPlayer.seek((seekTime, err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('seek success!');
     } else {
         console.info('seek fail!');
@@ -970,7 +969,7 @@ Seeks to the specified playback position. This API uses a callback to return the
 
 ```js
 videoPlayer.seek((seekTime, seekMode, err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('seek success!');
     } else {
         console.info('seek fail!');
@@ -1034,7 +1033,7 @@ Sets the volume. This API uses a callback to return the result.
 
 ```js
 videoPlayer.setVolume((vol, err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('setVolume success!');
     } else {
         console.info('setVolume fail!');
@@ -1090,7 +1089,7 @@ Releases the video playback resource. This API uses a callback to return the res
 
 ```js
 videoPlayer.release((err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('release success!');
     } else {
         console.info('release fail!');
@@ -1148,7 +1147,7 @@ function printfDescription(obj) {
 }
 
 videoPlayer.getTrackDescription((error, arrlist) => {
-    if (typeof (arrlist) != 'undefined') {
+    if (arrlist != null) {
         for (let i = 0; i < arrlist.length; i++) {
             printfDescription(arrlist[i]);
         }
@@ -1185,7 +1184,7 @@ function printfDescription(obj) {
 
 let arrayDescription;
 videoPlayer.getTrackDescription().then((arrlist) => {
-    if (typeof (arrlist) != 'undefined') {
+    if (arrlist != null) {
         arrayDescription = arrlist;
     } else {
         console.log('video getTrackDescription fail');
@@ -1217,7 +1216,7 @@ Sets the video playback speed. This API uses a callback to return the result.
 
 ```js
 videoPlayer.setSpeed((speed:number, err) => {
-    if (typeof (err) == 'undefined') {
+    if (err == null) {
         console.info('setSpeed success!');
     } else {
         console.info('setSpeed fail!');
@@ -1353,7 +1352,7 @@ videoPlayer.on('videoSizeChanged', (width, height) => {
 
 on(type: 'error', callback: ErrorCallback): void
 
-Subscribes to the video playback error event.
+Subscribes to video playback error events.
 
 **System capability**: SystemCapability.Multimedia.Media.VideoPlayer
 
@@ -1372,7 +1371,7 @@ videoPlayer.on('error', (error) => {      // Set the 'error' event callback.
     console.info(`video error called, errCode is ${error.code}`);      // Print the error code.
     console.info(`video error called, errMessage is ${error.message}`);// Print the detailed description of the error type.
 });
-videoPlayer.setVolume(3);  // Set volume to an invalid value to trigger the 'error' event.
+videoPlayer.setVolume(3);  //  Set volume to an invalid value to trigger the 'error' event.
 ```
 
 ## VideoPlayState<sup>8+</sup>
@@ -1438,7 +1437,7 @@ function printfItemDescription(obj, key) {
 }
 
 audioPlayer.getTrackDescription((error, arrlist) => {
-    if (typeof (arrlist) != 'undefined') {
+    if (arrlist != null) {
         for (let i = 0; i < arrlist.length; i++) {
             printfItemDescription(arrlist[i], MD_KEY_TRACK_TYPE);  // Print the MD_KEY_TRACK_TYPE value of each track.
         }
@@ -1656,7 +1655,7 @@ audioRecorder.prepare(audioRecorderConfig)
 
 on(type: 'error', callback: ErrorCallback): void
 
-Subscribes to the audio recording error event.
+Subscribes to audio recording error events.
 
 **System capability**: SystemCapability.Multimedia.Media.AudioRecorder
 
@@ -1692,7 +1691,7 @@ Describes audio recording configurations.
 | numberOfChannels      | number                                  | No  | Number of audio channels. The default value is **2**.                                 |
 | format<sup>(deprecated)</sup>                | [AudioOutputFormat](#audiooutputformat) | No  | Audio output format. The default value is **MPEG_4**.<br>**Note**: This parameter is deprecated since API version 8. Use **fileFormat** instead.                        |
 | location              | [Location](#location)                   | No  | Geographical location of the recorded audio.                                        |
-| uri                   | string                                  | Yes  | Audio output URI. Supported: fd://xx (fd number)<br>![](figures/en-us_image_url.png)<br>The file must be created by the caller and granted with proper permissions.|
+| uri                   | string                                  | Yes  | Audio output URI. Supported: fd://xx (fd number)<br>![](figures/en-us_image_url.png) <br>The file must be created by the caller and granted with proper permissions.|
 | audioEncoderMime<sup>8+</sup>      | [CodecMimeType](#codecmimetype8)        | No  | Audio encoding format.          |
 | fileFormat<sup>8+</sup>      | [ContainerFormatType](#containerformattype8)        | No  | Audio encoding format.        |
 

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

@@ -115,7 +115,7 @@ Returns to the previous page or a specified page.
 **Parameters**
 | Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| options | [RouterOptions](#routeroptions) | Yes| Description of the page. The **url** parameter indicates the URL of the page to return to. If the specified page does not exist in the page stack, the application does not respond. If this parameter is not set, the application returns to the previous page.|
+| options | [RouterOptions](#routeroptions) | Yes| Description of the page. The **url** parameter indicates the URL of the page to return to. If the specified page does not exist in the page stack, the application does not respond. If no URL is set, the previous page is returned, and the page in the page stack is not reclaimed. It will be reclaimed after being popped up.|
 
 **Example**
   ```js

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

@@ -21,7 +21,7 @@ getUriSync(name: string): string
 
 Obtains the URI of a data item.
 
-**System capability**: SystemCapability.Applictaions.settings.Core
+**System capability**: SystemCapability.Applications.settings.Core
 
 **Parameters**
 
@@ -49,7 +49,7 @@ getValueSync(dataAbilityHelper: DataAbilityHelper, name: string, defValue: strin
 
 Obtains the value of a data item.
 
-**System capability**: SystemCapability.Applictaions.settings.Core
+**System capability**: SystemCapability.Applications.settings.Core
 
 **Parameters**
 | Name| Type| Mandatory| Description|
@@ -87,7 +87,7 @@ If the specified data item exists in the database, the **setValueSync** method u
 
 **Required permissions**: ohos.permission.WRITE_SYSTEM_SETTING
 
-**System capability**: SystemCapability.Applictaions.settings.Core
+**System capability**: SystemCapability.Applications.settings.Core
 
 **Parameters**
 

en/application-dev/reference/apis/js-apis-system-mediaquery.md

 # Media Query
 
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**
+
+> **NOTE**
 >
 > - The APIs of this module are no longer maintained since API version 7. You are advised to use [`@ohos.mediaquery`](js-apis-mediaquery.md) instead.
 > - The initial APIs of this module are supported since API version 3. Newly added APIs will be marked with a superscript to indicate their earliest API version.
@@ -38,11 +39,7 @@ Creates a **MediaQueryList** object based on the query condition.
 **Example**
 
 ```
-export default {    
-  matchMedia() {        
-    var mMediaQueryList = mediaquery.matchMedia('(max-width: 466)');    
-  },
-}
+var mMediaQueryList = mediaquery.matchMedia('(max-width: 466)');    
 ```
 
 ## MediaQueryEvent
@@ -95,11 +92,16 @@ Adds a listener for this **MediaQueryList** object. The listener must be added b
 
 | Name     | Type                              | Mandatory  | Description            |
 | -------- | -------------------------------- | ---- | -------------- |
-| callback | (event: MediaQueryEvent) => void | Yes   | Callback invoked when the matching condition changes.|
+| callback | (event: MediaQueryEvent) => void | Yes   | Callback invoked when the query condition changes.|
 
 **Example**
 
 ```
+function maxWidthMatch(){
+  if(e.mathes){
+    // do something
+  }
+}
 mMediaQueryList.addListener(maxWidthMatch);
 ```
 
@@ -108,7 +110,7 @@ mMediaQueryList.addListener(maxWidthMatch);
 
 removeListener(callback: (event: MediaQueryEvent) => void): void
 
-Removes the listener for this **MediaQueryList** object.
+Removes the listener for this **MediaQueryList** object. 
 
 **System capability**: SystemCapability.ArkUI.ArkUI.Full
 
@@ -116,10 +118,15 @@ Removes the listener for this **MediaQueryList** object.
 
 | Name     | Type                               | Mandatory  | Description            |
 | -------- | --------------------------------- | ---- | -------------- |
-| callback | (event: MediaQueryEvent) => void) | Yes   | Callback invoked when the matching condition changes.|
+| callback | (event: MediaQueryEvent) => void) | Yes   | Callback invoked when the query condition changes.|
 
 **Example**
 
 ```
+function maxWidthMatch(){
+  if(e.mathes){
+    // do something
+  }
+}
 mMediaQueryList.removeListener(maxWidthMatch);
 ```

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

@@ -7,6 +7,8 @@ This module provides WebGL APIs that correspond to the OpenGL ES 3.0 feature set
 >  **NOTE**
 >
 > The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+>
+> WebGL2 complies with the OpenGL protocol and does not support multi-thread calling.
 
 
 ## Invoking Method

en/application-dev/reference/arkui-ts/ts-basic-components-text.md

 # Text
 
->  **NOTE**<br/>
-> This component is supported since API version 7. Updates will be marked with a superscript to indicate their earliest API version.
-
-
 The **\<Text>** component is used to display a piece of textual information.
 
+>  **NOTE**
+>
+>  This component is supported since API version 7. Updates will be marked with a superscript to indicate their earliest API version.
+
 
 ## Required Permissions
 
@@ -19,12 +19,12 @@ This component can contain the [\<Span>](ts-basic-components-span.md) child comp
 
 ## APIs
 
-Text(content?: string)
+Text(content?: ResourceStr)
 
 - Parameters
   | Name| Type| Mandatory| Default Value| Description|
   | -------- | -------- | -------- | -------- | -------- |
-  | content | string | No| '' | Text content. This parameter does not take effect when the child component **\<Span>** is contained.|
+  | content | [ResourceStr](../../ui/ts-types.md) | No| '' | Text content. This parameter does not take effect when the child component **\<Span>** is contained.|
 
 
 ## Attributes
@@ -32,53 +32,46 @@ Text(content?: string)
 | Name| Type| Default Value| Description|
 | -------- | -------- | -------- | -------- |
 | textAlign | TextAlign | TextAlign.Start | Text alignment mode of multiple lines of text.|
-| textOverflow | {overflow: TextOverflow} | {overflow: TextOverflow.Clip} | Display mode when the text is too long.<br>**NOTE**<br>Text is truncated at the transition between words. To truncate text in the middle of a word, add **\u200B** between characters. |
-| maxLines | number | Infinity | Maximum number of lines in the text.|
-| lineHeight | Length | - | Text line height. If the value is less than or equal to **0**, the line height is not limited and the font size is adaptive. If the value of the number type, the unit fp is used.|
-| decoration | {<br>type: TextDecorationType,<br>color?: Color<br>} | {<br>type: TextDecorationType.None,<br>color: Color.Black<br>} | Style and color of the text decorative line.|
-| baselineOffset | Length | - | Offset of the text baseline.|
+| textOverflow | {overflow: TextOverflow} | {overflow: TextOverflow.Clip} | Display mode when the text is too long.<br>**NOTE**<br/>Text is truncated at the transition between words. To truncate text in the middle of a word, add **\u200B** between characters.<br>This attribute must be used with `maxLines` to take effect. |
+| maxLines | number | Infinity | Maximum number of lines in the text.<br>**NOTE**<br/><br>By default, text is automatically folded. If this parameter is specified, the text does not exceed the specified number of lines. If there is extra text, you can use `textOverflow` to specify the truncation mode.|
+| lineHeight | string \| number \| [Resource](../../ui/ts-types.md) | - | Text line height. If the value is less than or equal to **0**, the line height is not limited and the font size is adaptive. If the value of the number type, the unit fp is used.|
+| decoration | {<br/>type: TextDecorationType,<br/>color? [ResourceColor](../../ui/ts-types.md)<br/>} | {<br/>type: TextDecorationType.None,<br/>color£ºColor.Black<br/>} | Style and color of the text decorative line.|
+| baselineOffset | [Length](../../ui/ts-types.md) | - | Offset of the text baseline.|
 | textCase | TextCase | TextCase.Normal | Text case.|
-| copyOption<sup>9+</sup> | boolean\|CopyOption | false | Whether copy and paste is allowed.|
-
-- TextAlign enums
-  | Name| Description|
-  | -------- | -------- |
-  | Center | The text is center-aligned.|
-  | Start | The text is aligned with the direction in which the text is written.|
-  | End | The text is aligned with the opposite direction in which the text is written.|
-
-- TextOverflow enums
-  | Name| Description|
-  | -------- | -------- |
-  | Clip | Extra text is truncated.|
-  | Ellipsis | An ellipsis (...) is used to represent clipped text.|
-  | None | No truncation or ellipsis is used for extra-long text.|
-
-- TextDecorationType enums
-  | Name| Description|
-  | -------- | -------- |
-  | Underline | Line under the text.|
-  | LineThrough | Line through the text.|
-  | Overline | Line over the text.|
-  | None | No decorative lines.|
-
-- TextCase enums
-  
-  | Name     | Description                |
-  | --------- | -------------------- |
-  | Normal    | The original case of the text is retained.|
-  | LowerCase | All letters in the text are in lowercase.    |
-  | UpperCase | All letters in the text are in uppercase.    |
-  
-- CopyOption<sup>9+</sup> enums
-  
-  | Name| Description|
-  | -------- | -------- |
-  | InApp | Intra-application copy and paste is allowed.|
-  | LocalDevice | Intra-device copy and paste is allowed.|
-  | CrossDevice | Cross-device copy and paste is allowed.|
-
->  **NOTE**<br/>
+
+TextAlign enums
+| Name| Description|
+| -------- | -------- |
+| Center | The text is center-aligned.|
+| Start | The text is aligned with the direction in which the text is written.|
+| End | The text is aligned with the opposite direction in which the text is written.|
+
+## TextOverflow enums
+| Name| Description|
+| -------- | -------- |
+| Clip | Extra text is truncated.|
+| Ellipsis | An ellipsis (...) is used to represent clipped text.|
+| None | No truncation or ellipsis is used for extra-long text.|
+
+## TextDecorationType enums
+| Name| Description|
+| -------- | -------- |
+| Underline | Line under the text.|
+| LineThrough | Line through the text.|
+| Overline | Line over the text.|
+| None | No decorative lines.|
+
+## TextCase enums
+
+| Name     | Description                |
+| --------- | -------------------- |
+| Normal    | The original case of the text is retained.|
+| LowerCase | All letters in the text are in lowercase.    |
+| UpperCase | All letters in the text are in uppercase.    |
+
+
+> **NOTE**
+>
 > If the **\<Text>** component contains both the text and the **\<Span>** child component, only the content in **\<Span>** is displayed.
 
 

en/application-dev/reference/arkui-ts/ts-universal-events-key.md

@@ -25,7 +25,7 @@ None
   | Name | Type | Description |
   | -------- | -------- | -------- |
   | type | [KeyType](#keytype-enums) | Type of a key. |
-  | [keyCode](../apis/js-apis-keycode.md) | number | Key code. |
+  | keyCode | number | Key code. |
   | keyText | string | Key value. |
   | keySource | [KeySource](#keysource-enums) | Type of the input device that triggers the key event. |
   | deviceId | number | ID of the input device that triggers the key event. |