Merge remote-tracking branch 'upstream/master'

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

 # EnterpriseAdminExtensionAbility Development
 
-## Introduction
+## Introduction to EnterpriseAdminExtensionAbility
 
-**EnterpriseAdminExtensionAbility** is essential to a mobile device management (MDM) application. When developing an MDM application for an enterprise, you must inherit the **EnterpriseAdminExtensionAbility** class and have the MDM service logic implemented in an **EnterpriseAdminExtensionAbility** instance. The **EnterpriseAdminExtensionAbility** class provides callbacks for the enable, disable, install, and uninstall events of a device administrator application, implementing notification of system administrator status changes.
+EnterpriseAdminExtensionAbility is a mandatory component for Mobile Device Management (MDM) applications. When developing MDM applications for enterprises, you need to inherit EnterpriseAdminExtensionAbility and implement MDM service logic in the EnterpriseAdminExtensionAbility instance. EnterpriseAdminExtensionAbility implements notifications of system management status changes and defines the callbacks for when a device administrator application is enabled or disabled or an application is installed or uninstalled.
 
 ## Constraints
 
-- ***Function constraints***
+- **Function constraints**
 
-  The APIs provided can be used only by device administrator applications.
+  EnterpriseAdminExtensionAbility is applicable only to enterprise administrator applications.
   
 
-## Scenarios: Listening for the Enable, Disable, Install, and Uninstall Events of a Device Administrator Application
+## Observing Activation/Deactivation of a Device Administrator Application and Installation/Removal of an Application
 
 ### Overview
 
-**onAdminEnabled**: called when the enterprise administrator or employee deploys an MDM application and enables the DeviceAdmin permission for the application. The MDM application can set the initialization policy in the **onAdminEnabled** callback.
+**onAdminEnabled**: When an enterprise administrator or employee deploys an MDM application and activates the device administrator application, this callback is invoked to notify the MDM application that the DeviceAdmin permission is activated. The initialization policy of the MDM application can set in **onAdminEnabled**.
 
-**onAdminDisabled**: called when the system or employee disables the DeviceAdmin permission to notify the enterprise administrator that the device is no longer managed.
+**onAdminDisabled**: When the device administrator application is deactivated, the callback is invoked to notify the MDM application that the DeviceAdmin permission is deactivated.
 
-**onBundleAdded**: called to notify the enterprise administrator that the specified MDM application is installed on the device. In enterprise application administration settings, after the enterprise administrator subscribes to application installation and uninstallation events, the MDM application reports the events through the callbacks.
+**onBundleAdded**: The enterprise administrator can subscribe to application installation and uninstallation events. When an application is installed on an enterprise device, the MDM application reports the event in this callback to notify the enterprise administrator.
 
-**onBundleRemoved**: called to notify the enterprise administrator that the specified MDM application is uninstalled on the device.
+**onBundleRemoved**: When an application is removed from an enterprise device, the MDM application reports the event in this callback to notify the enterprise administrator.
 
 ### Available APIs
 
-| Class                           | API                                 | Description                        |
+| Class                           | API                                       | Description                        |
 | :------------------------------ | ----------------------------------------- | ---------------------------- |
-| EnterpriseAdminExtensionAbility | onAdminDisabled(): void                   | Called when the device administrator application is enabled.|
-| EnterpriseAdminExtensionAbility | onBundleAdded(bundleName: string): void   | Called when the MDM application is installed.            |
-| EnterpriseAdminExtensionAbility | onAdminEnabled(): void                    | Called when the device administrator application is disabled.  |
-| EnterpriseAdminExtensionAbility | onBundleRemoved(bundleName: string): void | Called when the MDM application is uninstalled.            |
+| EnterpriseAdminExtensionAbility | onAdminDisabled(): void                   | Called when a device administrator application is deactivated.|
+| EnterpriseAdminExtensionAbility | onBundleAdded(bundleName: string): void   | Called when an application is installed on a device.            |
+| EnterpriseAdminExtensionAbility | onAdminEnabled(): void                    | Called when a device administrator application is activated.  |
+| EnterpriseAdminExtensionAbility | onBundleRemoved(bundleName: string): void | Called when an application is removed from a device.            |
 
 ### How to Develop
 
-To implement **EnterpriseAdminExtensionAbility**, enable the device administrator application and create an **ExtensionAbility** instance from the code directory of the device administrator application. The procedure is as follows:
+To implement EnterpriseAdminExtensionAbility, you need to activate the device administrator application and create **ExtensionAbility** in the code directory of the device administrator application. The procedure is as follows:
 
 1. In the **ets** directory of the target module, right-click and choose **New > Directory** to create a directory named **EnterpriseExtAbility**.
-2. Right-click the **EnterpriseExtAbility** directory and choose **New > TypeScript File** to create a file named **EnterpriseExtAbility.ts**.
-3. Open the **EnterpriseExtAbility.ts** file and import the **EnterpriseAdminExtensionAbility** module. Customize a class that inherits from **EnterpriseAdminExtensionAbility** and add the required callbacks, such as **onAdminEnabled()** and **onAdminDisabled()**, through which the enterprise administrator can receive notification when the device administrator application is enabled or disabled.
+2. Right-click the **EnterpriseExtAbility** directory, and choose **New > TypeScript File** to create a file named **EnterpriseExtAbility.ts**.
+3. Open the **EnterpriseExtAbility.ts** file and import the **EnterpriseAdminExtensionAbility** module. Inherit the **EnterpriseAdminExtensionAbility** module to the custom class and add application notification callbacks, such as **onAdminEnabled()** and **onAdminDisabled()**. When the device administrator application is activated or deactivated, the device administrator can receive notifications.
 
    ```ts
    import EnterpriseAdminExtensionAbility from '@ohos.enterprise.EnterpriseAdminExtensionAbility';
-   
+
    export default class EnterpriseAdminAbility extends EnterpriseAdminExtensionAbility {
-   
+
        onAdminEnabled() {
            console.info("onAdminEnabled");
        }
-   
+
        onAdminDisabled() {
            console.info("onAdminDisabled");
        }
@@ -56,14 +56,14 @@ To implement **EnterpriseAdminExtensionAbility**, enable the device administrato
        onBundleAdded(bundleName: string) {
            console.info("EnterpriseAdminAbility onBundleAdded bundleName:" + bundleName)
        }
-   
+
        onBundleRemoved(bundleName: string) {
            console.info("EnterpriseAdminAbility onBundleRemoved bundleName" + bundleName)
        }
    };
    ```
 
-4. Register **ServiceExtensionAbility** in the [module.json5](../quick-start/module-configuration-file.md) file of the target module. Among the parameters, set **type** to **enterpriseAdmin** and **srcEntrance** to the code path of the current ExtensionAbility.
+4. Register **ServiceExtensionAbility** in the [**module.json5**](../quick-start/module-configuration-file.md) file corresponding to the project module. Set **type** to **enterpriseAdmin** and **srcEntrance** to the path of the ExtensionAbility code.
 
    ```ts
    "extensionAbilities": [
@@ -78,7 +78,7 @@ To implement **EnterpriseAdminExtensionAbility**, enable the device administrato
 
 ## Example
 
-Use the **subscribeManagedEvent** and **unsubscribeManagedEvent** APIs in the **@ohos.enterprise.adminManager** module to subscribe to and unsubscribe from the application installation and uninstallation event, respectively. After the subscription is successful, the MDM application notifies the enterprise administrator when it is installed or uninstalled on the device.
+Use **subscribeManagedEvent()** and **unsubscribeManagedEvent()** in the **@ohos.enterprise.adminManager** module to subscribe to application installation and removal events. When an application is installed or removed, the MDM application is notified of the event. Then, the MDM application reports the event in the callback to notify the enterprise administrator.
 
 ```ts
   @State managedEvents: Array<adminManager.ManagedEvent> = [0,1]
@@ -108,4 +108,3 @@ Use the **subscribeManagedEvent** and **unsubscribeManagedEvent** APIs in the **
   }
 ```
 
-

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

 # HTTP Data Request
 
-## Use Cases
+## When to Use
 
 An application can initiate a data request over HTTP. Common HTTP methods include **GET**, **POST**, **OPTIONS**, **HEAD**, **PUT**, **DELETE**, **TRACE**, and **CONNECT**.
 
@@ -14,40 +14,49 @@ For details about how to apply for permissions, see [Access Control Development]
 
 The following table provides only a simple description of the related APIs. For details, see [API Reference](../reference/apis/js-apis-http.md).
 
-| API                                       | Description                                               |
-| ----------------------------------------- | --------------------------------------------------------- |
-| createHttp()                              | Creates an HTTP request.                                  |
-| request()                                 | Initiates an HTTP request to a given URL.                 |
-| destroy()                                 | Destroys an HTTP request.                                 |
+| API                                   | Description                           |
+| ----------------------------------------- | ----------------------------------- |
+| createHttp()                              | Creates an HTTP request.                 |
+| request()                                 | Initiates an HTTP request to a given URL.    |
+| request2()<sup>10+</sup>                  | Initiates an HTTP network request based on the URL and returns a streaming response.|
+| destroy()                                 | Destroys an HTTP request.                     |
 | on(type: 'headersReceive')                | Registers an observer for HTTP Response Header events.    |
-| off(type: 'headersReceive')               | Unregisters the observer for HTTP Response Header events. |
+| off(type: 'headersReceive')               | Unregisters the observer for HTTP Response Header events.|
+| once\('headersReceive'\)<sup>8+</sup>     | Registers a one-time observer for HTTP Response Header events.|
+| on\('dataReceive'\)<sup>10+</sup>         | Registers an observer for events indicating receiving of HTTP streaming responses.     |
+| off\('dataReceive'\)<sup>10+</sup>        | Unregisters the observer for events indicating receiving of HTTP streaming responses. |
+| on\('dataEnd'\)<sup>10+</sup>             | Registers an observer for events indicating completion of receiving HTTP streaming responses. |
+| off\('dataEnd'\)<sup>10+</sup>            | Unregisters the observer for events indicating completion of receiving HTTP streaming responses.|
+| on\('dataProgress'\)<sup>10+</sup>        | Registers an observer for events indicating progress of receiving HTTP streaming responses. |
+| off\('dataProgress'\)<sup>10+</sup>       | Unregisters the observer for events indicating progress of receiving HTTP streaming responses.|
 
 ## How to Develop
 
-1. Import the required HTTP module.
-2. Create an **HttpRequest** object.
-3. (Optional) Listen for HTTP Response Header events.
-4. Initiate an HTTP request to a given URL.
-5. (Optional) Process the HTTP Response Header event and the return result of the HTTP request.
+1. Import the **http** namespace from **@ohos.net.http.d.ts**.
+2. Call **createHttp()** to create an **HttpRequest** object.
+3. Call **httpRequest.on()** to subscribe to HTTP response header events. This API returns a response earlier than the request. You can subscribe to HTTP response header events based on service requirements.
+4. Call **httpRequest.request()** to initiate a network request. You need to pass in the URL and optional parameters of the HTTP request.
+5. Parse the returned result based on service requirements.
+6. Call **off()** to unsubscribe from HTTP response header events.
+7. Call **httpRequest.destroy()** to release resources after the request is processed.
 
 ```js
+// Import the http namespace.
 import http from '@ohos.net.http';
 
-// Each HttpRequest corresponds to an HttpRequestTask object and cannot be reused.
+// Each httpRequest corresponds to an HTTP request task and cannot be reused.
 let httpRequest = http.createHttp();
-
-// Subscribe to the HTTP response header, which is returned earlier than HttpRequest. You can subscribe to HTTP Response Header events based on service requirements.
-// on('headerReceive', AsyncCallback) will be replaced by on('headersReceive', Callback) in API version 8. 8+
+// This API is used to listen for the HTTP Response Header event, which is returned earlier than the result of the HTTP request. It is up to you whether to listen for HTTP Response Header events.
+// on('headerReceive', AsyncCallback) is replaced by on('headersReceive', Callback) since API version 8.
 httpRequest.on('headersReceive', (header) => {
     console.info('header: ' + JSON.stringify(header));
 });
-
 httpRequest.request(
-    // Set the URL of the HTTP request. You need to define the URL. Set the parameters of the request in extraData.
+    // Customize EXAMPLE_URL in extraData on your own. It is up to you whether to add parameters to the URL.
     "EXAMPLE_URL",
     {
         method: http.RequestMethod.POST, // Optional. The default value is http.RequestMethod.GET.
-        // You can add the header field based on service requirements.
+        // You can add header fields based on service requirements.
         header: {
             'Content-Type': 'application/json'
         },
@@ -55,21 +64,33 @@ httpRequest.request(
         extraData: {
             "data": "data to send",
         },
-        connectTimeout: 60000, // Optional. The default value is 60000, in ms.
+        expectDataType: http.HttpDataType.STRING, // Optional. This field specifies the type of the return data.
+        usingCache: true, // Optional. The default value is true.
+        priority: 1, // Optional. The default value is 1.
+        connectTimeout: 60000 // Optional. The default value is 60000, in ms.
         readTimeout: 60000, // Optional. The default value is 60000, in ms.
+        usingProtocol: http.HttpProtocol.HTTP1_1, // Optional. The default protocol type is automatically specified by the system.
+        usingProxy: false, // Optional. By default, network proxy is not used. This field is supported since API 10.
     }, (err, data) => {
         if (!err) {
-            // data.result contains the HTTP response. Parse the response based on service requirements.
-            console.info('Result:' + data.result);
-            console.info('code:' + data.responseCode);
-            // data.header contains the HTTP response header. Parse the content based on service requirements.
+            // data.result carries the HTTP response. Parse the response based on service requirements.
+            console.info('Result:' + JSON.stringify(data.result));
+            console.info('code:' + JSON.stringify(data.responseCode));
+            // data.header carries the HTTP response header. Parse the content based on service requirements.
             console.info('header:' + JSON.stringify(data.header));
-            console.info('cookies:' + data.cookies); // 8+
+            console.info('cookies:' + JSON.stringify(data.cookies)); // 8+
         } else {
             console.info('error:' + JSON.stringify(err));
-            // Call the destroy() method to destroy the request if it is no longer needed.
+            // Unsubscribe from HTTP Response Header events.
+            httpRequest.off('headersReceive');
+            // Call the destroy() method to release resources after HttpRequest is complete.
             httpRequest.destroy();
         }
     }
 );
 ```
+
+## Samples
+The following sample is provided to help you better understand how to develop the HTTP data request feature:
+- [`HTTP`: Data Request (ArkTS) (API9)](https://gitee.com/openharmony/applications_app_samples/tree/master/code/BasicFeature/Connectivity/Http)
+- [HTTP Communication (ArkTS) (API9)](https://gitee.com/openharmony/codelabs/tree/master/NetworkManagement/SmartChatEtsOH)

en/application-dev/connectivity/socket-connection.md

@@ -49,6 +49,7 @@ TLS Socket connection functions are mainly provided by the **tls_socket** module
 
 | API| Description|
 | -------- | -------- |
+| constructTLSSocketInstance() | Creates a **TLSSocket** object.|
 | bind() | Binds the IP address and port number.|
 | close(type: 'error') | Closes a Socket connection.|
 | connect() | Sets up a connection to the specified IP address and port number.|
@@ -189,7 +190,7 @@ TLS Socket connection process on the client:
    let tlsTwoWay = socket.constructTLSSocketInstance();
 
    // Subscribe to TLS Socket connection events.
-   tcp.on('message', value => {
+   tlsTwoWay.on('message', value => {
        console.log("on message")
        let buffer = value.message
        let dataView = new DataView(buffer)
@@ -199,10 +200,10 @@ TLS Socket connection process on the client:
        }
        console.log("on connect received:" + str)
    });
-   tcp.on('connect', () => {
+   tlsTwoWay.on('connect', () => {
        console.log("on connect")
    });
-   tcp.on('close', () => {
+   tlsTwoWay.on('close', () => {
        console.log("on close")
    });
 
@@ -245,23 +246,23 @@ TLS Socket connection process on the client:
        console.log(data);
    });
 
-   // Enable the TLS Socket connection to be automatically closed after use. Then, disable listening for TLS Socket connection events.
-   tls.close((err) => {
+   // Enable the TCP Socket connection to be automatically closed after use. Then, disable listening for TCP Socket connection events.
+   tlsTwoWay.close((err) => {
        if (err) {
            console.log("close callback error = " + err);
        } else {
            console.log("close success");
        }
-       tls.off('message');
-       tls.off('connect');
-       tls.off('close');
+       tlsTwoWay.off('message');
+       tlsTwoWay.off('connect');
+       tlsTwoWay.off('close');
    });
 
    // Create a TLS Socket connection (for one-way authentication).
    let tlsOneWay = socket.constructTLSSocketInstance(); // One way authentication
 
    // Subscribe to TLS Socket connection events.
-   tcp.on('message', value => {
+   tlsTwoWay.on('message', value => {
        console.log("on message")
        let buffer = value.message
        let dataView = new DataView(buffer)
@@ -271,10 +272,10 @@ TLS Socket connection process on the client:
        }
        console.log("on connect received:" + str)
    });
-   tcp.on('connect', () => {
+   tlsTwoWay.on('connect', () => {
        console.log("on connect")
    });
-   tcp.on('close', () => {
+   tlsTwoWay.on('close', () => {
        console.log("on close")
    });
 
@@ -306,16 +307,16 @@ TLS Socket connection process on the client:
        console.log(data);
    });
 
-   // Enable the TLS Socket connection to be automatically closed after use. Then, disable listening for TLS Socket connection events.
-   tls.close((err) => {
+   // Enable the TCP Socket connection to be automatically closed after use. Then, disable listening for TCP Socket connection events.
+   tlsTwoWay.close((err) => {
        if (err) {
            console.log("close callback error = " + err);
        } else {
            console.log("close success");
        }
-       tls.off('message');
-       tls.off('connect');
-       tls.off('close');
+       tlsTwoWay.off('message');
+       tlsTwoWay.off('connect');
+       tlsTwoWay.off('close');
    });
 ```
 

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

 # Quick Start
+
 - Getting Started
   - [Before You Start](start-overview.md)
   - [Getting Started with ArkTS in Stage Model](start-with-ets-stage.md)
@@ -17,6 +18,16 @@
       - [Multi-HAP Usage Rules](multi-hap-rules.md)
       - [Multi-HAP Operation Mechanism and Data Communication Modes](multi-hap-principles.md)
     - [Application Installation and Uninstallation Process](application-package-install-uninstall.md)
+    - [Application Package Update Process](application-package-update.md)
+    - Shared Package
+      - [Shared Package Overview](shared-guide.md)
+      - [HAR](har-package.md)
+      - HSP
+        - [In-Application HSP Development](in-app-hsp.md)
+        - [Inter-Application HSP Development (for System Applications Only)](cross-app-hsp.md)
+    - Quick Fix
+      - [Quick Fix Overview](quickfix-principles.md)
+      - [CLI-based Quick Fix Development](quickfix-debug.md)
   - Application Configuration Files in Stage Model
     - [Application Configuration File Overview (Stage Model)](application-configuration-file-overview-stage.md)
     - [app.json5 Configuration File](app-configuration-file.md)

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

 # Application Package Structure in Stage Model
 
 
-To develop an application based on the [stage model](application-configuration-file-overview-stage.md), it is essential to understand the structure of the application package created after the application is built and packaged.
+To develop an application based on the [stage model](application-configuration-file-overview-stage.md), it will be helpful if you have a basic understanding of the structure of the application package created after the application is built and packaged, as well as the related basic concepts.
 
 
-- In development, an application contains one or more modules. You can [create modules](https://developer.harmonyos.com/en/docs/documentation/doc-guides-V3/ohos-adding-deleting-module-0000001218760594-V3) in the application project in [DevEco Studio](https://developer.harmonyos.com/en/develop/deveco-studio/). As a basic functional unit of an OpenHarmony application/service, a module contains source code, resource files, third-party libraries, and application/service configuration files, and can be built and run independently. Modules can be classified as Ability or Library. A module of the Ability type is built into a Harmony Ability Package (HAP) file in .hap format, and a module of the Library type is built into a [Harmony Ability Resources (HAR) file](har-structure.md) in .tgz format.
+- In development, an application contains one or more modules. You can [create modules](https://developer.harmonyos.com/en/docs/documentation/doc-guides-V3/ohos-adding-deleting-module-0000001218760594-V3) in the application project in [DevEco Studio](https://developer.harmonyos.com/en/develop/deveco-studio/). As a basic functional unit of an OpenHarmony application/service, a module contains source code, resource files, third-party libraries, and application/service configuration files, and can be built and run independently. Modules can be classified as Ability or Library. A module of the Ability type is built into a Harmony Ability Package (HAP) file, and a module of the Library type is built into a [Harmony Archive (HAR)](har-package.md) file or a [Harmony Shared Package (HSP)](shared-guide.md).
   A module can contain one or more [UIAbility](../application-models/uiability-overview.md) components, as shown in the figure below.
 
-    **Figure 1** Relationship between modules and UIAbility components
+  **Figure 1** Relationship between modules and UIAbility components
   
   ![ability-and-module](figures/ability-and-module.png)
   
-  Unless otherwise specified, the modules described in this document refer to the modules of the Ability type.
+   Unless otherwise specified, the modules described in this document refer to the modules of the Ability type.
   
 - As aforementioned, you can build an application into one or more HAP files. The HAP file is the basic unit for installing an application. It provides code, resources, third-party libraries, and a configuration file. HAP files can be classified as Entry or Feature.
   - HAP of the entry type: main module of the application, whose **type** field is set to **"entry"** in the [module.json5](module-configuration-file.md) file. In an application, each type of device supports only one HAP of the entry type, which is typically used to implement the application's entry screen, entry icon, or headline feature.
@@ -27,6 +27,6 @@ To develop an application based on the [stage model](application-configuration-f
   - The **module.json** file is the configuration file indispensable in a HAP file. It consists of **module.json5** and **app.json5** in the project configuration. While DevEco Studio provides default configuration, you must modify the configuration as needed. For details about the configuration fields, see [Application Configuration Files in Stage Model](application-configuration-file-overview-stage.md).
   - The **pack.info** file describes the HAP attributes in the bundle, for example, **bundleName** and **versionCode** in **app** and **name**, **type**, and **abilities** in **module**. The file is automatically generated when DevEco Studio generates the bundle.
 
-   **Figure 2** Application package structure in stage model
-
-     ![app-pack-stage](figures/app-pack-stage.png)
+  **Figure 2** Application package structure in stage model
+  
+  ![app-pack-stage](figures/app-pack-stage.png)
\ No newline at end of file

en/application-dev/quick-start/cross-app-hsp.md

+# Inter-Application HSP Development
+
+An inter-application Harmony Shared Package (HSP) is a file used for code and resource sharing between the host application and other applications.
+The host application of an inter-application HSP is a special form of application, which consists of only one HSP. Instead of running independently on a device, the host application runs by being referenced by dependencies of common application modules. When a common application is running, it can invoke capabilities provided by the inter-application HSP dynamically as needed.
+
+## Precautions
+1. The code of an inter-application HSP runs in the application process. When invoking the code, implement an exception capture and fault tolerance mechanism to avoid stability issues caused by malfunctioning of the inter-application HSP.
+2. An application can depend on multiple inter-application HSP files at the same time.
+3. The inter-application HSP may slow down the startup of the application that depends on it. To avoid significant increase in the startup delay, limit the number of inter-application HSP dependencies within 16.
+4. Third-party developers can only use the system-provided inter-application HSP files.
+
+## Inter-Application HSP Usage
+An inter-application HSP works by combining the following parts:
+
+[HAR](har-package.md): contains only objects and methods to be exported and therefore comes in a small size. By integrating the HAR into your application project, you can call the objects and methods therein to implement features.
+
+HSP: contains the actual implementation code, including the JS/TS code, C++ libraries, resources, and configuration files. It is either released to the application market or integrated into the system version.
+
+### Integrating the HAR in an Inter-Application HSP
+Define the interfaces to be exported in the **index.d.ets** file in the HAR, which is the entry to the declaration file exported by the inter-application HSP. The path of the **index.d.ets** file is as follows:
+```
+src
+├── main
+|    └── module.json5
+├── index.d.ets
+└── package.json
+```
+Below is an example of the **index.d.ets** file content:
+```ts
+@Component
+export declare struct UIComponent {
+  build():void;
+}
+
+export declare function hello(): string;
+
+export declare function foo1(): string;
+
+export declare function foo2(): string;
+
+export declare function nativeHello(): string;
+```
+In the example, **UIComponent** is an ArkUI component, **hello()**, **foo1()**, and **foo2()** are TS methods, and **nativeHello()** is an native method. Specific implementation is as follows:
+#### ArkUI Components
+The following is an implementation example of ArkUI components in the HSP:
+```ts
+// lib/src/main/ets/ui/MyUIComponent.ets
+@Component
+export struct UIComponent {
+  @State message: string = 'Hello World'
+  build() {
+    Column() {
+      Text(this.message)
+        .fontSize(32)
+        .padding(8)
+        .fontColor(0xffffff)
+        .backgroundColor(0x0000ff)
+    }.padding(8).width('100%')
+  }
+}
+```
+
+#### **TS Methods**
+The following is an implementation example of TS methods in the HSP:
+```ts
+export function hello(name: string): string {
+  return "hello + " + name;
+}
+
+export function foo1() {
+  return "foo1";
+}
+
+export function foo2() {
+  return "foo2";
+}
+```
+#### **Native Methods**
+The following is an implementation example of native methods in the HSP:
+```C++
+#include "napi/native_api.h"
+#include <js_native_api.h>
+#include <js_native_api_types.h>
+#include <string>
+
+const std::string libname = "liba";
+const std::string version = "v10001";
+
+static napi_value Hello(napi_env env, napi_callback_info info) {
+    napi_value ret;
+    std::string msg = libname + ":native hello, " + version;
+    napi_create_string_utf8(env, msg.c_str(), msg.length(), &ret);
+    return ret;
+}
+
+EXTERN_C_START
+static napi_value Init(napi_env env, napi_value exports) {
+    napi_property_descriptor desc[] = {
+        {"nativeHello", nullptr, Hello, nullptr, nullptr, nullptr, napi_default, nullptr}};
+    napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
+    return exports;
+}
+EXTERN_C_END
+
+static napi_module demoModule = {
+    .nm_version = 1,
+    .nm_flags = 0,
+    .nm_filename = nullptr,
+    .nm_register_func = Init,
+    .nm_modname = "liba",
+    .nm_priv = ((void *)0),
+    .reserved = {0},
+};
+
+extern "C" __attribute__((constructor)) void RegisterLibaModule(void) {
+    napi_module_register(&demoModule);
+}
+```
+### Using the Capabilities Exported from the HAR
+To start with, [configure dependency](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ohos-development-npm-package-0000001222578434#section89674298391) on the HAR. The dependency information will then be generated in the **module.json** file of the corresponding module, as shown in the following:
+```json
+"dependencies": [
+      {
+        "bundleName": "com.share.liba",
+        "moduleName": "liba",
+        "versionCode": 10001
+      }
+]
+```
+In the preceding information, **bundleName**, **moduleName**, and **versionCode** indicate the bundle name, module name, and version number of the inter-application HSP, respectively.
+#### Referencing ArkUI Components in the HAR
+After configuring the dependency on the HAR, you can reference ArkUI components exported from the HAR by using **import**. The sample code is as follows:
+``` ts
+import { UIComponent } from 'liba'
+
+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World'
+  build() {
+    Row() {
+      // Reference the ArkUI component in the HAR.
+      UIComponent()
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```
+
+#### Referencing TS Classes and Methods in the HAR
+To reference the TS classes and methods exported from the HAR, use **import** as follows:
+``` ts
+import { foo1 } from 'liba'
+import { foo2 } from 'liba'
+
+@Component
+struct Index {
+  build() {
+    Row() {
+      Column() {
+        Button('Button')
+          .onClick(()=>{
+            // Reference the TS methods in the HAR.
+            foo1();
+            foo2();
+        })
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```
+#### Referencing Native Methods in the HAR
+To reference the native methods exported from the HAR, use **import** as follows:
+``` ts
+import { nativeHello } from 'liba'
+
+@Component
+struct Index {
+  build() {
+    Row() {
+      Column() {
+        Button('Button')
+          .onClick(()=>{
+            // Reference the native method in the HAR.
+            nativeHello();
+        })
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```
+
+## Inter-Application HSP Distribution
+Inter-application HSPs are not completely integrated into an application. They are distributed by being preset in the system version or installed with an application on the device. To be specific:
+1. Some frequently-used inter-application HSPs are preset in the system version.
+2. When a user downloads an application from the application market, if the application market detects that the application depends on one or more inter-application HSPs and any of these HSPs are not installed on the target device, it will download the application as well as the missing HSPs for the user. In this way, the application can use the features shared through the HSPs properly.
+
+### Inter-Application HSP Debugging Mode
+You can debug an inter-application HSP after it is distributed to a device. If the aforementioned distribution methods are not applicable, you can distribute the HSP by running **bm** commands. The procedure is as follows:
+
+> **NOTE**
+>
+> Do not reverse steps 2 and 3. Otherwise, your application will fail to be installed due to a lack of the required inter-application HSP. For more information about the **bm** commands, see [Bundle Management](../../readme/bundle-management.md).
+
+1. Obtain the inter-application HSP installation package.
+2. Run the following **bm** command to install the inter-application HSP.
+```
+bm install -s sharebundle.hsp
+```
+3. Run the following **bm** command to install the HAP file of your application.
+```
+bm install -p feature.hap
+```
+4. Start your application and start debugging.

en/application-dev/quick-start/har-package.md

+# HAR
+A Harmony Archive (HAR) is a static shared package that can contain code, C++ libraries, resources, and configuration files. It enables modules and projects to share code related to ArkUI components, resources, and more. Unlike a Harmony Ability Package (HAP), a HAR cannot be independently installed on a device. Instead, it can be referenced only as the dependency of an application module.
+
+## Creating a HAR Module
+You can kickstart your HAR module development with the module template of the **Library** type in DevEco Studio. By default, obfuscation is disabled for the HAR module. To enable this feature, set **artifactType** in the **build-profile.json5** file of the HAR module to **obfuscation** as follows:
+
+```json
+{
+  "apiType": "stageMode",
+  "buildOption": {
+      "artifactType": "obfuscation"
+  }
+}
+```
+The value options of **artifactType** are as follows, and the default value is **original**:
+- **original**: Code is not obfuscated.
+- **obfuscation**: Code is obfuscated using Uglify.
+
+When obfuscation is enabled, DevEco Studio compiles, obfuscates, and compresses code during HAR building, thereby protecting your code assets.
+
+> **NOTE**
+>
+> If **artifactType** is set to **obfuscation**, **apiType** must be set to **stageMode**, because obfuscation is available only in the stage model.
+
+## Precautions for HAR Development
+- The HAR does not support the declaration of **abilities** and **extensionAbilities** in its configuration file.
+- The HAR does not support the declaration of pages in its configuration file.
+- The HAR does not support **worker** configuration under **buildOption** in the **build-profile.json5** file.
+- The HAR of the FA model and that of the stage model cannot be referenced by each other.
+- The HAR of the stage model cannot reference content in the **AppScope** folder. This is because the content in the **AppScope** folder is not packaged into the HAR during compilation and building.
+
+## Exporting ArkUI Components, APIs, and Resources of the HAR
+The **index.ets** file acts as the entry of the HAR export declaration file and is where the HAR exports APIs. This file is automatically generated by DevEco Studio by default. You can specify another file as the entry declaration file in the **main** field in the **package.json** file of the module. The code snippet is as follows:
+```json
+{
+  "main": "index.ets"
+}
+```
+### Exporting ArkUI Components
+Use **export** to export the ArkUI components. The code snippet is as follows:
+```js
+// library/src/main/ets/components/MainPage/MainPage.ets
+@Component
+export struct MainPage {
+  @State message: string = 'Hello World'
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```
+In the **index.ets** file, declare the APIs that the HAR exposes to external systems. The code snippet is as follows:
+```js
+// library/index.ets
+export { MainPage } from './src/main/ets/components/MainPage/MainPage'
+```
+### Exporting TS Classes and Methods
+Use **export** to export TS classes and methods. Multiple TS classes and methods can be exported at the same time. The code snippet is as follows:
+```js
+// library/src/main/ts/test.ets
+export class Log {
+    static info(msg) {
+        console.info(msg);
+    }
+}
+
+export function func() {
+  return "har func";
+}
+
+export function func2() {
+  return "har func2";
+}
+```
+In the **index.ets** file, declare the APIs that the HAR exposes to external systems. The code snippet is as follows:
+```js
+// library/index.ets
+export { Log } from './src/main/ts/test'
+export { func } from './src/main/ts/test'
+export { func2 } from './src/main/ts/test'
+```
+### Resources
+Resources are packed into the HAR when it is being compiled and packaged. During compilation and building of a HAP, DevEco Studio collects resource files from the HAP module and its dependent modules. If the resource files of different modules have the same name, DevEco Studio overwrites the resource files based on the following priorities (in descending order):
+- AppScope (supported only by the stage model of API version 9)
+- Modules in the HAP file
+- If resource conflicts occur between dependent HAR modules, they are overwritten based on the dependency sequence. (The module that is higher in the dependency sequence list has higher priority.)
+
+## Referencing ArkUI Components, APIs, and Resources in the HAR
+To start with, [configure dependency](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ohos-development-npm-package-0000001222578434#section89674298391) on the HAR.
+
+### Reference ArkUI Components in the HAR
+
+After configuring the dependency on the HAR, you can reference ArkUI components exported from the HAR by using **import**. The sample code is as follows:
+```js
+// entry/src/main/ets/pages/index.ets
+import { MainPage } from "@ohos/library"
+
+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World'
+  build() {
+    Row() {
+      // Reference the ArkUI component in the HAR.
+      MainPage()
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```
+### Referencing TS Classes and Methods in the HAR
+To reference the TS classes and methods exported from the HAR, use **import** as follows:
+```js
+// entry/src/main/ets/pages/index.ets
+import { Log } from "@ohos/library"
+import { func } from "@ohos/library"
+
+@Entry
+@Component
+struct Index {
+  build() {
+    Row() {
+      Column() {
+        Button('Button')
+          .onClick(()=>{
+            // Reference TS classes and methods in the HAR.
+            Log.info("har msg");
+            func();
+        })
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```
+### Referencing Resources in the HAR
+Use **$r** to reference resources in the HAR. For example, add the **name: hello_har** string (defined in the **string.json** file) and **icon_har.png** image to the **src/main/resources** directory of the HAR module, and then reference the string and image in the entry module. The code snippet is as follows:
+```js
+// entry/src/main/ets/pages/index.ets
+@Entry
+@Component
+struct Index {
+  build() {
+    Row() {
+      Column() {
+        // Reference the string in the HAR.
+        Text($r("app.string.hello_har"))
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+        // Reference the image in the HAR.
+        Image($r("app.media.icon_har"))
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```

en/application-dev/quick-start/in-app-hsp.md

+# In-Application HSP Development
+
+An in-application Harmony Shared Package (HSP) is a file used for code and resource sharing within an application (called the host application) and can only be invoked by a HAP or HSP of the same application.
+The in-application HSP is released with the Application Package (App Pack) of the host application and has the same bundle name and lifecycle as the host application.
+
+## Developing an In-Application HSP
+
+You can kickstart your HSP development with the HSP template in DevEco Studio. In this example, an HSP module named **library** is created. The basic project directory structure is as follows:
+```
+library
+├── src
+│   └── main
+│       ├── ets
+│       │   ├── pages
+│       │   └── index.ets
+│       ├── resources
+│       └── module.json5
+└── package.json
+```
+In the **module.json5** file, set **type** to **shared** for the HSP.
+```json
+{
+    "type": "shared"
+}
+```
+
+The HSP provides capabilities for external systems by exporting APIs in the entry file. Specify the entry file in **main** in the **package.json** file. For example:
+```json
+{
+    "main": "./src/main/ets/index.ets"
+}
+```
+
+### Exporting TS Classes and Methods
+Use **export** to export TS classes and methods. The sample code is as follows:
+```ts
+// library/src/main/ets/utils/test.ts
+export class Log {
+    static info(msg) {
+        console.info(msg);
+    }
+}
+
+export function add(a: number, b: number) {
+  return a + b;
+}
+
+export function minus(a: number, b: number) {
+  return a - b;
+}
+```
+In the entry file **index.ets**, declare the APIs to be exposed.
+```ts
+// library/src/main/ets/index.ets
+export { Log, add, minus } from './utils/test'
+```
+
+### Exporting ArkUI Components
+Use **export** to export ArkUI components. The sample code is as follows:
+```ts
+// library/src/main/ets/components/MyTitleBar.ets
+@Component
+export struct MyTitleBar {
+  build() {
+    Row() {
+      Text($r('app.string.library_title'))
+        .fontColor($r('app.color.white'))
+        .fontSize(25)
+        .margin({left:15})
+    }
+    .width('100%')
+    .height(50)
+    .padding({left:15})
+    .backgroundColor('#0D9FFB')
+  }
+}
+```
+In the entry file **index.ets**, declare the APIs to be exposed.
+```ts
+// library/src/main/ets/index.ets
+export { MyTitleBar } from './components/MyTitleBar'
+```
+#### About Using Resources in the HSP
+To reference resources in the **resources** directory of the current HSP module, use **$r** or **$rawfile**.
+If a relative path is used, the resources in the HSP caller are referenced instead. For example,
+if **Image("common/example.png")** is used in the HSP module, the **\<Image>** component will reference the resource **entry/src/main/ets/common/example.png** in the HSP caller (which is **entry** in this example).
+
+### Exporting Native Methods
+The HSP can contain .so files compiled in C++. The HSP indirectly exports the native method in the .so file. In this example, the **multi** method in the **libnative.so** file is exported.
+```ts
+// ibrary/src/main/ets/utils/nativeTest.ts
+import native from "libnative.so"
+
+export function nativeMulti(a: number, b: number) {
+    return native.multi(a, b);
+}
+```
+
+In the entry file **index.ets**, declare the APIs to be exposed.
+```ts
+// library/src/main/ets/index.ets
+export { nativeMulti } from './utils/nativeTest'
+```
+
+## Using the In-Application HSP
+To use APIs in the HSP, first configure the dependency on the HSP in the **package.json** file of the module that needs to call the APIs (called the invoking module). If the HSP and the invoking module are in the same project, the APIs can be referenced locally. The sample code is as follows:
+```json
+// entry/src/main/module.json5
+"dependencies": {
+    "library": "file:../library"
+}
+```
+You can now call the external APIs of the HSP in the same way as calling the APIs in the HAR.
+In this example, the external APIs are the following ones exported from **library**:
+```ts
+// library/src/main/ets/index.ets
+export { Log, add, minus } from './utils/test'
+export { MyTitleBar } from './components/MyTitleBar'
+export { nativeMulti } from './utils/nativeTest'
+```
+The APIs can be used as follows in the code of the invoking module:
+```ts
+// entry/src/main/ets/pages/index.ets
+import { Log, add, MyTitleBar, nativeMulti } from "library"
+
+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World'
+  build() {
+    Row() {
+      Column() {
+        MyTitleBar()
+        Text(this.message)
+          .fontSize(30)
+          .fontWeight(FontWeight.Bold)
+        Button('add(1, 2)')
+          .onClick(()=>{
+            Log.info("add button click!");
+            this.message = "result: " + add(1, 2);
+          })
+        Button('nativeMulti(3, 4)')
+          .onClick(()=>{
+            Log.info("nativeMulti button click!");
+            this.message = "result: " + nativeMulti(3, 4);
+          })
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
+```

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

@@ -487,11 +487,12 @@ Example of the **extensionAbilities** structure:
 
 ## requestPermissions
 
-The **requestPermissions** tage represents a set of permissions that the application needs to request from the system for running correctly.
+The **requestPermissions** tag represents a set of permissions that the application needs to request from the system for running correctly.
 
 > **NOTE**
 >
-> The permission settings configured in the **requestPermissions** tag apply to the entire application.
+> - The permission settings configured in the **requestPermissions** tag apply to the entire application.
+> - If your application needs to subscribe to an event published by itself and the permissions required for accessing the application are set in the **permissions** tag under **extensionAbilities**, then the application must register the related permissions in the **requestPermissions** tag to receive the event.
 
 **Table 8** requestPermissions
 

en/application-dev/quick-start/shared-guide.md

+# Shared Package Overview
+
+OpenHarmony provides two types of shared packages: [Harmony Achive (HAR)](har-package.md) static shared package and Harmony Shared Package (HSP) dynamic shared package.
+
+Both the HAR and HSP are used to share code and resources and can contain code, C++ libraries, resources, and configuration files. The biggest differences between them are as follows: The code and resources in the HAR are compiled with the invoking module, and if there are multiple invoking modules, the build product contains multiple copies of the same code and resources; the code and resources in the HSP can be compiled independently, and the build product contains only one copy of the code and resources.
+
+**Figure 1** HAR and HSP in the App Pack
+
+![in-app-hsp-har](figures/in-app-hsp-har.png)
+
+The HSP is designed to solve the following issues with the HAR:
+- When multiple HAPs reference the same HAR, the size of the App Pack swells.
+- When multiple HAPs reference the same HAR, some state variables in the HAR cannot be shared.
+
+Restrictions on the HSP:
+- The HSP and its invoking modules must be in the stage model.
+- The HSP and its invoking modules must use the **esmodule **compilation mode.
+- The HSP does not support the declaration of **abilities** and **extensionAbilities** in its configuration file.
+
+The HSP can be classified as [in-application HSP](in-app-hsp.md) or [inter-application HSP](cross-app-hsp.md), depending on the configuration files and usage methods.

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

@@ -237,6 +237,7 @@
   - [@ohos.file.environment (Directory Environment Capability)](js-apis-file-environment.md)
   - [@ohos.file.fileAccess (User File Access and Management)](js-apis-fileAccess.md)
   - [@ohos.file.fileExtensionInfo (User File Extension Information)](js-apis-fileExtensionInfo.md)
+  - [@ohos.file.fileUri (File URI)](js-apis-file-fileUri.md)
   - [@ohos.file.fs (File Management)](js-apis-file-fs.md)
   - [@ohos.file.hash (File Hash Processing)](js-apis-file-hash.md)
   - [@ohos.file.picker (Picker)](js-apis-file-picker.md)
@@ -245,6 +246,7 @@
   - [@ohos.file.storageStatistics (Application Storage Statistics)](js-apis-file-storage-statistics.md)
   - [@ohos.file.volumeManager (Volume Management)](js-apis-file-volumemanager.md)
   - [@ohos.filemanagement.userFileManager (User Data Management)](js-apis-userFileManager.md)
+  - [@ohos.fileShare (File Sharing)](js-apis-fileShare.md)
 
 - Telephony Service
   - [@ohos.contact (Contacts)](js-apis-contact.md)

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

@@ -105,3 +105,55 @@ export default class EnterpriseAdminAbility extends EnterpriseAdminExtensionAbil
   }
 };
 ```
+
+## EnterpriseAdminExtensionAbility.onAppStart<sup>10+</sup>
+
+onAppStart(bundleName: string): void
+
+Called when an application is started.
+
+**System capability**: SystemCapability.Customization.EnterpriseDeviceManager
+
+**System API**: This is a system API.
+
+**Parameters**
+
+| Parameter  | Type                                 | Mandatory  | Description     |
+| ----- | ----------------------------------- | ---- | ------- |
+| bundleName | string | Yes   | Bundle name of the application started.|
+
+**Example**
+
+```ts
+export default class EnterpriseAdminAbility extends EnterpriseAdminExtensionAbility {
+  onAppStart(bundleName: string) {
+    console.log("started bundle name: " + bundleName);
+  }
+};
+```
+
+## EnterpriseAdminExtensionAbility.onAppStop<sup>10+</sup>
+
+onAppStop(bundleName: string): void
+
+Called when an application is stopped.
+
+**System capability**: SystemCapability.Customization.EnterpriseDeviceManager
+
+**System API**: This is a system API.
+
+**Parameters**
+
+| Parameter  | Type                                 | Mandatory  | Description     |
+| ----- | ----------------------------------- | ---- | ------- |
+| bundleName | string | Yes   | Bundle name of the application stopped.|
+
+**Example**
+
+```ts
+export default class EnterpriseAdminAbility extends EnterpriseAdminExtensionAbility {
+  onAppStop(bundleName: string) {
+    console.log("stopped bundle name: " + bundleName);
+  }
+};
+```

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

@@ -18,7 +18,7 @@ import batteryStats from '@ohos.batteryStatistics';
 
 getBatteryStats(): Promise<Array&lt;BatteryStatsInfo&gt;>
 
-Obtains the power consumption information list, using a promise to return the result.
+Obtains the power consumption information list. This API uses a promise to return the result.
 
 **System API**: This is a system API.
 
@@ -34,9 +34,9 @@ Obtains the power consumption information list, using a promise to return the re
 
 For details about the error codes, see [Thermal Manager Error Codes](../errorcodes/errorcode-batteryStatistics.md).
 
-| Code| Error Message      |
-| -------- | -------------- |
-| 4600101  | Operation failed. Cannot connect to service.|
+| Code  | Error Message   |
+|---------|---------|
+| 4600101 | Operation failed. Cannot connect to service.|
 
 **Example**
 
@@ -64,15 +64,15 @@ Obtains the power consumption information list. This API uses an asynchronous ca
 
 | Name  | Type                                                       | Mandatory| Description                                                        |
 | -------- | ----------------------------------------------------------- | ---- | ------------------------------------------------------------ |
-| callback | AsyncCallback<Array<[BatteryStatsInfo](#batterystatsinfo)>> | Yes  | Callback used to return the result. If the operation is successful, **err** is **undefined** and **data** is the array of power consumption information obtained. If the operation failed, **err** is an error object.|
+| callback | AsyncCallback<Array<[BatteryStatsInfo](#batterystatsinfo)>> | Yes  | Callback used to return the result. If the operation is successful, **err** is **undefined** and **data** is the array of power consumption information obtained (that is, **Array<[BatteryStatsInfo](#batterystatsinfo)>>**). If the operation failed, **err** is an error object.|
 
 **Error codes**
 
 For details about the error codes, see [Thermal Manager Error Codes](../errorcodes/errorcode-batteryStatistics.md).
 
-| Code| Error Message      |
-| -------- | -------------- |
-| 4600101  | Operation failed. Cannot connect to service.|
+| Code  | Error Message   |
+|---------|---------|
+| 4600101 | Operation failed. Cannot connect to service.|
 
 **Example**
 
@@ -112,9 +112,9 @@ Obtains the power consumption of an application.
 
 For details about the error codes, see [Thermal Manager Error Codes](../errorcodes/errorcode-batteryStatistics.md).
 
-| Code| Error Message      |
-| -------- | -------------- |
-| 4600101  | Operation failed. Cannot connect to service.|
+| Code  | Error Message   |
+|---------|---------|
+| 4600101 | Operation failed. Cannot connect to service.|
 
 **Example**
 
@@ -153,9 +153,9 @@ Obtains the proportion of the power consumption of an application.
 
 For details about the error codes, see [Thermal Manager Error Codes](../errorcodes/errorcode-batteryStatistics.md).
 
-| Code| Error Message      |
-| -------- | -------------- |
-| 4600101  | Operation failed. Cannot connect to service.|
+| Code  | Error Message   |
+|---------|---------|
+| 4600101 | Operation failed. Cannot connect to service.|
 
 **Example**
 
@@ -194,16 +194,16 @@ Obtains the power consumption of a hardware unit according to the consumption ty
 
 For details about the error codes, see [Thermal Manager Error Codes](../errorcodes/errorcode-batteryStatistics.md).
 
-| Code| Error Message      |
-| -------- | -------------- |
-| 4600101  | Operation failed. Cannot connect to service.|
+| Code  | Error Message   |
+|---------|---------|
+| 4600101 | Operation failed. Cannot connect to service.|
 
 **Example**
 
 ```js
 try {
     var value = batteryStats.getHardwareUnitPowerValue(ConsumptionType.CONSUMPTION_TYPE_SCREEN);
-    console.info('battery statistics percent of hardware is: ' + percent);
+    console.info('battery statistics value of hardware is: ' + value);
 } catch(err) {
     console.error('get battery statistics percent of hardware failed, err: ' + err);
 }
@@ -235,15 +235,15 @@ Obtains the proportion of the power consumption of a hardware unit according to
 
 For details about the error codes, see [Thermal Manager Error Codes](../errorcodes/errorcode-batteryStatistics.md).
 
-| Code| Error Message      |
-| -------- | -------------- |
-| 4600101  | Operation failed. Cannot connect to service.|
+| Code  | Error Message   |
+|---------|---------|
+| 4600101 | Operation failed. Cannot connect to service.|
 
 **Example**
 
 ```js
 try {
-    var value = batteryStats.getHardwareUnitPowerPercent(ConsumptionType.CONSUMPTION_TYPE_SCREEN);
+    var percent = batteryStats.getHardwareUnitPowerPercent(ConsumptionType.CONSUMPTION_TYPE_SCREEN);
     console.info('battery statistics percent of hardware is: ' + percent);
 } catch(err) {
     console.error('get battery statistics percent of hardware failed, err: ' + err);

en/application-dev/reference/apis/js-apis-enterprise-adminManager.md

@@ -953,5 +953,7 @@ Enumerates the system management events that can be subscribed to.
 
 | Name                       | Value | Description          |
 | -------------------------- | ---- | ------------- |
-| MANAGED_EVENT_BUNDLE_ADDED | 0    | Application installation event.|
-| MANAGED_EVENT_BUNDLE_REMOVED | 1  | Application uninstallation event.|
+| MANAGED_EVENT_BUNDLE_ADDED | 0    | Bundle added.|
+| MANAGED_EVENT_BUNDLE_REMOVED | 1  | Bundle removed.|
+| MANAGED_EVENT_APP_START | 2    | Application started.|
+| MANAGED_EVENT_APP_STOP | 3  | Application stopped.|

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

+# @ohos.file.fileUri (File URI)
+
+The **fileUri** module allows the uniform resource identifier (URI) of a file to be obtained based on the file path. With the file URI, you can use the APIs provided by [@ohos.file.fs](js-apis-file-fs.md) to operate the file.
+
+> **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.
+
+## Modules to Import
+
+```js
+import fileUri from "@ohos.file.fileUri";
+```
+
+Before using this module, you need to obtain the path of the file in the application sandbox. The following is an example:
+
+ ```js
+import UIAbility from '@ohos.app.ability.UIAbility';
+
+export default class EntryAbility extends UIAbility {
+    onWindowStageCreate(windowStage) {
+        let context = this.context;
+        let pathDir = context.filesDir;
+    }
+}
+ ```
+
+## fileUri.getUriFromPath
+
+getUriFromPath(path: string): string
+
+Obtains the URI of a file in synchronous mode.
+
+**System capability**: SystemCapability.FileManagement.AppFileService
+
+**Parameters**
+
+| Name| Type  | Mandatory| Description                      |
+| ------ | ------ | ---- | -------------------------- |
+| path   | string | Yes  | Path of the file in the application sandbox.|
+
+**Return value**
+
+| Type                          | Description        |
+| ---------------------------- | ---------- |
+| string | File URI obtained.|
+
+**Error codes** 
+
+For details about the error codes, see [File Management Error Codes](../errorcodes/errorcode-filemanagement.md).
+| ID                    | Error Message       |
+| ---------------------------- | ---------- |
+| 401 | The input parameter is invalid |
+
+
+**Example**
+
+  ```js
+let filePath = pathDir + "test.txt";
+let uri = fileUri.getUriFromPath(filePath);
+  ```

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

+# @ohos.fileShare (File Sharing)
+
+The **fileShare** module provides APIs for granting the access permissions on a user file to another application by the Uniform Resource Identifier (URI). Then, the authorized application can access the file by using the APIs provided by [@ohos.file.fs](js-apis-file-fs.md).
+
+> **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.
+
+## Modules to Import
+
+```js
+import fileShare from '@ohos.fileShare';
+```
+
+## fileShare.grantUriPermission
+
+grantUriPermission(uri: string, bundleName: string, mode: number, callback: AsyncCallback<void>): void
+
+Grants permissions on a user file by the URI to an application. This API uses an asynchronous callback to return the result.
+
+**Required permissions**: ohos.permission.WRITE_MEDIA 
+
+**System API**: This is a system API. 
+
+**System capability**: SystemCapability.FileManagement.AppFileService
+
+**Parameters**
+
+| Name| Type  | Mandatory| Description                      |
+| ------ | ------ | ---- | -------------------------- |
+| uri   | string | Yes  | URI of a user file.|
+| bundleName   | string | Yes  | Bundle name of the application to be grated with the permissions.|
+| mode   | number | Yes  | Permissions to grant. For details, see [wantConstant.Flags](js-apis-app-ability-wantConstant.md#wantconstantflags).<br>**wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION**: permission to read the file. <br>**wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION**: permission to write the file.|
+| callback | AsyncCallback&lt;void&gt;  | Yes   | Callback invoked to return the result.                            |
+
+**Error codes**
+
+For details about the error codes, see [File Management Error Codes](../errorcodes/errorcode-filemanagement.md).
+
+| ID                    | Error Message       |
+| ---------------------------- | ---------- |
+| 201 | Permission verification failed |
+| 202 | The caller is not a system application |
+| 401 | The input parameter is invalid |
+| 143000001 | IPC error |
+
+
+**Example**
+
+  ```js
+import wantConstant from '@ohos.app.ability.wantConstant';
+
+
+let uri = 'datashare:///media/image/8';
+let bundleName = 'com.demo.test';
+try {
+    fileShare.grantUriPermission(uri, bundleName, wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION | wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION, (err) => {
+        if (err) {
+            console.error("grantUriPermission failed with error: " + err);
+            return;
+        }
+        console.info("grantUriPermission success!");
+    });
+} catch (error) {
+    console.error("grantUriPermission failed with error:" + error);
+}
+  ```
+
+
+## fileShare.grantUriPermission
+
+grantUriPermission(uri: string, bundleName: string, mode: number): Promise&lt;void&gt;
+
+Grants permissions on a user file by the URI to an application. This API uses a promise to return the result.
+
+**Required permissions**: ohos.permission.WRITE_MEDIA 
+
+**System API**: This is a system API. 
+
+**System capability**: SystemCapability.FileManagement.AppFileService 
+
+**Parameters**
+
+| Name| Type  | Mandatory| Description                      |
+| ------ | ------ | ---- | -------------------------- |
+| uri   | string | Yes  | URI of a user file.|
+| bundleName   | string | Yes  | Bundle name of the application to be grated with the permissions.|
+| mode   | number | Yes  | Permissions to grant. For details, see [wantConstant.Flags](js-apis-app-ability-wantConstant.md#wantconstantflags).<br>**wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION**: permission to read the file. <br>**wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION**: permission to write the file.|
+
+**Return value**
+
+| Type                          | Description        |
+| ---------------------------- | ---------- |
+| Promise&lt;void&gt; | Promise that returns no value.|
+
+
+**Error codes**
+
+For details about the error codes, see [File Management Error Codes](../errorcodes/errorcode-filemanagement.md).
+
+| ID                    | Error Message       |
+| ---------------------------- | ---------- |
+| 201 | Permission verification failed |
+| 202 | The caller is not a system application |
+| 401 | The input parameter is invalid |
+| 143000001 | IPC error |
+
+
+**Example**
+
+  ```js
+import wantConstant from '@ohos.app.ability.wantConstant';
+
+let uri = 'datashare:///media/image/8';
+let bundleName = 'com.demo.test';
+try {
+    fileShare.grantUriPermission(uri, bundleName, wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION |
+      wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION).then(function () {
+        console.info("grantUriPermission success!");
+    }).catch(function (error) {
+        console.error("grantUriPermission failed with error:" + error);
+    });
+} catch (error) {
+    console.error("grantUriPermission failed with error:" + error);
+}
+  ```

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

 # @ohos.hiAppEvent (Application Event Logging)
 
-The HiAppEvent module provides the application event logging functions, such as writing application events to the event file and managing the event logging configuration.
+The **hiAppEvent** module provides the application event logging functions, such as writing application events to the event file and managing the event logging configuration.
 
 > **NOTE**
+>
 > - The APIs provided by this module are deprecated since API version 9. You are advised to use [`@ohos.hiviewdfx.hiAppEvent`](js-apis-hiviewdfx-hiappevent.md) instead.
 > - 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.
 
@@ -19,7 +20,7 @@ Before using application event logging, you need to understand the requirements
 
 **Event Name**
 
-An event name is a string that contains a maximum of 48 characters, including digits (0 to 9), letters (a to z), and underscores (\_). It must start with a lowercase letter and cannot end with an underscore (_).
+An event name is a string that contains a maximum of 48 characters, including digits (0 to 9), letters (a to z), and underscores (\_). It must start with a lowercase letter and cannot end with an underscore (\_).
 
 **Event Type**
 
@@ -30,9 +31,10 @@ An event type is an enumerated value of [EventType](#eventtype).
 An event parameter is an object in key-value pair format, where the key is the parameter name and the value is the parameter value. The requirements are as follows:
 
 - A parameter name is a string that contains a maximum of 16 characters, including digits (0 to 9), letters (a to z), and underscores (\_). It must start with a lowercase letter and cannot end with an underscore (\_).
-- The parameter value is a string, number, boolean, or array.
-- When the parameter value is a string, its maximum length is 8*1024 characters. If this limit is exceeded, excess characters will be truncated.
-- When the parameter value is an array, the elements in the array must be of the same type, which can only be string, number, or boolean. In addition, the number of elements must be less than 100. If this limit is exceeded, excess elements will be discarded.
+- The parameter value can be of the string, number, boolean, or array type.
+- If the parameter value is a string, its maximum length is 8*1024 characters. If this limit is exceeded, excess characters will be discarded.
+- If the parameter value is a number, the value must be within the range of **Number.MIN_SAFE_INTEGER** to **Number.MAX_SAFE_INTEGER**. Otherwise, uncertain values may be generated.
+- If the parameter value is an array, the elements in the array must be of the same type, which can only be string, number, or boolean. In addition, the number of elements must be less than 100. If this limit is exceeded, excess elements will be discarded.
 - The maximum number of parameters is 32. If this limit is exceeded, excess parameters will be discarded.
 
 **Event Callback**

en/application-dev/reference/apis/js-apis-hiviewdfx-hiappevent.md

 # @ohos.hiviewdfx.hiAppEvent (Application Event Logging)
 
-This module provides application event-related functions, including flushing application events to a disk, querying and clearing application events, and customizing application event logging configuration.
+The **hiAppEvent** module provides application event-related functions, including flushing application events to a disk, querying and clearing application events, and customizing application event logging configuration.
 
 > **NOTE**
 >
@@ -120,12 +120,12 @@ Defines parameters for an **AppEventInfo** object.
 
 **System capability**: SystemCapability.HiviewDFX.HiAppEvent
 
-| Name     | Type                   | Mandatory| Description      |
-| --------- | ----------------------- | ---- | ---------- |
-| domain    | string                  | Yes  | Event domain.|
-| name      | string                  | Yes  | Event name.|
-| eventType | [EventType](#eventtype) | Yes  | Event type.|
-| params    | object                  | Yes  | Event parameters.|
+| Name     | Type                   | Mandatory| Description                                                        |
+| --------- | ----------------------- | ---- | ------------------------------------------------------------ |
+| domain    | string                  | Yes  | Event domain. Event domain name, which is a string of up to 32 characters, including digits (0 to 9), letters (a to z), and underscores (\_). It must start with a lowercase letter and cannot end with an underscore (_).|
+| name      | string                  | Yes  | Event name. Event name, which is a string of up to 48 characters, including digits (0 to 9), letters (a to z), and underscores (\_). It must start with a lowercase letter and cannot end with an underscore (_).|
+| eventType | [EventType](#eventtype) | Yes  | Event type.                                                  |
+| params    | object                  | Yes  | Event parameter object, which consists of a parameter name and a parameter value. The specifications are as follows:<br>- The parameter name is a string of up to 16 characters, including digits (0 to 9), letters (a to z), and underscores (\_). It must start with a lowercase letter and cannot end with an underscore (_).<br>- The parameter value can be a string, number, boolean, or array. If the parameter value is a string, its maximum length is 8*1024 characters. If this limit is exceeded, excess characters will be discarded. If the parameter value is a number, the value must be within the range of **Number.MIN_SAFE_INTEGER** to **Number.MAX_SAFE_INTEGER**. Otherwise, uncertain values may be generated. If the parameter value is an array, the elements in the array must be of the same type, which can only be string, number, or boolean. In addition, the number of elements must be less than 100. If this limit is exceeded, excess elements will be discarded.<br>- The maximum number of parameters is 32. If this limit is exceeded, excess parameters will be discarded.|
 
 ## hiAppEvent.configure
 

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

 # @ohos.net.http (Data Request)
 
-The **http** module provides the HTTP data request capability. An application can initiate a data request over HTTP. Common HTTP methods include **GET**, **POST**, **OPTIONS**, **HEAD**, **PUT**, **DELETE**, **TRACE**, and **CONNECT**.
+This module provides the HTTP data request capability. An application can initiate a data request over HTTP. Common HTTP methods include **GET**, **POST**, **OPTIONS**, **HEAD**, **PUT**, **DELETE**, **TRACE**, and **CONNECT**.
 
 >**NOTE**
 >
@@ -13,10 +13,10 @@ The **http** module provides the HTTP data request capability. An application ca
 import http from '@ohos.net.http';
 ```
 
-## Examples
+## Example
 
 ```js
-// Import the HTTP namespace.
+// Import the http namespace.
 import http from '@ohos.net.http';
 
 // Each httpRequest corresponds to an HTTP request task and cannot be reused.
@@ -27,7 +27,7 @@ httpRequest.on('headersReceive', (header) => {
     console.info('header: ' + JSON.stringify(header));
 });
 httpRequest.request(
-    // Customize EXAMPLE_URL in extraData on your own. It is up to you whether to add parameters to the URL.
+    // Customize EXAMPLE_URL on your own. It is up to you whether to add parameters to the URL.
     "EXAMPLE_URL",
     {
         method: http.RequestMethod.POST, // Optional. The default value is http.RequestMethod.GET.
@@ -112,7 +112,7 @@ Initiates an HTTP request to a given URL. This API uses an asynchronous callback
 
 **Error codes**
 
-| ID  | Error Message                                                 |
+| Code  | Error Message                                                 |
 |---------|-------------------------------------------------------|
 | 401     | Parameter error.                                      |
 | 201     | Permission denied.                                    |
@@ -164,7 +164,7 @@ Initiates an HTTP request containing specified options to a given URL. This API
 
 **Error codes**
 
-| ID  | Error Message                                                 |
+| Code  | Error Message                                                 |
 |---------|-------------------------------------------------------|
 | 401     | Parameter error.                                      |
 | 201     | Permission denied.                                    |
@@ -231,7 +231,7 @@ httpRequest.request("EXAMPLE_URL",
 
 request(url: string, options? : HttpRequestOptions): Promise\<HttpResponse\>
 
-Initiates an HTTP request containing specified options to a given URL. This API uses a promise to return the result. 
+Initiates an HTTP request to a given URL. This API uses a promise to return the result. 
 
 >**NOTE**
 >This API supports only transfer of data not greater than 5 MB.
@@ -255,7 +255,7 @@ Initiates an HTTP request containing specified options to a given URL. This API
 
 **Error codes**
 
-| ID  | Error Message                                                 |
+| Code  | Error Message                                                 |
 |---------|-------------------------------------------------------|
 | 401     | Parameter error.                                      |
 | 201     | Permission denied.                                    |
@@ -349,7 +349,7 @@ Initiates an HTTP request to a given URL. This API uses an asynchronous callback
 
 **Error codes**
 
-| ID  | Error Message                                                 |
+| Code  | Error Message                                                 |
 |---------|-------------------------------------------------------|
 | 401     | Parameter error.                                      |
 | 201     | Permission denied.                                    |
@@ -395,7 +395,7 @@ Initiates an HTTP request to a given URL. This API uses an asynchronous callback
 
 **Error codes**
 
-| ID  | Error Message                                                 |
+| Code  | Error Message                                                 |
 |---------|-------------------------------------------------------|
 | 401     | Parameter error.                                      |
 | 201     | Permission denied.                                    |
@@ -477,7 +477,7 @@ Initiates an HTTP request containing specified options to a given URL. This API
 
 **Error codes**
 
-| ID  | Error Message                                                 |
+| Code  | Error Message                                                 |
 |---------|-------------------------------------------------------|
 | 401     | Parameter error.                                      |
 | 201     | Permission denied.                                    |
@@ -513,7 +513,7 @@ Initiates an HTTP request containing specified options to a given URL. This API
 
 >**NOTE**
 > For details about the error codes, see [HTTP Error Codes](../errorcodes/errorcode-net-http.md).
-> The HTTP error code mapping is in the format of 2300000 + Curl error code. For more common error codes, see:
+> The HTTP error code mapping is in the format of 2300000 + Curl error code. For more common error codes, see [Curl Error Codes](https://curl.se/libcurl/c/libcurl-errors.html).
 
 **Example**
 
@@ -839,7 +839,7 @@ Enumerates the response codes for an HTTP request.
 
 | Name             | Value  | Description                                                        |
 | ----------------- | ---- | ------------------------------------------------------------ |
-| OK                | 200  | "OK." The request has been processed successfully. This return code is generally used for GET and POST requests.                           |
+| OK                | 200  | The request is successful. The request has been processed successfully. This return code is generally used for GET and POST requests.                           |
 | CREATED           | 201  | "Created." The request has been successfully sent and a new resource is created.                          |
 | ACCEPTED          | 202  | "Accepted." The request has been accepted, but the processing has not been completed.                        |
 | NOT_AUTHORITATIVE | 203  | "Non-Authoritative Information." The request is successful.                                      |
@@ -1007,7 +1007,7 @@ Disables the cache and deletes the data in it. This API uses a promise to return
 
 | Type                             | Description                                 |
 | --------------------------------- | ------------------------------------- |
-| Promise\<void\> | Promise used to return the result.|
+| Promise\<void\> |  Promise used to return the result.|
 
 **Example**
 

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

 # AccessibilityExtensionContext (Accessibility Extension Context)
 
-The **AccessibilityExtensionContext** module, inherited from **ExtensionContext**, provides context for **Accessibility Extension** abilities.
+The **AccessibilityExtensionContext** module, inherited from **ExtensionContext**, provides context for **AccessibilityExtensionAbility**.
 
 You can use the APIs of this module to configure the concerned information, obtain root information, and inject gestures.
 
@@ -131,7 +131,7 @@ Sets the concerned target bundle. This API uses an asynchronous callback to retu
 let targetNames = ['com.ohos.xyz'];
 try {
     axContext.setTargetBundleName(targetNames, (err, data) => {
-        if (err) {
+        if (err && err.code) {
             console.error('failed to set target bundle names, because ${JSON.stringify(err)}');
             return;
         }
@@ -214,7 +214,7 @@ For details about the error codes, see [Accessibility Error Codes](../errorcodes
 let focusElement;
 try {
     axContext.getFocusElement((err, data) => {
-        if (err) {
+        if (err && err.code) {
             console.error('failed to get focus element, because ${JSON.stringify(err)}');
             return;
         }
@@ -248,7 +248,7 @@ let focusElement;
 let isAccessibilityFocus = true;
 try {
     axContext.getFocusElement(isAccessibilityFocus, (err, data) => {
-    if (err) {
+    if (err && err.code) {
         console.error('failed to get focus element, because ${JSON.stringify(err)}');
         return;
     }
@@ -331,7 +331,7 @@ For details about the error codes, see [Accessibility Error Codes](../errorcodes
 let rootElement;
 try {
     axContext.getWindowRootElement((err, data) => {
-    if (err) {
+    if (err && err.code) {
         console.error('failed to get root element of the window, because ${JSON.stringify(err)}');
         return;
     }
@@ -373,7 +373,7 @@ let rootElement;
 let windowId = 10;
 try {
     axContext.getWindowRootElement(windowId, (err, data) => {
-    if (err) {
+    if (err && err.code) {
         console.error('failed to get root element of the window, because ${JSON.stringify(err)}');
         return;
     }
@@ -457,7 +457,7 @@ For details about the error codes, see [Accessibility Error Codes](../errorcodes
 let windows;
 try {
     axContext.getWindows((err, data) => {
-        if (err) {
+        if (err && err.code) {
             console.error('failed to get windows, because ${JSON.stringify(err)}');
             return;
         }
@@ -499,7 +499,7 @@ let windows;
 let displayId = 10;
 try {
     axContext.getWindows(displayId, (err, data) => {
-        if (err) {
+        if (err && err.code) {
             console.error('failed to get windows, because ${JSON.stringify(err)}');
             return;
         }
@@ -594,7 +594,7 @@ try {
         gesturePath.points.push(gesturePoint);
     }
     axContext.injectGesture(gesturePath, (err, data) => {
-        if (err) {
+        if (err && err.code) {
             console.error('failed to inject gesture, because ${JSON.stringify(err)}');
             return;
         }
@@ -818,7 +818,7 @@ Performs an action based on the specified action name. This API uses a promise t
 
 | Name        | Type                                    | Mandatory  | Description            |
 | ----------- | ---------------------------------------- | ---- | -------------- |
-| actionName | string | Yes   | Action name.    |
+| actionName | string | Yes   | Action name. For details, see [Action](./js-apis-accessibility.md#action).
 | parameters | object | No   | Parameter required for performing the target action.    |
 
 **Return value**
@@ -861,7 +861,7 @@ Performs an action based on the specified action name. This API uses an asynchro
 
 | Name        | Type                                    | Mandatory  | Description            |
 | ----------- | ---------------------------------------- | ---- | -------------- |
-| actionName | string | Yes   | Attribute name.    |
+| actionName | string | Yes   | Action name. For details, see [Action](./js-apis-accessibility.md#action).
 | callback | AsyncCallback<void> | Yes   | Callback used to return the result.|
 
 **Error codes**
@@ -900,7 +900,7 @@ Performs an action based on the specified action name. This API uses an asynchro
 
 | Name        | Type                                    | Mandatory  | Description            |
 | ----------- | ---------------------------------------- | ---- | -------------- |
-| actionName | string | Yes   | Action name.    |
+| actionName | string | Yes   | Action name. For details, see [Action](./js-apis-accessibility.md#action).|
 | parameters | object | Yes   | Parameter required for performing the target action.    |
 | callback | AsyncCallback<void> | Yes   | Callback used to return the result.|
 

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

 # @ohos.intl (Internationalization)
 
- The **intl** module provides basic i18n capabilities, such as time and date formatting, number formatting, and string sorting, through the standard i18n APIs defined in ECMA 402.
+The **intl** module provides basic i18n capabilities, such as time and date formatting, number formatting, and string sorting, through the standard i18n APIs defined in ECMA 402.
+
 The [i18n](js-apis-i18n.md) module provides enhanced i18n capabilities through supplementary interfaces that are not defined in ECMA 402. It works with the intl module to provide a complete suite of i18n capabilities.
 
 >  **NOTE**

en/application-dev/reference/apis/js-apis-net-ethernet.md

@@ -114,9 +114,9 @@ ethernet.setIfaceConfig("eth0", {
     dnsServers: "1.1.1.1",
     domain: "2.2.2.2"
 }).then(() => {
-    console.log("setIfaceConfig promiss ok ");
+    console.log("setIfaceConfig promise ok ");
 }).catch(error => {
-    console.log("setIfaceConfig promiss error = " + JSON.stringify(error));
+    console.log("setIfaceConfig promise error = " + JSON.stringify(error));
 });
 ```
 
@@ -207,15 +207,15 @@ Obtains the configuration of a network interface. This API uses a promise to ret
 
 ```js
 ethernet.getIfaceConfig("eth0").then((data) => {
-    console.log("getIfaceConfig promiss mode = " + JSON.stringify(data.mode));
-    console.log("getIfaceConfig promiss ipAddr = " + JSON.stringify(data.ipAddr));
-    console.log("getIfaceConfig promiss route = " + JSON.stringify(data.route));
-    console.log("getIfaceConfig promiss gateway = " + JSON.stringify(data.gateway));
-    console.log("getIfaceConfig promiss netMask = " + JSON.stringify(data.netMask));
-    console.log("getIfaceConfig promiss dnsServers = " + JSON.stringify(data.dnsServers));
-    console.log("getIfaceConfig promiss domain = " + JSON.stringify(data.domain));
+    console.log("getIfaceConfig promise mode = " + JSON.stringify(data.mode));
+    console.log("getIfaceConfig promise ipAddr = " + JSON.stringify(data.ipAddr));
+    console.log("getIfaceConfig promise route = " + JSON.stringify(data.route));
+    console.log("getIfaceConfig promise gateway = " + JSON.stringify(data.gateway));
+    console.log("getIfaceConfig promise netMask = " + JSON.stringify(data.netMask));
+    console.log("getIfaceConfig promise dnsServers = " + JSON.stringify(data.dnsServers));
+    console.log("getIfaceConfig promise domain = " + JSON.stringify(data.domain));
 }).catch(error => {
-    console.log("getIfaceConfig promiss error = " + JSON.stringify(error));
+    console.log("getIfaceConfig promise error = " + JSON.stringify(error));
 });
 ```
 
@@ -300,9 +300,9 @@ Checks whether a network interface is active. This API uses a promise to return
 
 ```js
 ethernet.isIfaceActive("eth0").then((data) => {
-    console.log("isIfaceActive promiss = " + JSON.stringify(data));
+    console.log("isIfaceActive promise = " + JSON.stringify(data));
 }).catch(error => {
-    console.log("isIfaceActive promiss error = " + JSON.stringify(error));
+    console.log("isIfaceActive promise error = " + JSON.stringify(error));
 });
 ```
 
@@ -377,12 +377,12 @@ Obtains the list of all active network interfaces. This API uses a promise to re
 
 ```js
 ethernet.getAllActiveIfaces().then((data) => {
-    console.log("getAllActiveIfaces promiss data.length = " + JSON.stringify(data.length));
+    console.log("getAllActiveIfaces promise data.length = " + JSON.stringify(data.length));
     for (let i = 0; i < data.length; i++) {
-        console.log("getAllActiveIfaces promiss  = " + JSON.stringify(data[i]));
+        console.log("getAllActiveIfaces promise  = " + JSON.stringify(data[i]));
     }
 }).catch(error => {
-    console.log("getAllActiveIfaces promiss error = " + JSON.stringify(error));
+    console.log("getAllActiveIfaces promise error = " + JSON.stringify(error));
 });
 ```
 

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

@@ -394,7 +394,6 @@ Obtains the ID of the slot in which the primary card is located. This API uses a
 | 8300001  | Invalid parameter value.                     |
 | 8300002  | Operation failed. Cannot connect to service. |
 | 8300003  | System internal error.                       |
-| 8300004  | Do not have sim card.                        |
 | 8300999  | Unknown error code.                          |
 
 **Example**
@@ -427,7 +426,6 @@ Obtains the ID of the slot in which the primary card is located. This API uses a
 | 8300001  | Invalid parameter value.                     |
 | 8300002  | Operation failed. Cannot connect to service. |
 | 8300003  | System internal error.                       |
-| 8300004  | Do not have sim card.                        |
 | 8300999  | Unknown error code.                          |
 
 **Example**

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

-# # @ohos.net.socket (Socket Connection) 
+# Socket Connection
 
 The **socket** module implements data transfer over TCPSocket, UDPSocket, WebSocket, and TLSSocket connections.
 
@@ -364,7 +364,7 @@ udp.bind({address: '192.168.xx.xxx', port: xxxx, family: 1}, err => {
 
 setExtraOptions(options: UDPExtraOptions, callback: AsyncCallback\<void\>): void
 
-Sets other attributes of the UDPSocket connection. This API uses an asynchronous callback to return the result.
+Sets other properties of the UDPSocket connection. This API uses an asynchronous callback to return the result.
 
 >**NOTE**
 >This API can be called only after **bind** is successfully called.
@@ -418,7 +418,7 @@ udp.bind({address:'192.168.xx.xxx', port:xxxx, family:1}, err=> {
 
 setExtraOptions(options: UDPExtraOptions): Promise\<void\>
 
-Sets other attributes of the UDPSocket connection. This API uses a promise to return the result.
+Sets other properties of the UDPSocket connection. This API uses a promise to return the result.
 
 >**NOTE**
 >This API can be called only after **bind** is successfully called.
@@ -522,7 +522,7 @@ let callback = value =>{
 	console.log("on message, message:" + value.message + ", remoteInfo:" + value.remoteInfo);
 }
 udp.on('message', callback);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 udp.off('message', callback);
 udp.off('message');
 ```
@@ -582,14 +582,14 @@ let callback1 = () =>{
 	console.log("on listening, success");
 }
 udp.on('listening', callback1);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 udp.off('listening', callback1);
 udp.off('listening');
 let callback2 = () =>{
 	console.log("on close, success");
 }
 udp.on('close', callback2);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 udp.off('close', callback2);
 udp.off('close');
 ```
@@ -646,7 +646,7 @@ let callback = err =>{
 	console.log("on error, err:" + JSON.stringify(err));
 }
 udp.on('error', callback);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 udp.off('error', callback);
 udp.off('error');
 ```
@@ -1426,7 +1426,7 @@ let callback = value =>{
 	console.log("on message, message:" + value.message + ", remoteInfo:" + value.remoteInfo);
 }
 tcp.on('message', callback);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 tcp.off('message', callback);
 tcp.off('message');
 ```
@@ -1486,14 +1486,14 @@ let callback1 = () =>{
 	console.log("on connect success");
 }
 tcp.on('connect', callback1);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 tcp.off('connect', callback1);
 tcp.off('connect');
 let callback2 = () =>{
 	console.log("on close success");
 }
 tcp.on('close', callback2);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 tcp.off('close', callback2);
 tcp.off('close');
 ```
@@ -1550,7 +1550,7 @@ let callback = err =>{
 	console.log("on error, err:" + JSON.stringify(err));
 }
 tcp.on('error', callback);
-// You can pass the callback of the on method to cancel listening for a certain type of callback. If you do not pass the callback, you will cancel listening for all callbacks.
+// You can pass the **callback** of the **on** method to cancel listening for a certain type of callback. If you do not pass the **callback**, you will cancel listening for all callbacks.
 tcp.off('error', callback);
 tcp.off('error');
 ```

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

@@ -46,6 +46,8 @@ battery.getStatus({
 
 Object that contains the API calling result.
 
+**System capability**: SystemCapability.PowerManager.BatteryManager.Core
+
 | Name  | Type                                               | Mandatory| Description                                                        |
 | -------- | --------------------------------------------------- | ---- | ------------------------------------------------------------ |
 | success  | (data: [BatteryResponse](#batteryresponse)) => void | No  | Called when API call is successful. **data** is a return value of the [BatteryResponse](#batteryresponse) type.|
@@ -56,7 +58,9 @@ Object that contains the API calling result.
 
 Defines a response that returns the charging status and remaining power of the device.
 
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| charging | boolean | Whether the battery is being charged.|
-| level | number | Current battery level, which ranges from **0.00** to **1.00**.|
+**System capability**: SystemCapability.PowerManager.BatteryManager.Core
+
+| Name| Type| Readable| Writable| Description|
+| -------- | -------- | -------- | -------- | -------- |
+| charging | boolean | Yes| No| Whether the battery is being charged.|
+| level | number | Yes| No| Current battery level, which ranges from **0.00** to **1.00**.|

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

@@ -45,7 +45,7 @@ Obtains the current screen brightness.
 
 ## brightness.setValue
 
-etValue(options?: SetBrightnessOptions): void
+setValue(options?: SetBrightnessOptions): void
 
 Sets the screen brightness.
 
@@ -74,7 +74,7 @@ Sets the screen brightness.
 
 ## brightness.getMode
 
-getMode(options?: GetBrightnessModeOptions: void
+getMode(options?: GetBrightnessModeOptions): void
 
 Obtains the screen brightness adjustment mode.
 
@@ -161,67 +161,81 @@ Sets whether to always keep the screen on. Call this API in **onShow()**.
 
 Defines the options for obtaining the screen brightness.
 
+**System capability**: SystemCapability.PowerManager.DisplayPowerManager
+
 | Name    | Type                                                     | Mandatory| Description                                                        |
 | -------- | --------------------------------------------------------- | ---- | ------------------------------------------------------------ |
 | success  | (data: [BrightnessResponse](#brightnessresponse)) => void | No  | Called when API call is successful. **data** is a return value of the [BrightnessResponse](#brightnessresponse) type.|
 | fail     | (data: string, code: number) => void                      | No  | Called when API call has failed. **data** indicates the error information, and **code** indicates the error code.      |
-| complete | () => void                                                | No  | Called when API call is complete.                                    |
+| complete | () => void                                                | No  | Called when the API call is complete.                                    |
 
 ## SetBrightnessOptions
 
 Defines the options for setting the screen brightness.
 
+**System capability**: SystemCapability.PowerManager.DisplayPowerManager
+
 | Name    | Type                                | Mandatory| Description                                                        |
 | -------- | ------------------------------------ | ---- | ------------------------------------------------------------ |
 | value    | number                               | Yes  | Screen brightness. The value is an integer ranging from **1** to **255**.<br>-&nbsp;If the value is less than or equal to **0**, value **1** will be used.<br>-&nbsp;If the value is greater than **255**, value **255** will be used.<br>-&nbsp;If the value contains decimals, the integral part of the value will be used. For example, if value **8.1** is set, value **8** will be used.|
-| success  | () => void                           | No  | Called when API call is successful.                                    |
+| success  | () => void                           | No  | Callback upon a successful API call.                                    |
 | fail     | (data: string, code: number) => void | No  | Called when API call has failed. **data** indicates the error information, and **code** indicates the error code.      |
-| complete | () => void                           | No  | Called when API call is complete.                                    |
+| complete | () => void                           | No  | Called when the API call is complete.                                    |
 
 ## BrightnessResponse
 
 Defines a response that returns the screen brightness.
 
-| Parameter| Type | Description|
-| -------- | -------- | -------- |
-| value | number | Screen brightness. The value ranges from 1 to 255.|
+**System capability**: SystemCapability.PowerManager.DisplayPowerManager
+
+| Name| Type| Readable| Writable| Description|
+| -------- | -------- | -------- | -------- | -------- |
+| value | number | Yes| No| Screen brightness. The value ranges from **1** to **255**.|
 
 ## GetBrightnessModeOptions
 
 Defines the options for obtaining the screen brightness mode.
 
+**System capability**: SystemCapability.PowerManager.DisplayPowerManager
+
 | Name    | Type                                                        | Mandatory| Description                                                        |
 | -------- | ------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
 | success  | (data: [BrightnessModeResponse](#brightnessmoderesponse)) => void | No  | Called when API call is successful. **data** is a return value of the [BrightnessModeResponse](#brightnessmoderesponse) type.|
 | fail     | (data: string, code: number) => void                         | No  | Called when API call has failed. **data** indicates the error information, and **code** indicates the error code.      |
-| complete | () => void                                                   | No  | Called when API call is complete.                                    |
+| complete | () => void                                                   | No  | Called when the API call is complete.                                    |
 
 ## SetBrightnessModeOptions
 
 Defines the options for setting the screen brightness mode.
 
+**System capability**: SystemCapability.PowerManager.DisplayPowerManager
+
 | Name    | Type                                | Mandatory| Description                                                  |
 | -------- | ------------------------------------ | ---- | ------------------------------------------------------ |
 | mode     | number                               | Yes  | The value **0** indicates the manual adjustment mode, and the value **1** indicates the automatic adjustment mode.|
-| success  | () => void                           | No  | Called when API call is successful.                              |
+| success  | () => void                           | No  | Callback upon a successful API call.                              |
 | fail     | (data: string, code: number) => void | No  | Called when API call has failed. **data** indicates the error information, and **code** indicates the error code.|
-| complete | () => void                           | No  | Called when API call is complete.                              |
+| complete | () => void                           | No  | Called when the API call is complete.                              |
 
 ## BrightnessModeResponse
 
 Defines a response that returns the screen brightness mode.
 
-| Name| Type | Description|
-| -------- | -------- | -------- |
-| mode | number | The value **0** indicates the manual adjustment mode, and the value **1** indicates the automatic adjustment mode.|
+**System capability**: SystemCapability.PowerManager.DisplayPowerManager
+
+| Name| Type| Readable| Writable| Description|
+| -------- | -------- | -------- | -------- | -------- |
+| mode | number | Yes| No| The value **0** indicates the manual adjustment mode, and the value **1** indicates the automatic adjustment mode.|
 
 ## SetKeepScreenOnOptions
 
 Defines the options for setting the screen to be steady on.
 
+**System capability**: SystemCapability.PowerManager.DisplayPowerManager
+
 | Name        | Type                                | Mandatory| Description                                                  |
 | ------------ | ------------------------------------ | ---- | ------------------------------------------------------ |
 | keepScreenOn | boolean                              | Yes  | The value **true** means to keep the screen steady on, and the value **false** indicates the opposite.         |
-| success      | () => void                           | No  | Called when API call is successful.                              |
+| success      | () => void                           | No  | Callback upon a successful API call.                              |
 | fail         | (data: string, code: number) => void | No  | Called when API call has failed. **data** indicates the error information, and **code** indicates the error code.|
-| complete     | () => void                           | No  | Called when API call is complete.                              |
+| complete     | () => void                           | No  | Called when the API call is complete.                              |

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

@@ -16,7 +16,7 @@ import device from '@system.device';
 
 ## device.getInfo
 
-getInfo(Object): void
+getInfo(options?: GetDeviceOptions): void
 
 Obtains the device information.
 
@@ -30,11 +30,25 @@ Obtains the device information.
 
 | Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| success | Function | No| Called when API call is successful.|
-| fail | Function | No| Called when API call has failed.|
-| complete | Function | No| Called when API call is complete.|
+| options | [GetDeviceOptions](#getdeviceoptions) | No| Parameters for obtaining the device information.|
 
-**Return value of success()**
+## GetDeviceOptions
+
+Defines the parameters for obtaining the device information.
+
+**System capability**: SystemCapability.Startup.SystemInfo
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
+| success | (data: DeviceResponse)=> void| No| Called when API call is successful. **data** indicates the returned device information. For details, see [DeviceResponse](#deviceresponse).|
+| fail | (data: any,code:number)=> void| No| Called when API call has failed. **code** indicates the error code returned upon a failure.<br>**code:200**: Certain information could not be obtained.|
+| complete | () => void| No| Called when API call is complete.|
+
+## DeviceResponse
+
+Provides the device information.
+
+**System capability**: SystemCapability.Startup.SystemInfo
 
 | Name| Type| Description|
 | -------- | -------- | -------- |
@@ -49,14 +63,9 @@ Obtains the device information.
 | screenDensity<sup>4+</sup> | number | Screen density.|
 | screenShape<sup>4+</sup> | string | Screen shape. The options are as follows:<br>- **rect**: rectangular screen<br>- **circle**: round screen|
 | apiVersion<sup>4+</sup> | number | API version.|
-| releaseType<sup>4+</sup> | string | Release type. The value includes both the release type and the API version, for example, Beta1.<br>Available release types are as follows:<br>- **Canary**: For the same API version, different canary releases are compatible with each other, but not compatible with those of the **beta** and **release** type.<br>- **Beta**: For the same API version, different beta releases are compatible with each other, but not compatible with those of the **release** type.<br>- **Release**: Releases of this type are compatible with the latest five API versions.|
+| releaseType<sup>4+</sup> | string | Release type. The value includes both the release type and the API version, for example, Beta1.<br>Available release types are as follows:<br>- **Canary**: Releases of this type are compatible with each other under the same API version, but not with those of the **beta** and **release** type.<br>- **Beta**: Releases of this type are compatible with each other under the same API version, but not with those of the **release** type.<br>- **Release**: Releases of this type are compatible with the latest five API versions.|
 | deviceType<sup>4+</sup> | string | Device type.|
 
-**Return value of fail()**
-
-| Error Code| Description|
-| -------- | -------- |
-| 200 | Certain information cannot be obtained.|
 
 **Example**
 

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

 # @system.fetch (Data Request)
 
 > **NOTE**
->
 > - The APIs of this module are no longer maintained since API version 6. You are advised to use [`@ohos.net.http`](js-apis-http.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.
 
 
@@ -15,7 +14,7 @@ import fetch from '@system.fetch';
 ```
 
 
-## fetch.fetch
+## fetch.fetch<sup>3+</sup>
 
 fetch(Object): void
 
@@ -31,9 +30,9 @@ Obtains data through a network.
 | header | Object | No| Request header.|
 | method | string | No| Request method. The default value is **GET**. The value can be **OPTIONS**, **GET**, **HEAD**, **POST**, **PUT**, **DELETE **or **TRACE**.|
 | responseType | string | No| Response type. The return type can be text or JSON. By default, the return type is determined based on **Content-Type** in the header returned by the server. For details, see return values in the **success** callback.|
-| success | Function | No| Called when data is obtained successfully. The return value is [FetchResponse](#fetchresponse). |
-| fail | Function | No| Called when data failed to be obtained.|
-| complete | Function | No| Called when the execution is complete.|
+| success | Function | No| Called when the API call is successful. The return value is defined by [FetchResponse](#fetchresponse).|
+| fail | Function | No| Called when API call has failed.|
+| complete | Function | No| Called when the API call is complete.|
 
 **Table 1** Mapping between data and Content-Type
 
@@ -46,11 +45,11 @@ Obtains data through a network.
 
 ## FetchResponse
 
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| code | number | Server status code.|
-| data | string \| Object | The type of the returned data is determined by **responseType**. For details, see the mapping between **responseType** and **data** in **success** callback.|
-| headers | Object | All headers in the response from the server.|
+| Name| Type| Readable| Writable| Description|
+| -------- | -------- | -------- | -------- | -------- |
+| code | number | Yes| No| Server status code.|
+| data | string \| Object | Yes| No| The type of the returned data is determined by **responseType**. For details, see the mapping between **responseType** and **data** in **success** callback.|
+| headers | Object | Yes| No| All headers in the response from the server.|
 
 **Table 2** Mapping between responseType and data in success callback
 
@@ -85,7 +84,7 @@ export default {
 ```
 
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**<br/>
+> **NOTE**
 >   HTTPS is supported by default. To support HTTP, you need to add **"network"** to the **config.json** file, and set the attribute **"cleartextTraffic"** to **true**. That is:
 >   
 > ```

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

@@ -21,44 +21,22 @@ ohos.permission.LOCATION
 
 ## geolocation.getLocation<sup>(deprecated)</sup>
 
-getLocation(Object): void
+getLocation(options?: GetLocationOption): void
 
 Obtains the geographic location.
 
 > **NOTE**
 > This API is deprecated since API version 9. You are advised to use [geoLocationManager.getCurrentLocation](js-apis-geoLocationManager.md#geolocationmanagergetcurrentlocation).
 
+**Required permissions**: ohos.permission.LOCATION
+
 **System capability**: SystemCapability.Location.Location.Lite
 
 **Parameters**
 
 | Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| timeout | number | No| Timeout duration, in ms. The default value is **30000**.<br>The timeout duration is necessary in case the request to obtain the geographic location is rejected for the lack of the required permission, weak positioning signal, or incorrect location settings. After the timeout duration expires, the fail function will be called.<br>The value is a 32-digit positive integer. If the specified value is less than or equal to **0**, the default value will be used.|
-| coordType | string | No| Coordinate system type. Available types can be obtained by **getSupportedCoordTypes**. The default type is **wgs84**.|
-| success | Function | No| Called when API call is successful.|
-| fail | Function | No| Called when API call has failed.|
-| complete | Function | No| Called when API call is complete.|
-
-**Return value of success()**
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| longitude | number | Longitude.|
-| latitude | number | Latitude.|
-| altitude | number | Altitude.|
-| accuracy | number | Location accuracy.|
-| time | number | Time when the location is obtained.|
-
-**Return value of fail()**
-
-| Error Code| Description|
-| -------- | -------- |
-| 601 | Failed to obtain the required permission because the user rejected the request.|
-| 602 | Permission not declared.|
-| 800 | Operation times out due to a poor network condition or GNSS unavailability.|
-| 801 | System location disabled.|
-| 802 | API called again while the previous execution result is not returned yet.|
+| options | [GetLocationOption](#getlocationoptiondeprecated) | No| Options of a single location request.|
 
 **Example**
 
@@ -70,7 +48,7 @@ export default {
         console.log('success get location data. latitude:' + data.latitude);            
       },            
       fail: function(data, code) {                
-        console.log('fail to get location. code:' + code + ', data:' + data);
+        console.log('fail to get location. code:' + code + ', data:' + data);            
       }
     });    
   }
@@ -80,12 +58,12 @@ export default {
 
 ## geolocation.getLocationType<sup>(deprecated)</sup>
 
-getLocationType(Object): void
+getLocationType(options?: GetLocationTypeOption): void
 
 Obtains the supported location types.
 
 > **NOTE**
-> This API is deprecated since API version 9. The location subsystem supports only two location types: GPS positioning and network positioning. No APIs will be provided to query the supported location types.
+> This API is deprecated since API version 9. The location subsystem supports only two location types: GNSS positioning and network positioning. No APIs will be provided to query the supported location types.
 
 **System capability**: SystemCapability.Location.Location.Lite
 
@@ -93,15 +71,7 @@ Obtains the supported location types.
 
 | Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| success | Function | No| Called when API call is successful.|
-| fail | Function | No| Called when API call has failed.|
-| complete | Function | No| Called when API call is complete.|
-
-**Return value of success()**
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| types | Array&lt;string&gt; | Available location types, ['gps', 'network']|
+| options | [GetLocationTypeOption](#getlocationtypeoptiondeprecated) | No| Callback used to return the result.|
 
 **Example**
 
@@ -123,40 +93,22 @@ export default {
 
 ## geolocation.subscribe<sup>(deprecated)</sup>
 
-subscribe(Object): void
+subscribe(options: SubscribeLocationOption): void
 
 Listens to the geographic location. If this method is called multiple times, the last call takes effect.
 
 > **NOTE**
 > This API is deprecated since API version 9. You are advised to use [geoLocationManager.on('locationChange')](js-apis-geoLocationManager.md#geolocationmanageronlocationchange).
 
+**Required permissions**: ohos.permission.LOCATION
+
 **System capability**: SystemCapability.Location.Location.Lite
 
 **Parameters**
 
 | Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| coordType | string | No| Coordinate system type. Available types can be obtained by **getSupportedCoordTypes**. The default type is **wgs84**.|
-| success | Function | Yes| Called when the geographic location changes.|
-| fail | Function | No| Called when API call has failed.|
-
-**Return value of success()**
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| longitude | number | Longitude.|
-| latitude | number | Latitude.|
-| altitude | number | Altitude.|
-| accuracy | number | Location accuracy.|
-| time | number | Time when the location is obtained.|
-
-**Return value of fail()**
-
-| Error Code| Description|
-| -------- | -------- |
-| 601 | Failed to obtain the required permission because the user rejected the request.|
-| 602 | Permission not declared.|
-| 801 | System location disabled.|
+| options | [SubscribeLocationOption](#subscribelocationoptiondeprecated) | Yes| Options for continuous location.|
 
 **Example**
 
@@ -185,6 +137,8 @@ Cancels listening to the geographic location.
 > **NOTE**
 > This API is deprecated since API version 9. You are advised to use [geoLocationManager.off('locationChange')](js-apis-geoLocationManager.md#geolocationmanagerofflocationchange).
 
+**Required permissions**: ohos.permission.LOCATION
+
 **System capability**: SystemCapability.Location.Location.Lite
 
 **Example**
@@ -192,7 +146,7 @@ Cancels listening to the geographic location.
 ```
 export default {    
   unsubscribe() {        
-    geolocation.unsubscribe();
+    geolocation.unsubscribe();    
   }
 }
 ```
@@ -224,3 +178,102 @@ export default {
   },
 }
 ```
+
+## GetLocationOption<sup>(deprecated)</sup>
+
+Defines the options of a single location request.
+
+> **NOTE**
+> This API is deprecated since API version 9. You are advised to use [geoLocationManager.CurrentLocationRequest](js-apis-geoLocationManager.md#CurrentLocationRequest).
+
+**Required permissions**: ohos.permission.LOCATION
+
+**System capability**: SystemCapability.Location.Location.Lite
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
+| timeout | number | No| Timeout duration, in ms. The default value is **30000**.<br>The timeout duration is necessary in case the request to obtain the geographic location is rejected for the lack of the required permission, weak positioning signal, or incorrect location settings. After the timeout duration expires, the fail function will be called.<br>The value is a 32-digit positive integer. If the specified value is less than or equal to **0**, the default value will be used.|
+| coordType | string | No| Coordinate system type. Available types can be obtained by **getSupportedCoordTypes**. The default type is **wgs84**.|
+| success | (data: [GeolocationResponse](#geolocationresponsedeprecated)) => void | No| Called when API call is successful.|
+| fail |  (data: string, code: number) => void | No| Called when API call has failed. **data** indicates the error information, and **code** indicates the error code.|
+| complete | () => void | No| Called when API call is complete.|
+
+**Return value of fail()**
+
+| Error Code| Description|
+| -------- | -------- |
+| 601 | Failed to obtain the required permission because the user rejected the request.|
+| 602 | Permission not declared.|
+| 800 | Operation times out due to a poor network condition or GNSS unavailability.|
+| 801 | System location disabled.|
+| 802 | API called again while the previous execution result is not returned yet.|
+
+## GeolocationResponse<sup>(deprecated)</sup>
+
+Defines the location information, including the longitude, latitude, and location precision.
+
+> **NOTE**
+> This API is deprecated since API version 9. You are advised to use [geoLocationManager.Location](js-apis-geoLocationManager.md#location).
+
+**System capability**: SystemCapability.Location.Location.Lite
+
+| Name| Type| Readable| Writable| Description|
+| -------- | -------- | -------- | -------- | -------- |
+| longitude | number | Yes| No| Longitude.|
+| latitude | number | Yes| No| Latitude.|
+| altitude | number | Yes| No| Altitude.|
+| accuracy | number | Yes| No| Location accuracy.|
+| time | number | Yes| No| Time when the location is obtained.|
+
+## GetLocationTypeOption<sup>(deprecated)</sup>
+
+Defines the location type option, which holds the callback function used to return the query result.
+
+> **NOTE**
+> This API is deprecated since API version 9.
+
+**System capability**: SystemCapability.Location.Location.Lite
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
+| success | (data: [GetLocationTypeResponse](#getlocationtyperesponsedeprecated)) => void | No| Called when API call is successful.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+| complete | () => void | No| Called when API call is complete.|
+
+## GetLocationTypeResponse<sup>(deprecated)</sup>
+
+Defines the list of location types supported by the current device
+
+> **NOTE**
+> This API is deprecated since API version 9.
+
+**System capability**: SystemCapability.Location.Location.Lite
+
+| Name| Type| Readable| Writable| Description|
+| -------- | -------- | -------- | -------- | -------- |
+| types | Array&lt;string&gt; | Yes| No| Available location types, ['gps', 'network']|
+
+## SubscribeLocationOption<sup>(deprecated)</sup>
+
+Defines the options for continuous location.
+
+> **NOTE**
+> This API is deprecated since API version 9. You are advised to use [geoLocationManager.CurrentLocationRequest](js-apis-geoLocationManager.md#locationrequest).
+
+**Required permissions**: ohos.permission.LOCATION
+
+**System capability**: SystemCapability.Location.Location.Lite
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
+| coordType | string | No| Coordinate system type. Available types can be obtained by **getSupportedCoordTypes**. The default type is **wgs84**.|
+| success | (data: [GeolocationResponse](#geolocationresponsedeprecated)) => void | Yes| Called when the geographic location changes.|
+| fail | (data: string, code: number) => void | No| Called when API call has failed.|
+
+**Return value of fail()**
+
+| Error Code| Description|
+| -------- | -------- |
+| 601 | Failed to obtain the required permission because the user rejected the request.|
+| 602 | Permission not declared.|
+| 801 | System location disabled.|

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

 # @system.network (Network State)
 
 > **NOTE**
-> 
-> - The APIs of this module are no longer maintained since API version 7. It is recommended that you use [`@ohos.telephony.observer`](js-apis-observer.md) instead.
+> - The APIs of this module are no longer maintained since API version 7. You are advised to use [`@ohos.telephony.observer`](js-apis-observer.md).
+>
 > - 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.
 
 
@@ -31,17 +31,17 @@ Obtains the network type.
 
 **Parameters**
 
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| success | Function | No | Called when the execution is successful. The return value is [NetworkResponse](#networkresponse). |
-| fail | Function | No | Called when the operation fails. |
-| complete | Function | No | Called when the execution is complete |
+| success | Function | No| Called when the API call is successful. The return value is defined by [NetworkResponse](#networkresponse).|
+| fail | Function | No| Called when API call has failed.|
+| complete | Function | No| Called when the API call is complete.|
 
-Return value of the **fail** callback:
+One of the following error codes will be returned if the API call has failed.
 
-| Error Code | Description |
+| Error Code| Description|
 | -------- | -------- |
-| 602 | The current permission is not declared. |
+| 602 | The current permission is not declared.|
 
 **Example**
 
@@ -71,17 +71,17 @@ Listens to the network connection state. If this method is called multiple times
 
 **Parameters**
 
-| Name | Type | Mandatory | Description |
+| Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| success | Function | No | Called when the network connection state changes |
-| fail | Function | No | Called when the multimedia volume fails to be obtained. |
+| success | Function | No| Called when the network state changes. The return value is defined by [NetworkResponse](#networkresponse).|
+| fail | Function | No| Called when API call has failed.|
 
-Return value of the **fail** callback:
+One of the following error codes will be returned if the API call has failed.
 
-| Error Code | Description |
+| Error Code| Description|
 | -------- | -------- |
-| 602 | The current permission is not declared. |
-| 200 | The subscription fails. |
+| 602 | The current permission is not declared.|
+| 200 | Subscription failed.|
 
 **Example**
 
@@ -119,9 +119,12 @@ export default {
 }
 ```
 
+
 ## NetworkResponse
 
-| Parameter | Type | Description |
-| -------- | -------- | -------- |
-| metered | boolean | Whether the billing is based on the data volume. |
-| type | string | Network type. The value can be **2G**, **3G**, **4G**, **5G**, **WiFi**, or **none**. |
+**System capability**: SystemCapability.Communication.NetManager.Core
+
+| Name| Type| Mandatory| Description|
+| -------- | -------- | -------- | -------- |
\ No newline at end of file
+| metered | boolean | No|Whether to charge by traffic.|
+| type | string | Yes|Network type. The value can be **2G**, **3G**, **4G**, **5G**, **WiFi**, or **none**.|

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

-# @ohos.uitest (UiTest)
+# @ohos.UiTest
 
 The **UiTest** module provides APIs that you can use to simulate UI actions during testing, such as clicks, double-clicks, long-clicks, and swipes.
 
@@ -20,7 +20,7 @@ This module provides the following functions:
 ## Modules to Import
 
 ```js
-import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest';
+import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix, UiDirection, MouseButton} from '@ohos.UiTest';
 ```
 
 ## MatchPattern
@@ -61,8 +61,8 @@ Provides the coordinates of a point.
 
 | Name| Type  | Readable| Writable| Description            |
 | ---- | ------ | ---- | ---- | ---------------- |
-| X    | number | Yes  | No  | X-coordinate of a point.|
-| Y    | number | Yes  | No  | Y-coordinate of a point.|
+| x    | number | Yes  | No  | X-coordinate of a point.|
+| y    | number | Yes  | No  | Y-coordinate of a point.|
 
 ## Rect<sup>9+</sup>
 
@@ -79,10 +79,10 @@ Provides bounds information of a component.
 
 ## WindowMode<sup>9+</sup>
 
-**System capability**: SystemCapability.Test.UiTest
-
 Enumerates the window modes.
 
+**System capability**: SystemCapability.Test.UiTest
+
 | Name      | Value  | Description      |
 | ---------- | ---- | ---------- |
 | FULLSCREEN | 0    | Full-screen mode.|
@@ -92,10 +92,10 @@ Enumerates the window modes.
 
 ## DisplayRotation<sup>9+</sup>
 
-**System capability**: SystemCapability.Test.UiTest
-
 Describes the display rotation of the device.
 
+**System capability**: SystemCapability.Test.UiTest
+
 | Name        | Value  | Description                                    |
 | ------------ | ---- | ---------------------------------------- |
 | ROTATION_0   | 0    | The device display is not rotated and is in its original vertical orientation.    |
@@ -116,6 +116,31 @@ Provides the flag attributes of this window.
 | focused    | boolean | Yes  | No  | Whether the window is in focused state.    |
 | actived    | boolean | Yes  | No  | Whether the window is interacting with the user.|
 
+## UiDirection<sup>10+</sup>
+
+Describes the direction of a UI operation such as fling.
+
+**System capability**: SystemCapability.Test.UiTest
+
+| Name | Value  | Description  |
+| ----- | ---- | ------ |
+| LEFT  | 0    | Leftward.|
+| RIGHT | 1    | Rightward.|
+| UP    | 2    | Upward.|
+| DOWN  | 3    | Downward.|
+
+## MouseButton<sup>10+</sup>
+
+Describes the injected simulated mouse button.
+
+**System capability**: SystemCapability.Test.UiTest
+
+| Name               | Value  | Description        |
+| ------------------- | ---- | ------------ |
+| MOUSE_BUTTON_LEFT   | 0    | Left button on the mouse.  |
+| MOUSE_BUTTON_RIGHT  | 1    | Right button on the mouse.  |
+| MOUSE_BUTTON_MIDDLE | 2    | Middle button on the mouse.|
+
 ## On<sup>9+</sup>
 
 Since API version 9, the UiTest framework provides a wide range of UI component feature description APIs in the **On** class to filter and match components.
@@ -420,7 +445,7 @@ let on = ON.checkable(true); // Use the static constructor ON to create an On ob
 
 isBefore(on: On): On
 
-Specifies the attributes of the component before which the target component is located.
+Specifies that the target component is located before the given attribute component.
 
 **System capability**: SystemCapability.Test.UiTest
 
@@ -428,7 +453,7 @@ Specifies the attributes of the component before which the target component is l
 
 | Name| Type      | Mandatory| Description                |
 | ------ | ---------- | ---- | -------------------- |
-| on     | [On](#on9) | Yes  | Attributes of the component before which the target component is located.|
+| on     | [On](#on9) | Yes  | Information about the attribute component.|
 
 **Return value**
 
@@ -439,14 +464,14 @@ Specifies the attributes of the component before which the target component is l
 **Example**
 
 ```js
-let on = ON.isBefore(ON.text('123')); // Use the static constructor ON to create an On object and specify the attributes of the component before which the target component is located.
+let on = ON.isBefore(ON.text('123')); // Create an On object using the static constructor ON, specifying that the target component is located before the given attribute component.
 ```
 
 ### isAfter<sup>9+</sup>
 
 isAfter(on: On): On
 
-Specifies the attributes of the component after which the target component is located.
+Specifies that the target component is located after the given attribute component.
 
 **System capability**: SystemCapability.Test.UiTest
 
@@ -454,7 +479,7 @@ Specifies the attributes of the component after which the target component is lo
 
 | Name| Type      | Mandatory| Description                |
 | ------ | ---------- | ---- | -------------------- |
-| on     | [On](#on9) | Yes  | Attributes of the component after which the target component is located.|
+| on     | [On](#on9) | Yes  | Information about the attribute component.|
 
 **Return value**
 
@@ -465,7 +490,59 @@ Specifies the attributes of the component after which the target component is lo
 **Example**
 
 ```js
-let on = ON.isAfter(ON.text('123')); // Use the static constructor ON to create an On object and specify the attributes of the component after which the target component is located.
+let on = ON.isAfter(ON.text('123')); // Create an On object using the static constructor ON, specifying that the target component is located after the given attribute component.
+```
+
+### within<sup>10+</sup>
+
+within(on: On): On
+
+Specifies that the target component is located within the given attribute component.
+
+**System capability**: SystemCapability.Test.UiTest
+
+**Parameters**
+
+| Name| Type      | Mandatory| Description                |
+| ------ | ---------- | ---- | -------------------- |
+| on     | [On](#on9) | Yes  | Information about the attribute component.|
+
+**Return value**
+
+| Type      | Description                                              |
+| ---------- | -------------------------------------------------- |
+| [On](#on9) | **On** object.|
+
+**Example**
+
+```js
+let on = ON.within(ON.type('List')); // Create an On object using the static constructor ON, specifying that the target component is located within the given attribute component.
+```
+
+### inWindow<sup>10+</sup>
+
+inWindow(bundleName: string): On;
+
+Specifies that the target component is within the given application window.
+
+**System capability**: SystemCapability.Test.UiTest
+
+**Parameters**
+
+| Name    | Type  | Mandatory| Description            |
+| ---------- | ------ | ---- | ---------------- |
+| bundleName | string | Yes  | Bundle name of the application window.|
+
+**Return value**
+
+| Type      | Description                                          |
+| ---------- | ---------------------------------------------- |
+| [On](#on9) | **On** object.|
+
+**Example**
+
+```js
+let on = ON.inWindow(ON.inWindow('com.uitestScene.acts')); // Create an On object using the static constructor ON, specifying that the target component is within the given application window.
 ```
 
 ## Component<sup>9+</sup>
@@ -1816,7 +1893,7 @@ For details about the error codes, see [UiTest Error Codes](../errorcodes/errorc
 ```js
 async function demo() {
     let driver = Driver.create();
-    await driver.screenCap('/local/tmp/1.png');
+    await driver.screenCap('/data/storage/el2/base/cache/1.png');
 }
 ```
 
@@ -2078,7 +2155,7 @@ Simulates a fling operation on the screen.
 | from    | [Point](#point9) | Yes  | Coordinates of the point where the finger touches the screen.                                  |
 | to      | [Point](#point9) | Yes  | Coordinates of the point where the finger leaves the screen.                                    |
 | stepLen | number           | Yes  | Fling step length, in pixels.                                    |
-| speed   | number           | Yes  | Scroll speed, in pixel/s. The value ranges from 200 to 15000. If the set value is not in the range, the default value 600 is used.|
+| speed   | number           | Yes  | Fling speed, in pixel/s. The value ranges from 200 to 40000. If the set value is not in the range, the default value 600 is used.|
 
 **Error codes**
 
@@ -2093,7 +2170,7 @@ For details about the error codes, see [UiTest Error Codes](../errorcodes/errorc
 ```js
 async function demo() {
     let driver = Driver.create();
-    await driver.fling({X: 500, Y: 480},{X: 450, Y: 480},5,600);
+    await driver.fling({x: 500, y: 480},{x: 450, y: 480},5,600);
 }
 ```
 
@@ -2132,16 +2209,186 @@ For details about the error codes, see [UiTest Error Codes](../errorcodes/errorc
 async function demo() {
     let driver = Driver.create();
     let pointers = PointerMatrix.create(2,3);
-    pointers.setPoint(0,0,{X:230,Y:480});
-    pointers.setPoint(0,1,{X:250,Y:380});
-    pointers.setPoint(0,2,{X:270,Y:280});
-    pointers.setPoint(1,0,{X:230,Y:680});
-    pointers.setPoint(1,1,{X:240,Y:580});
-    pointers.setPoint(1,2,{X:250,Y:480});
+    pointers.setPoint(0,0,{x:230,y:480});
+    pointers.setPoint(0,1,{x:250,y:380});
+    pointers.setPoint(0,2,{x:270,y:280});
+    pointers.setPoint(1,0,{x:230,y:680});
+    pointers.setPoint(1,1,{x:240,y:580});
+    pointers.setPoint(1,2,{x:250,y:480});
     await driver.injectMultiPointerAction(pointers);
 }
 ```
 
+### fling<sup>10+</sup>
+
+fling(direction: UiDirection, speed: number): Promise<void>;
+
+Simulates a fling operation on the screen, in the specified direction and speed.
+
+**System capability**: SystemCapability.Test.UiTest
+
+**Parameters**
+
+| Name   | Type                         | Mandatory| Description                                                        |
+| --------- | ----------------------------- | ---- | ------------------------------------------------------------ |
+| direction | [UiDirection](#uidirection10) | Yes  | Direction of the fling operation.                                            |
+| speed     | number                        | Yes  | Fling speed, in pixel/s. The value ranges from 200 to 40000. If the set value is not in the range, the default value 600 is used.|
+
+**Error codes**
+
+For details about the error codes, see [UiTest Error Codes](../errorcodes/errorcode-uitest.md).
+
+| ID| Error Message                                |
+| -------- | ---------------------------------------- |
+| 17000002 | API does not allow calling concurrently. |
+
+**Example**
+
+```js
+async function demo() {
+    let driver = Driver.create();
+    await driver.fling(UiDirection.DOWN, 10000);
+}
+```
+
+### screenCapture<sup>10+</sup>
+
+screenCapture(savePath: string, rect?: Rect): Promise<boolean>;
+
+Captures the specified area of the current screen and saves the captured screenshot as a PNG image to the specified path.
+
+**System capability**: SystemCapability.Test.UiTest
+
+**Parameters**
+
+| Name  | Type          | Mandatory| Description                  |
+| -------- | -------------- | ---- | ---------------------- |
+| savePath | string         | Yes  | File save path.        |
+| rect     | [Rect](#rect9) | No  | Area of the screen to capture. The default value is the entire screen.|
+
+**Return value**
+
+| Type             | Description                                  |
+| ----------------- | -------------------------------------- |
+| Promise\<boolean> | Promise used to return the operation result. The value **true** means that the operation is successful.|
+
+**Error codes**
+
+For details about the error codes, see [UiTest Error Codes](../errorcodes/errorcode-uitest.md).
+
+| ID| Error Message                                |
+| -------- | ---------------------------------------- |
+| 17000002 | API does not allow calling concurrently. |
+
+**Example**
+
+```js
+async function demo() {
+    let driver = Driver.create();
+    await driver.screenCapture('/data/storage/el2/base/cache/1.png', {left: 0, top: 0, right: 100, bottom: 100});
+}
+```
+
+### mouseClick<sup>10+</sup>
+
+mouseClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise<void>;
+
+Injects a mouse click at the specified coordinates, with the optional key or key combination. For example, if the value of **key1** is **2072**, the **Ctrl** button is pressed with the mouse click.
+
+**System capability**: SystemCapability.Test.UiTest
+
+**Parameters**
+
+| Name| Type                         | Mandatory| Description               |
+| ------ | ----------------------------- | ---- | ------------------- |
+| p      | [Point](#point9)              | Yes  | Coordinates of the mouse click.   |
+| btnId  | [MouseButton](#mousebutton10) | Yes  | Mouse button pressesd.   |
+| key1   | number                        | Yes  | The first key value.|
+| key2   | number                        | No  | The second key value.|
+
+**Error codes**
+
+For details about the error codes, see [UiTest Error Codes](../errorcodes/errorcode-uitest.md).
+
+| ID| Error Message                                |
+| -------- | ---------------------------------------- |
+| 17000002 | API does not allow calling concurrently. |
+
+**Example**
+
+```js
+async function demo() {
+    let driver = Driver.create();
+    await driver.mouseClick({x:248, y:194}, MouseButton.MOUSE_BUTTON_LEFT, 2072);
+}
+```
+
+### mouseScroll<sup>10+</sup>
+
+mouseScroll(p: Point, down: boolean, d: number, key1?: number, key2?: number): Promise<void>;
+
+Injects a mouse scroll action at the specified coordinates, with the optional key or key combination. For example, if the value of **key1** is **2072**, the **Ctrl** button is pressed with mouse scrolling.
+
+**System capability**: SystemCapability.Test.UiTest
+
+**Parameters**
+
+| Name| Type            | Mandatory| Description                                               |
+| ------ | ---------------- | ---- | --------------------------------------------------- |
+| p      | [Point](#point9) | Yes  | Coordinates of the mouse click.                                   |
+| down   | boolean          | Yes  | Whether the scroll wheel slides downward.                             |
+| d      | number           | Yes  | Number of grids by which the scroll wheel slides. Sliding by one grid means a 120-pixel offset of the target point.|
+| key1   | number           | Yes  | The first key value.                                |
+| key2   | number           | No  | The second key value.                                |
+
+**Error codes**
+
+For details about the error codes, see [UiTest Error Codes](../errorcodes/errorcode-uitest.md).
+
+| ID| Error Message                                |
+| -------- | ---------------------------------------- |
+| 17000002 | API does not allow calling concurrently. |
+
+**Example**
+
+```js
+async function demo() {
+    let driver = Driver.create();
+    await driver.mouseScroll({x:360, y:640}, true, 30, 2072)
+}
+```
+
+### mouseMoveTo<sup>10+</sup>
+
+mouseMoveTo(p: Point): Promise<void>;
+
+Moves the cursor to the target point.
+
+**System capability**: SystemCapability.Test.UiTest
+
+**Parameters**
+
+| Name| Type            | Mandatory| Description          |
+| ------ | ---------------- | ---- | -------------- |
+| p      | [Point](#point9) | Yes  | Coordinates of the target point.|
+
+**Error codes**
+
+For details about the error codes, see [UiTest Error Codes](../errorcodes/errorcode-uitest.md).
+
+| ID| Error Message                                |
+| -------- | ---------------------------------------- |
+| 17000002 | API does not allow calling concurrently. |
+
+**Example**
+
+```js
+async function demo() {
+    let driver = Driver.create();
+    await driver.mouseMoveTo({x:100, y:100})
+}
+```
+
 ## PointerMatrix<sup>9+</sup>
 
 Implements a **PointerMatrix** object that stores coordinates and behaviors of each action of each finger in a multi-touch operation.
@@ -2196,12 +2443,12 @@ Sets the coordinates for the action corresponding to the specified finger and st
 ```js
 async function demo() {
     let pointers = PointerMatrix.create(2,3);
-    pointers.setPoint(0,0,{X:230,Y:480});
-    pointers.setPoint(0,1,{X:250,Y:380});
-    pointers.setPoint(0,2,{X:270,Y:280});
-    pointers.setPoint(1,0,{X:230,Y:680});
-    pointers.setPoint(1,1,{X:240,Y:580});
-    pointers.setPoint(1,2,{X:250,Y:480});
+    pointers.setPoint(0,0,{x:230,y:480});
+    pointers.setPoint(0,1,{x:250,y:380});
+    pointers.setPoint(0,2,{x:270,y:280});
+    pointers.setPoint(1,0,{x:230,y:680});
+    pointers.setPoint(1,1,{x:240,y:580});
+    pointers.setPoint(1,2,{x:250,y:480});
 }
 ```
 
@@ -2919,7 +3166,7 @@ let by = BY.selected(true); // Use the static constructor BY to create a By obje
 
 isBefore(by: By): By
 
-Specifies the attributes of the component before which the target component is located.
+Specifies that the target component is located before the given attribute component.
 
 This API is deprecated since API version 9. You are advised to use [isBefore<sup>9+</sup>](#isbefore9).
 
@@ -2929,7 +3176,7 @@ This API is deprecated since API version 9. You are advised to use [isBefore<sup
 
 | Name| Type               | Mandatory| Description            |
 | ------ | ------------------- | ---- | ---------------- |
-| by     | [By](#bydeprecated) | Yes  | Attributes of the component before which the target component is located.|
+| by     | [By](#bydeprecated) | Yes  | Information about the attribute component.|
 
 **Return value**
 
@@ -2940,14 +3187,14 @@ This API is deprecated since API version 9. You are advised to use [isBefore<sup
 **Example**
 
 ```js
-let by = BY.isBefore(BY.text('123')); // Use the static constructor BY to create a By object and specify the attributes of the component before which the target component is located.
+let by = BY.isBefore(BY.text('123')); // Use the static constructor BY to create a By object, specifying that the target component is located before the given attribute component.
 ```
 
 ### isAfter<sup>(deprecated)</sup>
 
 isAfter(by: By): By
 
-Specifies the attributes of the component after which the target component is located.
+Specifies the target component is located after the given attribute component.
 
 This API is deprecated since API version 9. You are advised to use [isAfter<sup>9+</sup>](#isafter9).
 
@@ -2957,7 +3204,7 @@ This API is deprecated since API version 9. You are advised to use [isAfter<sup>
 
 | Name| Type               | Mandatory| Description            |
 | ------ | ------------------- | ---- | ---------------- |
-| by     | [By](#bydeprecated) | Yes  | Attributes of the component before which the target component is located.|
+| by     | [By](#bydeprecated) | Yes  | Information about the attribute component.|
 
 **Return value**
 
@@ -2968,7 +3215,7 @@ This API is deprecated since API version 9. You are advised to use [isAfter<sup>
 **Example**
 
 ```js
-let by = BY.isAfter(BY.text('123')); // Use the static constructor BY to create a By object and specify the attributes of the component after which the target component is located.
+let by = BY.isAfter(BY.text('123')); // Use the static constructor BY to create a By object, specifying that the target component is located after the given attribute component.
 ```
 
 ## UiComponent<sup>(deprecated)</sup>
@@ -3673,6 +3920,6 @@ This API is deprecated since API version 9. You are advised to use [screenCap<su
 ```js
 async function demo() {
     let driver = UiDriver.create();
-    await driver.screenCap('/local/tmp/1.png');
+    await driver.screenCap('/data/storage/el2/base/cache/1.png');
 }
 ```

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

@@ -8,8 +8,10 @@ There are two types of updates: SD card update and over the air (OTA) update.
 - The OTA update depends on the server deployed by the device manufacturer for managing update packages. The OTA server IP address is passed by the caller. The request interface is fixed and developed by the device manufacturer.
 
 > **NOTE**
-> - The initial APIs of this module are supported since API version 9. Newly added APIs will be marked with a superscript to indicate their earliest API version.
-> - The APIs provided by this module are system APIs.
+>
+> The initial APIs of this module are supported since API version 9. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+>
+> The APIs provided by this module are system APIs.
 
 ## Modules to Import
 
@@ -2034,7 +2036,7 @@ Enumerates update states.
 | WAITING_INSTALL  | 30   | Waiting for installation. |
 | UPDATING         | 31   | Updating. |
 | WAITING_APPLY    | 40   | Waiting for applying the update. |
-| APPLYING         | 21   | Applying the update. |
+| APPLYING         | 41   | Applying the update. |
 | UPGRADE_SUCCESS  | 50   | Update succeeded.|
 | UPGRADE_FAIL     | 51   | Update failed.|
 
@@ -2056,7 +2058,7 @@ Enumerates event IDs.
 
 | Name                    | Value       | Description    |
 | ---------------------- | ---------- | ------ |
-| EVENT_TASK_BASE        | 0x01000000 | Task event.  |
+| EVENT_TASK_BASE        | EventClassify.TASK | Task event.  |
 | EVENT_TASK_RECEIVE     | 0x01000001 | Task received.  |
 | EVENT_TASK_CANCEL      | 0x01000010 | Task cancelled.  |
 | EVENT_DOWNLOAD_WAIT    | 0x01000011 | Waiting for download.   |

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

-# @ohos.usbManager (USB Management)
+# @ohos.usbManager (USB Manager)
 
 The **usbManager** module provides USB device management functions, including USB device list query, bulk data transfer, control transfer, and permission control on the host side as well as port management, and function switch and query on the device side.
 
@@ -30,7 +30,7 @@ Obtains the list of USB devices connected to the host. If no device is connected
 
 ```js
 let devicesList = usb.getDevices();
-console.log(`devicesList = ${JSON.stringify(devicesList)}`);
+console.log(`devicesList = ${devicesList}`);
 // devicesList is a list of USB devices.
 // A simple example of devicesList is provided as follows:
 [
@@ -119,13 +119,12 @@ For details about the error codes, see [USB Error Codes](../errorcodes/errorcode
 let devicesList = usb.getDevices();
 if (devicesList.length == 0) {
   console.log(`device list is empty`);
-  return;
 }
 
 let device = devicesList[0];
 usb.requestRight(device.name);
 let devicepipe = usb.connectDevice(device);
-console.log(`devicepipe = ${JSON.stringify(devicepipe)}`);
+console.log(`devicepipe = ${devicepipe}`);
 ```
 
 ## usb.hasRight
@@ -155,7 +154,7 @@ Checks whether the user, for example, the application or system, has the device
 ```js
 let devicesName="1-1";
 let bool = usb.hasRight(devicesName);
-console.log(bool);
+console.log(`${bool}`);
 ```
 
 ## usb.requestRight
@@ -183,7 +182,7 @@ Requests the temporary permission for the application to access a USB device. Th
 ```js
 let devicesName="1-1";
 usb.requestRight(devicesName).then((ret) => {
-  console.log(`requestRight = ${JSON.stringify(ret)}`);
+  console.log(`requestRight = ${ret}`);
 });
 ```
 
@@ -211,7 +210,7 @@ Removes the permission for the application to access a USB device.
 
 ```js
 let devicesName="1-1";
-if (usb.removeRight(devicesName) {
+if usb.removeRight(devicesName) {
   console.log(`Succeed in removing right`);
 }
 ```
@@ -246,7 +245,7 @@ Adds the permission for the application to access a USB device.
 ```js
 let devicesName = "1-1";
 let bundleName = "com.example.hello";
-if (usb.addRight(bundleName, devicesName) {
+if usb.addRight(bundleName, devicesName) {
   console.log(`Succeed in adding right`);
 }
 ```
@@ -455,8 +454,9 @@ Before you do this, call [usb.getDevices](#usbgetdevices) to obtain the USB devi
 **Example**
 
 ```js
-usb.controlTransfer(devicepipe, USBControlParams).then((ret) => {
- console.log(`controlTransfer = ${JSON.stringify(ret)}`);
+let param = new usb.USBControlParams();
+usb.controlTransfer(devicepipe, param).then((ret) => {
+ console.log(`controlTransfer = ${ret}`);
 })
 ```
 
@@ -492,7 +492,7 @@ Before you do this, call [usb.getDevices](#usbgetdevices) to obtain the USB devi
 // Pass the obtained USB device as a parameter to usb.connectDevice. Then, call usb.connectDevice to connect the USB device.
 // Call usb.claimInterface to claim the USB interface. After that, call usb.bulkTransfer to start bulk transfer.
 usb.bulkTransfer(devicepipe, endpoint, buffer).then((ret) => {
- console.log(`bulkTransfer = ${JSON.stringify(ret)}`);
+ console.log(`bulkTransfer = ${ret}`);
 });
 ```
 
@@ -579,7 +579,7 @@ Converts the USB function list in the numeric mask format to a string in Device
 **Example**
 
 ```js
-let funcs = ACM | ECM;
+let funcs = usb.ACM | usb.ECM;
 let ret = usb.usbFunctionsToString(funcs);
 ```
 
@@ -608,7 +608,7 @@ Sets the current USB function list in Device mode.
 **Example**
 
 ```js
-let funcs = HDC;
+let funcs = usb.HDC;
 usb.setCurrentFunctions(funcs).then(() => {
     console.info('usb setCurrentFunctions successfully.');
 }).catch(err => {
@@ -716,7 +716,7 @@ Sets the role types supported by a specified port, which can be **powerRole** (f
 
 ```js
 let portId = 1;
-usb.usb.setPortRoles(portId, usb.PowerRoleType.SOURCE, usb.DataRoleType.HOST).then(() => {
+usb.setPortRoles(portId, usb.PowerRoleType.SOURCE, usb.DataRoleType.HOST).then(() => {
     console.info('usb setPortRoles successfully.');
 }).catch(err => {
     console.error('usb setPortRoles failed: ' + err.code + ' message: ' + err.message);

en/application-dev/reference/errorcodes/errorcode-hiappevent.md

@@ -15,6 +15,7 @@ This error code is reported if the **write** API is called to perform applicatio
 The application event logging function is disabled.
 
 **Solution**
+
 Invoke the **configure** API to enable the application event logging function.
 
    ```js
@@ -41,6 +42,7 @@ The specified event domain name does not comply with the following rules:
 - The event domain name is not empty and contains a maximum of 32 characters.
 
 **Solution**
+
 Specify a valid event domain name.
 
 ## 11101002 Invalid Event Name

en/application-dev/reference/errorcodes/errorcode-net-socket.md

 # Socket Error Codes
 
+> **NOTE**
+>
+> The following describes only the error codes specific to the **socket** module. For details about common error codes, see [Common Error Codes](errorcode-universal.md) file.
+
 ## 2301001 Operation Not Allowed
 
 **Error Message**

en/device-dev/subsystems/Readme-EN.md

@@ -109,3 +109,6 @@
   - [bytrace](subsys-toolchain-bytrace-guide.md)
   - [hdc](subsys-toolchain-hdc-guide.md)
   - [hiperf](subsys-toolchain-hiperf.md)
+- Power Management
+    - Display Management
+        - [System Brightness Customization](subsys-power-brightness-customization.md)

zh-cn/application-dev/application-models/stage-model-development-overview.md

@@ -10,7 +10,7 @@
 
 - [UIAbility组件](uiability-overview.md)和[ExtensionAbility组件](extensionability-overview.md)
   
-  Stage模型提供UIAbility和ExtensionAbility两种类型的组件，这两种组件都有具体的类承载，支持面向对象的开发方式。他们是Ability抽象概念在Stage模型上的具体实现。他们是Ability管理服务调度的单元，其生命周期都是由Ability管理服务进行调度的。
+  Stage模型提供UIAbility和ExtensionAbility两种类型的组件，这两种组件都有具体的类承载，支持面向对象的开发方式。
   
   - UIAbility组件是一种包含UI界面的应用组件，主要用于和用户交互。例如，图库类应用可以在UIAbility组件中展示图片瀑布流，在用户选择某个图片后，在新的页面中展示图片的详细内容。同时用户可以通过返回键返回到瀑布流页面。UIAbility的生命周期只包含创建/销毁/前台/后台等状态，与显示相关的状态通过WindowStage的事件暴露给开发者。