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

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

@@ -5,7 +5,7 @@
   - [Interpretation of the Application Model](application-model-description.md)
 - Stage Model Development
   - [Stage Model Development Overview](stage-model-development-overview.md)
-  - Stage Mode Application Components
+  - Stage Model Application Components
     - [Application- or Component-Level Configuration](application-component-configuration-stage.md)
     - UIAbility Component
       - [UIAbility Component Overview](uiability-overview.md)
@@ -56,12 +56,13 @@
       - [Using Explicit Want to Start an Application Component](ability-startup-with-explicit-want.md)
       - [Using Implicit Want to Open a Website](ability-startup-with-implicit-want.md)
       - [Using Want to Share Data Between Applications](data-share-via-want.md)
-    - [Component Startup Rules](component-startup-rules.md)
+    - [Component Startup Rules (Stage Model)](component-startup-rules.md)
     - Inter-Device Application Component Interaction (Continuation)
       - [Continuation Overview](inter-device-interaction-hop-overview.md)
       - [Cross-Device Migration (for System Applications Only)](hop-cross-device-migration.md)
       - [Multi-device Collaboration (for System Applications Only)](hop-multi-device-collaboration.md)
     - [Subscribing to System Environment Variable Changes](subscribe-system-environment-variable-changes.md)
+    - [Setting Atomic Services to Support Sharing](atomic-services-support-sharing.md)
   - Process Model
     - [Process Model Overview](process-model-stage.md)
     - Common Events
@@ -81,12 +82,12 @@
   - Mission Management
     - [Mission Management Scenarios](mission-management-overview.md)
     - [Mission and Launch Type](mission-management-launch-type.md)
-    - [Page Stack and MissionList](page-mission-stack.md)
+    - [Page Stack and Mission List](page-mission-stack.md)
     - [Setting the Icon and Name of a Mission Snapshot](mission-set-icon-name-for-task-snapshot.md)
   - [Application Configuration File](config-file-stage.md)
 - FA Model Development
   - [FA Model Development Overview](fa-model-development-overview.md)
-  - FA Mode Application Components
+  - FA Model Application Components
     - [Application- or Component-Level Configuration](application-component-configuration-fa.md)
     - PageAbility Component Development
       - [PageAbility Component Overview](pageability-overview.md)
@@ -119,7 +120,7 @@
     - [Widget Development](widget-development-fa.md)
     - [Context](application-context-fa.md)
     - [Want](want-fa.md)
-    - [Component Startup Rules](component-startup-rules-fa.md)
+    - [Component Startup Rules (FA Model)](component-startup-rules-fa.md)
   - Process Model
     - [Process Model Overview](process-model-fa.md)
     - [Common Events](common-event-fa.md)

en/application-dev/application-models/atomic-services-support-sharing.md

+# Setting Atomic Services to Support Sharing
+By means of sharing, users can quickly access atomic services and use their features.
+
+## How to Develop
+In the sharing scenario, there are two parties involved: a target application that shares data and an application that obtains the shared data. The two can be physically the same. The target application uses the **onShare()** lifecycle callback to set the data to share. After the target application is started, you can run the **hdc shell aa dump -a** command to check the started services and processes and find its mission ID. After the current application is started, call the **abilityManager.acquireShareData()** API with the mission ID passed in to obtain the shared data.
+> **NOTE**
+>
+> The mission ID of the target application can also be obtained by calling [missionManager.getMissionInfos()](../reference/apis/js-apis-app-ability-missionManager.md#getmissioninfos).
+
+1. The target application calls **UIAbility.onShare()** provided by the UIAbility component to set the data to share. **ohos.extra.param.key.contentTitle** indicates the title of the content to share in the sharing box, **ohos.extra.param.key.shareAbstract** provides an abstract description of the content, and **ohos.extra.param.key.shareUrl** indicates the online address of the service. You need to set these three items as objects, with the key set to **title**, **abstract**, and **url**, respectively.
+
+   ```ts
+   import AbilityConstant from '@ohos.app.ability.AbilityConstant';
+   class MyUIAbility extends UIAbility {
+       onShare(wantParams) {
+           console.log('onShare');
+           wantParams['ohos.extra.param.key.contentTitle'] = {title: "W3"};
+           wantParams['ohos.extra.param.key.shareAbstract'] = {abstract: "communication for huawei employee"};
+           wantParams['ohos.extra.param.key.shareUrl'] = {url: "w3.huawei.com"};
+       }
+   }
+   ```
+
+2. The current application calls **abilityManager.acquireShareData()** to obtain the data shared by the target application. **missionId** indicates the target application's mission ID, which can be obtained by running the **hdc shell aa dump -a** command or calling the **missionManager.getMissionInfos()** API after the target application is started. **wantParam** indicates the data shared by the target application through the **UIAbility.onShare()** lifecycle callback.
+
+   ```ts
+   import abilityManager from '@ohos.app.ability.abilityManager';
+   try {
+       abilityManager.acquireShareData(1, (err, wantParam) => {
+           if (err) {
+               console.error(`acquireShareData fail, err: ${JSON.stringify(err)}`);
+           } else {
+               console.log(`acquireShareData success, data: ${JSON.stringify(wantParam)}`);
+           }
+       });
+   } catch (paramError) {
+       console.error(`error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}`);
+   }
+   ```

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

@@ -4,7 +4,12 @@
 - [Switching to Full SDK](full-sdk-switch-guide.md)
 - [Application Model Development](faqs-ability.md)
 - ArkUI Framework Development (ArkTS)
-  - [ArkUI Development (ArkTS Syntax)](faqs-arkui-arkts.md)
+  - [ArkTS Syntax Usage](faqs-arkui-arkts.md)
+  - [ArkUI Component Development (ArkTS)](faqs-arkui-component.md)
+  - [ArkUI Layout Development (ArkTS)](faqs-arkui-layout.md)
+  - [ArkUI Routing/Navigation Development (ArkTS)](faqs-arkui-route-nav.md)
+  - [ArkUI Animation/Interaction Event Development (ArkTS)](faqs-arkui-animation-interactive-event.md)
+- [ArkUI Development (JS)](faqs-arkui-js.md)
 - [Web Development](faqs-arkui-web.md)
 - [Bundle Management Development](faqs-bundle-management.md)
 - [Resource Manager Development](faqs-globalization.md)

en/application-dev/faqs/faqs-arkui-animation-interactive-event.md

+# ArkUI Animation/Interaction Event Development (ArkTS)
+
+## What should I do if the onBlur and onFocus callbacks cannot be triggered?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+**Symptom**
+
+The **onBlur** and **onFocus** callbacks of the focus event cannot be triggered.
+
+**Solution**
+
+Check the trigger device. By default, the focus event (and the **onBlur** and **onFocus** callbacks) can be triggered only by the Tab button and arrow buttons on the connected keyboard. To enable the focus event to be triggered by a touch, add the **focusOnTouch** attribute for the target component.
+
+**Reference**
+
+[Focus Control](../reference/arkui-ts/ts-universal-attributes-focus.md)
+
+## How do I disable the scroll event of a \<Grid> nested in the \<Scroll>?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+Implement nested scrolling of the containers, by using the **onScrollFrameBegin** event and the **scrollBy** method.
+
+**Reference**
+
+[Scroll](../reference/arkui-ts/ts-container-scroll.md#example-2)
+
+## How do I enable a component to rotate continuously?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+You can use [attribute animation](../reference/arkui-ts/ts-animatorproperty.md) to that effect.
+
+## How do I scroll a list with the keyboard?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+**Solution** 
+
+- Add **focusable\(true\)** to the list item to enable it to obtain focus.
+
+- Nest a focusable component, for example, **\<Button>**, at the outer layer of each item.
+
+## Why is the click event not triggered for the focused component upon the press of the Enter key after keyboard navigation?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+By default, the built-in click event of the component and the custom **onClick** click event are bound to the space bar instead of the Enter key.
+
+## How do I block event bubbling when a button is nested in multi-layer components?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+You can bind the button to the **stopPropagation** parameter.
+
+## How do I disable the transition effect between pages when the router or navigator is used to switch between pages?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+1.  Define the **pageTransition** method for the current and target pages, by following instructions in [Example](../reference/arkui-ts/ts-page-transition-animation.md#example).
+2.  Set the **duration** parameter of both **PageTransitionEnter** and **PageTransitionExit** to **0**.
+
+## How do I fix misidentification of the pan gesture where container nesting is involved?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+The pan gesture requires a minimum 5 vp movement distance of a finger on the screen. You can set the **distance** parameter in **PanGesture** to **1** so that the pan gesture can be more easily recognized.
+
+**Reference**
+
+[PanGesture](../reference/arkui-ts/ts-basic-gestures-pangesture.md)
+
+## Can I use the fontFamily attribute to set different fonts for OpenHarmony applications?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9)
+
+No. For applications developed based on OpenHarmony, only the default font, HarmonyOS Sans, is supported.
+
+## How do I implement a text input box that shows a soft keyboard when touched and hides the soft keyboard when a button is touched?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+Use **focusControl** for the **\<TextInput>** component to control its focus. The **\<TextInput>** component shows a soft keyboard when it gains focus and hides the soft keyboard when it loses focus.
+
+**Example**
+
+```
+build() {
+  Column() {
+    TextInput()
+    Button(`hide`)
+      .key('button')
+      .onClick(()=>{
+        focusControl.requestFocus('button')
+      })
+  }
+}
+```
+
+## How do I implement a button that only responds to the bound onClick event, but not the onTouch event bound to the button's parent component?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+Bind **onTouch** to the **\<Button>** component and use **stopPropagation\(\)** in **onTouch** to prevent **onTouch** from bubbling up to the parent component.
+
+**Example**
+
+```
+build() {
+  Row() {
+    Button ("Click Me")
+      .width(100)
+      .width(100)
+      .backgroundColor('#f00')
+      .onClick(()=>{
+        console.log("Button onClick")
+      })
+      .onTouch((e) => {
+        console.log("Button onTouch")
+        e.stopPropagation()
+      })
+  }
+  .onTouch(() => {
+    console.log("Row onTouch")
+  })
+}
+```
+
+## Why is the menu bound to a component not displayed by a right-click on the component?
+
+Applicable to: OpenHarmony 3.2 Beta (API version 9)
+
+**Solution**
+
+Currently, the menu is displayed when the bound component is clicked or long pressed.
+
+## How do I shield the default keyboard popup behavior of the \<TextInput> component?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9)
+
+Set the **focusable** attribute of the **\<TextInput>** component to **false**. In this way, the component is not focusable and therefore will not bring up the keyboard.
+
+## How do I implement the slide up and slide down effect for page transition?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9)
+
+**Solution**
+
+You can use the **pageTransition** API to implement the page transition effect. Specifically, set the **slide** attribute in **PageTransitionEnter** and **PageTransitionExit** to **SlideEffect.Bottom**. In this way, the page slides in and out from the bottom.
+
+**Example**
+
+```
+// Index.ets
+@Entry
+@Component
+struct PageTransition1 {
+  build() {
+    Stack({alignContent: Alignment.Bottom}) {
+      Navigator({ target: 'pages/Page1'}) {
+        Image($r('app.media.ic_banner01')).width('100%').height(200) // Save the image in the media folder.
+      }
+    }.height('100%').width('100%')
+  }
+  pageTransition() {
+    PageTransitionEnter({ duration: 500, curve: Curve.Linear }).slide(SlideEffect.Bottom)
+    PageTransitionExit({ duration: 500, curve: Curve.Ease }).slide(SlideEffect.Bottom)
+  }
+}
+```
+
+```
+// Page1.ets
+@Entry
+@Component
+struct PageTransition2 {
+  build() {
+    Stack({alignContent: Alignment.Bottom}) {
+      Navigator({ target: 'pages/Index'}) {
+        Image($r('app.media.ic_banner02')).width('100%').height(200) // Save the image in the media folder.
+      }
+    }.height('100%').width('100%')
+  }
+  pageTransition() {
+    PageTransitionEnter({ duration: 500, curve: Curve.Linear }).slide(SlideEffect.Bottom)
+    PageTransitionExit({ duration: 500, curve: Curve.Ease }).slide(SlideEffect.Bottom)
+  }
+}
+```
+
+**Reference**
+
+[Page Transition Animation](../ui/arkts-page-transition-animation.md)
+
+## How do I configure custom components to slide in and out from the bottom?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9)
+
+**Symptom**
+
+Custom components A and B need to deliver the following effects: When custom component A, displayed at the bottom of the screen by default, is touched, it is hidden, and custom component B slides in from the bottom. When custom component B is touched, it is hidden, and custom component A slides in from the bottom.
+
+**Solution**
+
+You can use the **transition** attribute to create component transition animations. Set the **type** parameter to specify the component transition type, which can be component addition, component deletion, or both. Set the **translate** parameter to specify the translation of the component during transition. **NOTE**<br>The **transition** attribute must work with **animateTo**. The animation duration, curve, and delay follow the settings in **animateTo**.
+
+**Example**
+
+```
+@Entry
+@Component
+struct ComponentTransition {
+  @State flag: boolean = true;
+
+  build() {
+    Stack({alignContent: Alignment.Bottom}) {
+        if (this.flag) {
+          ComponentChild1({ flag: $flag })
+            .transition({ type: TransitionType.Insert,translate: { x: 0, y: 200 } })
+        }
+        if (!this.flag) {
+          ComponentChild2({ flag: $flag })
+            .transition({ type: TransitionType.Insert, translate: { x: 0, y: 200 } })
+        }
+    }.height('100%').width('100%')
+  }
+}
+
+@Component
+struct ComponentChild1 {
+  @Link flag: boolean
+
+  build() {
+    Column() {
+      Image($r('app.media.ic_banner01'))
+        .width('100%')
+        .height(200)
+        .onClick(() => {
+          animateTo({ duration: 1000 }, () => {
+            this.flag = !this.flag;
+          })
+        })
+    }
+  }
+}
+
+@Component
+struct ComponentChild2 {
+  @Link flag: boolean
+
+  build() {
+    Column() {
+      Image($r('app.media.ic_banner02'))
+        .width('100%')
+        .height(200)
+        .onClick(() => {
+          animateTo({ duration: 1000 }, () => {
+            this.flag = !this.flag;
+          })
+        })
+    }
+  }
+}
+```
+
+**Reference**
+
+[Transition Animation Within the Component](../ui/arkts-transition-animation-within-component.md)

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

-# ArkUI Development (ArkTS Syntax)
+# ArkTS Syntax Usage
 
 ## How do I dynamically create components using code in ArkUI?
 
@@ -522,7 +522,7 @@ Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
 
 **Reference**
 
-[Resource Categories and Access](../quick-start/resource-categories-and-access.md) and [@ohos.resourceManager (Resource Manager)](../reference/apis/js-apis-resource-manager.md#getstring)
+[Resource Categories and Access](../quick-start/resource-categories-and-access.md) and [@ohos.resourceManager (Resource Manager)](../reference/apis/js-apis-resource-manager.md)
 
 ## How do I convert the XML format to the JSON format?
 

en/application-dev/faqs/faqs-arkui-js.md

+# ArkUI Development (JS)
+
+## Why can't array variables be used to control component attributes?
+
+Applicable to: OpenHarmony (DevEco Studio 3.0.0.993, API version 8)
+
+Currently, the web-like development paradigm does not listen for the modification of elements in an array. Therefore, the page refresh can be triggered only when the array object is modified, but not when an element in the array is modified. In the following example, the **test1\(\)** statement, which assigns values to the entire array, will disable the related **\<Button>** component; in contrast, the **test2\(\)** statement, which assigns a value to an element in the array, will not disable the **\<Button>** component. In addition to **test1\(\)**, you can also use the method of modifying the array, for example, **splice\(\)**, to trigger the page refresh.
+
+```
+test1() {this.isDisabled = [true, true, true, true, true]; // This statement disables the <Button> component.
+test2() {this.isDisabled[0] = true; // This statement does not work for the <Button> component.
+```
+
+## Does the \<input> component support center alignment?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9, FA model)
+
+**Symptom**
+
+The **text-align** style does not work for the **\<input>** component.
+
+**Solution**
+
+The **text-align** style works for the **\<text>** component, but not for the **\<input>** component.
+
+**Reference**
+
+[input](../reference/arkui-js/js-components-basic-input.md), [text](../reference/arkui-js/js-components-basic-text.md)
+
+
+## How do I determine whether a value exists in a JS object?
+
+Applicable to: OpenHarmony 3.2 Release (API version 9)
+
+**Solution**
+
+Use **Object.values\(*object name*\).indexOf\(*value to be checked*\)**. If **-1** is returned, the corresponding value is not included. Otherwise, the corresponding value is included.

en/application-dev/faqs/faqs-arkui-layout.md

+# ArkUI Layout Development (ArkTS)
+
+## What should I do if the height settings in position do not take effect?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+**Solution**
+
+When **position** is set for a container component, it is taken out of normal flow and works independently from the outer container. In this case, the height does not take effect. You can replace the outer container with a stack to solve this issue.
+
+## How do I implement horizontal scrolling on a \<Grid> component?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+Set **rowsTemplate** (the number of rows) for the **\<Grid>** component and do not set **columnsTemplate** (the number of columns). In this way, the **\<Grid>** component scrolls horizontally when its content does not fit within its width.
+
+## What should I do if the \<List> component cannot be dragged to the bottom when it is used with another component and does not have the size specified?
+
+Applicable to: OpenHarmony 3.2 Beta 5 (API version 9)
+
+Add the **layoutWeight** attribute for the **\<List>** component so that it takes up the remaining height (or width, depending on the scrolling direction) adapatively.
+
+By default, the **\<List>** component, as a scrollable container, takes up the entire screen height. When it is used with any component whose height is fixed, you need to explicitly add the **layoutWeight** attribute for the **\<List>** component so that it takes up the remaining height instead of the entire screen height.
+
+## Can tab switching be disabled for the \<Tabs> component?
+
+Applicable to: OpenHarmony 3.2 Release (API version 9)
+
+No. This feature is not supported.
+
+## How do I intercept the onBackPress event so that it does not trigger page return?
+
+Applicable to: OpenHarmony 3.2 Release (API version 9)
+
+If **true** is returned in **onBackPress**, the page executes its own return logic instead of the default return logic.
+
+**Reference**
+
+[onBackPress](../reference/arkui-ts/ts-custom-component-lifecycle.md#onbackpress).
+
+## How do I implement a sticky header for a list item group in the \<List> component?
+
+Applicable to: OpenHarmony 3.2 Release (API version 9)
+
+You can use the **sticky** attribute of the **\<List>** component together with the **\<ListItemGroup>** component. Specifically, set the **sticky** attribute of the **\<List>** component to **StickyStyle.Header** and set the **header** parameter of the corresponding **\<ListItemGroup>** component.
+
+**Reference**
+
+[Adding a Sticky Header](../ui/arkts-layout-development-create-list.md#adding-a-sticky-header)
\ No newline at end of file

en/application-dev/faqs/faqs-arkui-route-nav.md

+# ArkUI Routing/Navigation Development (ArkTS)
+
+## Why can't class objects be transferred through params in the router API?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9, stage model)
+
+Only attributes in an object can be transferred, and methods in the object cannot.
+
+## How do I use router to implement page redirection in the stage model?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9, stage model)
+
+1.  To implement page redirection through **router**, add all redirected-to pages to the **pages** list in the **main\_pages.json** file.
+2.  Page routing APIs in **router** can be invoked only after page rendering is complete. Do not call these APIs in **onInit** or **onReady** when the page is still in the rendering phase.
+
+**Reference**
+
+[@ohos.router (Page Routing)](../reference/apis/js-apis-router.md)
+
+## Will a page pushed into the stack through router.push be reclaimed?
+
+Applicable to: OpenHarmony 3.2 Beta5 (API version 9, stage model)
+
+After being pushed to the stack through **router.push**, a page can be reclaimed only when it is popped from the stack through **router.back**.
+
+**Reference**
+
+[router.getParams](../reference/apis/js-apis-router.md#routergetparams)
\ No newline at end of file

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

 # Native APIs
 
-- [Introduction to Native APIs](introduction.md)
 - [Using Native APIs in Application Projects](napi-guidelines.md)
 - [Drawing Development](drawing-guidelines.md)
 - [Raw File Development](rawfile-guidelines.md)
 - [Native Window Development](native-window-guidelines.md)
 - [Using MindSpore Lite for Model Inference](mindspore-lite-guidelines.md)
 - [Connecting the Neural Network Runtime to an AI Inference Framework](neural-network-runtime-guidelines.md)
+- [Purgeable Memory Development](purgeable-memory-guidelines.md)

en/application-dev/napi/purgeable-memory-guidelines.md

+# Purgeable Memory Development
+
+## When to Use
+
+You can use the native purgeable memory APIs to apply for and release purgeable memory.
+
+
+The following scenarios are common for native purgeable memory development:
+
+* Apply for a **PurgeableMemory** object and write data to the object.
+* Release the **PurgeableMemory** object when it is no longer required.
+
+## Available APIs
+
+| API| Description| 
+| -------- | -------- |
+| OH_PurgeableMemory \*OH_PurgeableMemory_Create(size_t size, OH_PurgeableMemory_ModifyFunc func, void \*funcPara) | Creates a **PurgeableMemory** object. A new **PurgeableMemory** object is generated each time this API is called.| 
+| bool OH_PurgeableMemory_Destroy(OH_PurgeableMemory \*purgObj) | Destroys a **PurgeableMemory** object.| 
+| bool OH_PurgeableMemory_BeginRead(OH_PurgeableMemory \*purgObj) | Begins a read operation on a **PurgeableMemory** object.| 
+| void OH_PurgeableMemory_EndRead(OH_PurgeableMemory \*purgObj) | Ends a read operation on a **PurgeableMemory** object and decreases the reference count of the object by 1. When the reference count reaches 0, the object can be reclaimed by the system.| 
+|bool OH_PurgeableMemory_BeginWrite(OH_PurgeableMemory \*purgObj) | Begins a write operation on a **PurgeableMemory** object.|
+|void OH_PurgeableMemory_EndWrite(OH_PurgeableMemory \*purgObj)|Ends a write operation on a **PurgeableMemory** object and decreases the reference count of the object by 1. When the reference count reaches 0, the object can be reclaimed by the system.|
+|void \*OH_PurgeableMemory_GetContent(OH_PurgeableMemory \*purgObj)|Obtains the memory data of a **PurgeableMemory** object.|
+|size_t OH_PurgeableMemory_ContentSize(OH_PurgeableMemory \*purgObj)|Obtains the memory data size of a **PurgeableMemory** object.|
+|bool OH_PurgeableMemory_AppendModify(OH_PurgeableMemory \*purgObj, OH_PurgeableMemory_ModifyFunc func, void \*funcPara)|Adds a function for modifying a **PurgeableMemory** object.|
+
+
+## How to Develop
+
+The following steps describe how to use the native purgeable memory APIs to apply for a **PurgeableMemory** object, write data to the object, and read data from the object.
+
+1. Declare the rules for creating a **PurgeableMemory** object.
+    ```c++
+    // Declare the parameters of the constructor.
+    struct ParaData{
+        int start;
+        int end;
+    }
+
+    // Declare a function for modifying the object.
+    bool FactorialFunc(void* data, size_t size, void* param){
+         bool ret = true;
+         int oriData = *(int*)(data);
+         int i = param->start;
+         while(i<param->end){
+            oriData *= i;
+         }
+         *data = oriData;
+         if(oriData < 0)
+            ret = false;
+         return ret;
+    }
+
+    // Declare the parameters of the extended function for modifying the object.
+    struct AppendParaData{
+        int newPara;
+    }
+
+    // Declare the extended function for modifying the object.
+    bool AddFunc(void* data, size_t size, void* param){
+         bool ret = true;
+         int oriData = *(int*)(data);
+         oriData += param->newPara;
+         *data = oriData;
+         return ret;
+    }
+    ```
+2. Create a **PurgeableMemory** object.
+    ```c++
+    // Define the memory data size to 4 MB.
+    #define DATASIZE (4 * 1024 * 1024)
+
+    // Declare the parameters of the constructor.
+    struct ParaData pdata = {1,2};
+
+    // Create a PurgeableMemory object.
+    OH_PurgableMmory* pPurgmem = OH_PurgableMmory_Create(DATASIZE, FactorialFunc, &pdata);
+    ```
+
+3. Perfrom a read operation on the **PurgeableMemory** object.
+    ```c++
+    // Begin a read operation on the object.
+    OH_PurgeableMemory_BeginRead(pPurgmem);
+
+    // Obtain the object size.
+    size_t size = OH_PurgeableMemory_ContentSize(pPurgmem);
+
+    // Obtain the object content.
+    ReqObj* pReqObj = (ReqObj*) OH_PurgeableMemory_GetContent(pPurgmem);
+
+    // End a read operation on the object.
+    OH_PurgeableMemory_EndRead(pPurgmem);
+    ```
+
+4. Perform a write operation on the **PurgeableMemory** object.
+    ```c++
+    // Begin a write operation on the object.
+    OH_PurgeableMemory_BeginWrite(pPurgmem)
+
+    // Obtain the object data.
+    ReqObj* pReqObj = (ReqObj*) OH_PurgeableMemory_GetContent(pPurgmem);
+
+    // Declare the parameters of the extended constructor.
+    struct AppendParaData apdata = {1};
+
+    // Update the rules for recreating the object.
+    OH_PurgeableMemory_AppendModify(pPurgmem, AddFunc, &apdata);
+
+    // Stop writing data to the object.
+    OH_PurgeableMemory_EndWrite(pPurgmem);
+    ```
+
+5. Destroy the **PurgeableMemory** object.
+    ```c++
+    // Destroy the object.
+    OH_PurgeableMemory_Destroy(pPurgmem);
+    ```

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

@@ -74,7 +74,7 @@ As shown above, the **module.json5** file contains several tags.
 
 | Name| Description| Data Type| Initial Value Allowed|
 | -------- | -------- | -------- | -------- |
-| name | Name of the module. The value is a string with a maximum of 31 bytes and must be unique in the entire application. Chinese characters are not allowed.| String| No|
+| name | Name of the module. The value is a string with a maximum of 31 bytes and must be unique in the entire application. | String| No|
 | type | Type of the module. The options are as follows:<br>- **entry**: main module of the application.<br>- **feature**: dynamic feature module of the application.<br>- **har**: static shared module.<br>- **shared**: dynamic shared module.| String| No|
 | srcEntry | Code path corresponding to the module. The value is a string with a maximum of 127 bytes.| String| Yes (initial value: left empty)|
 | description | Description of the module. The value is a string with a maximum of 255 bytes or a string resource index.| String| Yes (initial value: left empty)|
@@ -228,73 +228,6 @@ The **metadata** tag represents the custom metadata of the HAP file. The tag val
 
 The **abilities** tag represents the UIAbility configuration of the module, which is valid only for the current UIAbility component.
 
-**By default, application icons cannot be hidden from the home screen in OpenHarmony.**
-
-The OpenHarmony system imposes a strict rule on the presence of application icons. If no icon is configured in the HAP file of an application, the system uses the icon specified in the **app.json** file as the application icon and displays it on the home screen.
-
-Touching this icon will direct the user to the application details screen in **Settings**, as shown in Figure 1.
-
-To hide an application icon from the home screen, you must configure the **AllowAppDesktopIconHide** privilege. For details, see [Application Privilege Configuration Guide](../../device-dev/subsystems/subsys-app-privilege-config-guide.md).
-
-**Objectives**:
-
-This requirement on application icons is intended to prevent malicious applications from deliberately configuring no icon to block uninstallation attempts.
-
-**Setting the application icon to be displayed on the home screen**:
-
-Set **icon**, **label**, and **skills** under **abilities** in the **module.json5** file. Make sure the **skills** configuration contains **ohos.want.action.home** and **entity.system.home**.
-
-```
-{
-  "module":{
-
-    ...
-
-    "abilities": [{
-      "icon": "$media:icon",
-      "label": "Login",
-      "skills": [{
-        "actions": ["ohos.want.action.home"],
-        "entities": ["entity.system.home"],
-        "uris": []
-      }]
-    }],
-    ...
-
-  }
-}
-```
-
-**Display rules of application icons and labels on the home screen:**
-* The HAP file contains UIAbility configuration.
-  * The application icon on the home screen is set under **abilities** in the **module.json5** file.
-    * The application does not have the privilege to hide its icon from the home screen.
-      * The application icon displayed on the home screen is the icon configured for the UIAbility.
-      * The application label displayed on the home screen is the label configured for the UIAbility. If no label is configured, the bundle name is returned.
-      * The name of the UIAbility is displayed.
-      * When the user touches the home screen icon, the home screen of the UIAbility is displayed.
-    * The application has the privilege to hide its icon from the home screen.
-      * The information about the application is not returned during home screen information query, and the icon of the application is not displayed on the home screen.
-  * The application icon on the home screen is not set under **abilities** in the **module.json5** file.
-    * The application does not have the privilege to hide its icon from the home screen.
-      * The application icon displayed on the home screen is the icon specified under **app**. (The **icon** field in the **app.json** file is mandatory.)
-      * The application label displayed on the home screen is the label specified under **app**. (The **label** field in the **app.json** file is mandatory.)
-      * Touching the application icon on the home screen will direct the user to the application details screen shown in Figure 1.
-    * The application has the privilege to hide its icon from the home screen.
-      * The information about the application is not returned during home screen information query, and the icon of the application is not displayed on the home screen.
-* The HAP file does not contain UIAbility configuration.
-  * The application does not have the privilege to hide its icon from the home screen.
-    * The application icon displayed on the home screen is the icon specified under **app**. (The **icon** field in the **app.json** file is mandatory.)
-    * The application label displayed on the home screen is the label specified under **app**. (The **label** field in the **app.json** file is mandatory.)
-    * Touching the application icon on the home screen will direct the user to the application details screen shown in Figure 1.
-  * The application has the privilege to hide its icon from the home screen.
-    * The information about the application is not returned during home screen information query, and the icon of the application is not displayed on the home screen.<br><br>
-
-**Figure 1** Application details screen
-
-![Application details screen](figures/application_details.jpg)
-
-
   **Table 6** abilities
 
 | Name| Description| Data Type| Initial Value Allowed|
@@ -325,6 +258,7 @@ Set **icon**, **label**, and **skills** under **abilities** in the **module.json
 | minWindowHeight | Minimum window height supported by the UIAbility component, in vp. The minimum value is 0, and the value cannot be less than the minimum window height allowed by the platform or greater than the value of **maxWindowHeight**. For details about the window size, see [Constraints](../windowmanager/window-overview.md#constraints).| Number| Yes (initial value: minimum window height supported by the platform)|
 | excludeFromMissions | Whether the UIAbility component is displayed in the recent task list.<br>- **true**: displayed in the recent task list.<br>- **false**: not displayed in the recent task list.<br>**NOTE**<br>This attribute applies only to system applications and does not take effect for third-party applications.| Boolean| Yes (initial value: **false**)|
 | recoverable | Whether the application can be recovered to its previous state in case of a detected fault.<br>- **true**: The application can be recovered to its previous state in case of a detected fault.<br>- **false**: The application cannot be recovered to its previous state in case of a detected fault.| Boolean| Yes (initial value: **false**)|
+| unclearableMission | Whether the UIAbility component is unclearable in the recent tasks list.<br>- **true**: The UIAbility component is unclearable in the recent tasks list.<br>- **false**: The UIAbility component is clearable in the recent tasks list.<br>**NOTE**<br>This attribute works only after the [AllowMissionNotCleared](../../device-dev/subsystems/subsys-app-privilege-config-guide.md) privilege is obtained.| Boolean| Yes (initial value: **false**)|
 
 Example of the **abilities** structure:
 
@@ -369,7 +303,8 @@ Example of the **abilities** structure:
     "minWindowWidth": 1400,
     "maxWindowHeight": 300,
     "minWindowHeight": 200,
-    "excludeFromMissions": false
+    "excludeFromMissions": false,
+    "unclearableMission": false
   }]
 }
 ```
@@ -441,12 +376,12 @@ The **extensionAbilities** tag represents the configuration of extensionAbilitie
 | description | Description of the ExtensionAbility component. The value is a string with a maximum of 255 bytes or a resource index to the description.| String| Yes (initial value: left empty)|
 | icon | Icon of the ExtensionAbility component. The value is an icon resource index. If **ExtensionAbility** is set to **MainElement** of the current module, this attribute is mandatory and its value must be unique in the application.| String| Yes (initial value: left empty)|
 | label | Name of the ExtensionAbility component displayed to users. The value is a string resource index.<br>**NOTE**<br>If **ExtensionAbility** is set to **MainElement** of the current module, this attribute is mandatory and its value must be unique in the application.| String| No|
-| type | Type of the ExtensionAbility component. The options are as follows:<br>- **form**: ExtensionAbility of a widget.<br>- **workScheduler**: ExtensionAbility of a Work Scheduler task.<br>- **inputMethod**: ExtensionAbility of an input method.<br>- **service**: service component running in the background.<br>- **accessibility**: ExtensionAbility of an accessibility feature.<br>- **dataShare**: ExtensionAbility for data sharing.<br>- **fileShare**: ExtensionAbility for file sharing.<br>- **staticSubscriber**: ExtensionAbility for static broadcast.<br>- **wallpaper**: ExtensionAbility of the wallpaper.<br>- **backup**: ExtensionAbility for data backup.<br>- **window**: ExtensionAbility of a window. This type of ExtensionAbility creates a window during startup for which you can develop the GUI. The window is then combined with other application windows through **abilityComponent**.<br>- **thumbnail**: ExtensionAbility for obtaining file thumbnails. You can provide thumbnails for files of customized file types.<br>- **preview**: ExtensionAbility for preview. This type of ExtensionAbility can parse the file and display it in a window. You can combine the window with other application windows.<br>- **print**: ExtensionAbility for the print framework.<br>- **driver**: ExtensionAbility for the driver framework.<br>**NOTE**<br>The **service** and **dataShare** types apply only to system applications and do not take effect for third-party applications.| String| No|
+| type | Type of the ExtensionAbility component. The options are as follows:<br>- **form**: ExtensionAbility of a widget.<br>- **workScheduler**: ExtensionAbility of a Work Scheduler task.<br>- **inputMethod**: ExtensionAbility of an input method.<br>- **service**: service component running in the background.<br>- **accessibility**: ExtensionAbility of an accessibility feature.<br>- **dataShare**: ExtensionAbility for data sharing.<br>- **fileShare**: ExtensionAbility for file sharing.<br>- **staticSubscriber**: ExtensionAbility for static broadcast.<br>- **wallpaper**: ExtensionAbility of the wallpaper.<br>- **backup**: ExtensionAbility for data backup.<br>- **window**: ExtensionAbility of a window. This type of ExtensionAbility creates a window during startup for which you can develop the GUI. The window is then combined with other application windows through **abilityComponent**.<br>- **thumbnail**: ExtensionAbility for obtaining file thumbnails. You can provide thumbnails for files of customized file types.<br>- **preview**: ExtensionAbility for preview. This type of ExtensionAbility can parse the file and display it in a window. You can combine the window with other application windows.<br>- **print**: ExtensionAbility for the print framework.<br>- **push**: ExtensionAbility to be pushed.<br>- **driver**: ExtensionAbility for the driver framework.<br>**NOTE**<br>The **service** and **dataShare** types apply only to system applications and do not take effect for third-party applications.| String| No|
 | permissions | Permissions required for another application to access the ExtensionAbility component.<br>The value is generally in the reverse domain name notation and contains a maximum of 255 bytes. It is an array of permission names predefined by the system or customized. The name of a customized permission must be the same as the **name** value of a permission defined in the **defPermissions** attribute.| String array| Yes (initial value: left empty)|
 | uri | Data URI provided by the ExtensionAbility component. The value is a string with a maximum of 255 bytes, in the reverse domain name notation.<br>**NOTE**<br>This attribute is mandatory when the type of the ExtensionAbility component is set to **dataShare**.| String| Yes (initial value: left empty)|
 |skills | Feature set of [wants](../application-models/want-overview.md) that can be received by the ExtensionAbility component.<br>Configuration rule: In an entry package, you can configure multiple **skills** attributes with the entry capability. (A **skills** attribute with the entry capability is the one that has **ohos.want.action.home** and **entity.system.home** configured.) The **label** and **icon** in the first ExtensionAbility that has **skills** configured are used as the **label** and **icon** of the entire OpenHarmony service/application.<br>**NOTE**<br>The **skills** attribute with the entry capability can be configured for the feature package of an OpenHarmony application, but not for an OpenHarmony service.| Array| Yes (initial value: left empty)|
 | [metadata](#metadata)| Metadata of the ExtensionAbility component.| Object| Yes (initial value: left empty)|
-| exported | Whether the ExtensionAbility component can be called by other applications. <br>- **true**: The ExtensionAbility component can be called by other applications.<br>- **false**: The UIAbility component cannot be called by other applications.| Boolean| Yes (initial value: **false**)|
+| exported | Whether the ExtensionAbility component can be called by other applications. <br>- **true**: The ExtensionAbility component can be called by other applications.<br>- **false**: The ExtensionAbility component cannot be called by other applications.| Boolean| Yes (initial value: **false**)|
 
 Example of the **extensionAbilities** structure:
 

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

@@ -4,7 +4,7 @@
 The multi-HAP mechanism is used to facilitate modular management for developers. There is no one-to-one mapping between the HAP and the running process of the application. The detailed running mechanism is as follows:
 
 
-- By default, all UIAbility, ServiceExtensionAbility, and DataShareExtensionAbility components of an application (with the same bundle name) run in the same independent process, and other ExtensionAbility components of the same type run in separate processes.
+- By default, all UIAbility, ServiceExtensionAbility, and DataShareExtensionAbility components of an application (with the same bundle name) run in the same independent process (known as the main process), and other ExtensionAbility components of the same type run in separate processes.
 
 - The HAP file supports the process configuration through the **process** tag in the **module.json5** (stage model) or **config.json** (FA model) file. This feature is supported only by system applications. If **process** is configured for an HAP file, all components of the HAP file run in an independent process. Multiple HAP files can be configured with the same process, in which case the HAP files run in the same process. For details about the process configuration, see [module.json5 Configuration File](module-configuration-file.md).
 

en/application-dev/quick-start/multi-hap-release-deployment.md

@@ -9,7 +9,9 @@ Below is the process of developing, debugging, releasing, and deploying multiple
 You can use [DevEco Studio](https://developer.harmonyos.com/en/develop/deveco-studio) to create multiple modules as needed and develop services in respective modules.
 
 ## Debugging
-After building code into one or more HAP files and installing or updating these HAP files, you can debug them by using the methods:
+After building code into one or more HAP files and installing or updating these HAP files, you can debug them. You can leverage a single set of code and files to build multiple target editions for different audiences, deployment environments, operating environments, and more. For details, see [Customizing Multi-Target and Multi-Product Builds](https://developer.harmonyos.com/cn/docs/documentation/doc-guides-V3/customized-multi-targets-and-products-0000001430013853-V3?catalogVersion=V3).
+
+You can debug HAP files using the methods:
 * Using DevEco Studio for debugging
 
    Follow the instructions in [Debugging Configuration](https://developer.harmonyos.com/en/docs/documentation/doc-guides/ohos-debugging-and-running-0000001263040487#section10491183521520).
@@ -49,7 +51,7 @@ After building code into one or more HAP files and installing or updating these
     // The execution result is as follows:
     uninstall bundle successfully.
     ```
-    After the HAP files are installed or updated, you can debug them by following the instructions in [Ability Assistant](https://docs.openharmony.cn/pages/v3.2Beta/en/application-dev/tools/aa-tool.md/).
+    After the HAP files are installed or updated, you can debug them by following the instructions in [Ability Assistant](../tools/aa-tool.md).
 
 ## Release
 When your application package meets the release requirements, you can package and build it into an App Pack and release it to the application market on the cloud. The application market verifies the signature of the App Pack. If the signature verification is successful, the application market obtains the HAP files from the App Pack, signs them, and distributes the signed HAP files.

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.
+OpenHarmony provides two types of shared packages: [Harmony Archive (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.
 

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

 # @ohos.abilityAccessCtrl (Application Access Control)
 
-The **AbilityAccessCtrl** module provides APIs for application permission management, including authentication, authorization, and revocation.
+The **abilityAccessCtrl** module provides APIs for application permission management, including authentication, authorization, and revocation.
 
 > **NOTE**
 >
@@ -49,7 +49,7 @@ Checks whether a permission is granted to an application. This API uses a promis
 
 | Name  | Type                | Mandatory| Description                                      |
 | -------- | -------------------  | ---- | ------------------------------------------ |
-| tokenID   |  number   | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).            |
+| tokenID   |  number   | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).            |
 | permissionName | Permissions | Yes  | Permission to check. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 
 **Return value**
@@ -96,7 +96,7 @@ Verifies whether a permission is granted to an application. This API returns the
 
 | Name  | Type                | Mandatory| Description                                      |
 | -------- | -------------------  | ---- | ------------------------------------------ |
-| tokenID   |  number   | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).             |
+| tokenID   |  number   | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).             |
 | permissionName | Permissions | Yes  | Permission to verify. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 
 **Return value**
@@ -138,7 +138,7 @@ Grants a user_grant permission to an application. This API uses a promise to ret
 
 | Name   | Type               | Mandatory| Description                                                        |
 | --------- | ------------------- | ---- | ------------------------------------------------------------ |
-| tokenID      | number              | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).           |
+| tokenID      | number              | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).           |
 | permissionName | Permissions              | Yes  | Permission to grant. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 | permissionFlags  | number | Yes  | Permission flag.<br>- **0**: The permission is not set by the user.<br>- **1**: A dialog box for user authorization will be displayed the next time if the user denies authorization for the permission.<br>- **2**: No dialog box will be displayed the next time if the user denies authorization for the permission. The permission must be granted by the user in **Settings**.<br>- **4**: The permission is authorized by the system and cannot be changed.|
 
@@ -195,7 +195,7 @@ Grants a user_grant permission to an application. This API uses an asynchronous
 
 | Name   | Type               | Mandatory| Description                         |
 | --------- | ------------------- | ---- | ------------------------------------------------------------ |
-| tokenID      | number              | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).|
+| tokenID      | number              | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).|
 | permissionName | Permissions              | Yes  | Permission to grant. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 | permissionFlags  | number | Yes  | Permission flag.<br>- **0**: The permission is not set by the user.<br>- **1**: A dialog box for user authorization will be displayed the next time if the user denies authorization for the permission.<br>- **2**: No dialog box will be displayed the next time if the user denies authorization for the permission. The permission must be granted by the user in **Settings**.<br>- **4**: The permission is authorized by the system and cannot be changed.|
 | callback | AsyncCallback&lt;void&gt; | Yes| Callback invoked to return the result. If the permission is granted, **err** is **undefined**. Otherwise, **err** is an error object.|
@@ -249,7 +249,7 @@ Revokes a user_grant permission from an application. This API uses a promise to
 
 | Name   | Type               | Mandatory| Description                                                        |
 | --------- | ------------------- | ---- | ------------------------------------------------------------ |
-| tokenID      | number              | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).          |
+| tokenID      | number              | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).          |
 | permissionName | Permissions              | Yes  | Permission to revoke. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 | permissionFlags  | number | Yes  | Permission flag.<br>- **0**: The permission is not set by the user.<br>- **1**: A dialog box for user authorization will be displayed the next time if the user denies authorization for the permission.<br>- **2**: No dialog box will be displayed the next time if the user denies authorization for the permission. The permission must be granted by the user in **Settings**.<br>- **4**: The permission is authorized by the system and cannot be changed.|
 
@@ -306,7 +306,7 @@ Revokes a user_grant permission from an application. This API uses an asynchrono
 
 | Name   | Type               | Mandatory| Description                         |
 | --------- | ------------------- | ---- | ------------------------------------------------------------ |
-| tokenID      | number              | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).          |
+| tokenID      | number              | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).          |
 | permissionName | Permissions              | Yes  | Permission to revoke. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 | permissionFlags  | number | Yes  | Permission flag.<br>- **0**: The permission is not set by the user.<br>- **1**: A dialog box for user authorization will be displayed the next time if the user denies authorization for the permission.<br>- **2**: No dialog box will be displayed the next time if the user denies authorization for the permission. The permission must be granted by the user in **Settings**.<br>- **4**: The permission is authorized by the system and cannot be changed.|
 | callback | AsyncCallback&lt;void&gt; | Yes| Callback invoked to return the result. If the permission is revoked, **err** is **undefined**. Otherwise, **err** is an error object.|
@@ -360,7 +360,7 @@ Obtains the permission flag of an application. This API uses a promise to return
 
 | Name   | Type               | Mandatory| Description                         |
 | --------- | ------------------- | ---- | ------------------------------------------------------------ |
-| tokenID      | number              | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).           |
+| tokenID      | number              | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).           |
 | permissionName | Permissions              | Yes  | Target permission. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 
 **Return value**
@@ -413,7 +413,7 @@ Obtains the data version of the permission management. This API uses a promise t
 
 | Type         | Description                               |
 | :------------ | :---------------------------------- |
-| Promise&lt;number&gt; | Promise used to return the version.|
+| Promise&lt;number&gt; | Promise used to return the version obtained.|
 
 **Example**
 
@@ -441,9 +441,9 @@ Subscribes to permission state changes of the specified applications and permiss
 
 | Name            | Type                  | Mandatory| Description                                                         |
 | ------------------ | --------------------- | ---- | ------------------------------------------------------------ |
-| type               | string                | Yes  | Event type to subscribe to. The value is **'permissionStateChange'**, which indicates the permission grant state change. |
-| tokenIDList        | Array&lt;number&gt;   | Yes  | Token IDs of the applications to observe. If this parameter is left empty, the permission grant state changes of all applications are observed. |
-| permissionList | Array&lt;Permissions&gt;   | Yes  | List of permission names. If this parameter is left empty, the grant state changes of all permissions are subscribed to.              |
+| type               | string                | Yes  | Event type to subscribe to. The value is **'permissionStateChange'**, which indicates the permission grant state change event. |
+| tokenIDList        | Array&lt;number&gt;   | Yes  | List of application token IDs to observe. If this parameter is left empty, the permission grant state changes of all applications will be subscribed to. |
+| permissionList | Array&lt;Permissions&gt;   | Yes  | List of permissions. If this parameter is left empty, the grant state changes of all permissions will be subscribed to.              |
 | callback | Callback&lt;[PermissionStateChangeInfo](#permissionstatechangeinfo9)&gt; | Yes| Callback invoked to return the permission grant state change.|
 
 **Error codes**
@@ -493,9 +493,9 @@ Unsubscribes from permission grant state changes of the specified applications a
 
 | Name            | Type                  | Mandatory| Description                                                         |
 | ------------------ | --------------------- | ---- | ------------------------------------------------------------ |
-| type               | string                | Yes  | Event type to unsubscribe from. The value is **'permissionStateChange'**, which indicates the permission grant state change. |
-| tokenIDList        | Array&lt;number&gt;   | Yes  | Token IDs of the applications. If this parameter is left empty, the permission grant state changes of all applications are unsubscribed from. The value must be the same as that passed in **on()**. |
-| permissionList | Array&lt;Permissions&gt;   | Yes  | Permission names. If this parameter is left empty, the grant state changes of all permissions are unsubscribed from. The value must be the same as that passed in **on()**. |
+| type               | string                | Yes  | Event type. The value is **'permissionStateChange'**, which indicates the permission grant state change event. |
+| tokenIDList        | Array&lt;number&gt;   | Yes  | List of application token IDs. If this parameter is left empty, the permission grant state changes of all applications will be unsubscribed from. The value must be the same as that passed in **on()**.|
+| permissionList | Array&lt;Permissions&gt;   | Yes  | List of permissions. If this parameter is left empty, the grant state changes of all permissions will be unsubscribed from. The value must be the same as that passed in **on()**.|
 | callback | Callback&lt;[PermissionStateChangeInfo](#permissionstatechangeinfo9)&gt; | No| Callback for the permission grant state change. |
 
 **Error codes**
@@ -542,7 +542,7 @@ Verifies whether a permission is granted to an application. This API uses a prom
 
 | Name  | Type                | Mandatory| Description                                      |
 | -------- | -------------------  | ---- | ------------------------------------------ |
-| tokenID   |  number   | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).            |
+| tokenID   |  number   | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).            |
 | permissionName | Permissions | Yes  | Permission to verify. For details about the permissions, see the [Application Permission List](../../security/permission-list.md). |
 
 **Return value**
@@ -678,8 +678,8 @@ Verifies whether a permission is granted to an application. This API uses a prom
 
 | Name  | Type                | Mandatory| Description                                      |
 | -------- | -------------------  | ---- | ------------------------------------------ |
-| tokenID   |  number   | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).            |
-| permissionName | string | Yes  | Permission to check.|
+| tokenID   |  number   | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).            |
+| permissionName | string | Yes  | Permission to verify.|
 
 **Return value**
 
@@ -712,7 +712,7 @@ Checks whether a permission is granted to an application. This API returns the r
 
 | Name  | Type                | Mandatory| Description                                      |
 | -------- | -------------------  | ---- | ------------------------------------------ |
-| tokenID   |  number   | Yes  | Token ID of the application. The value can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).             |
+| tokenID   |  number   | Yes  | Application token ID, which can be obtained from [ApplicationInfo](js-apis-bundleManager-applicationInfo.md).             |
 | permissionName | Permissions | Yes  | Permission to check. For details about the permissions, see the [Application Permission List](../../security/permission-list.md).|
 
 **Return value**
@@ -773,5 +773,5 @@ Defines detailed information about the permission grant state change.
 | Name          | Type                      | Readable| Writable| Description               |
 | -------------- | ------------------------- | ---- | ---- | ------------------ |
 | change         | [PermissionStateChangeType](#permissionstatechangetype9) | Yes  | No  | Operation that triggers the permission grant state change.       |
-| tokenID        | number                    | Yes  | No  | Token ID of the application. |
+| tokenID        | number                    | Yes  | No  | Application token ID.|
 | permissionName | Permissions                    | Yes  | No  | Permission whose grant state changes. For details about the permissions, see the [Application Permission List](../../security/permission-list.md). |

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

@@ -143,7 +143,7 @@ try {
 
 getAbilityRunningInfos(callback: AsyncCallback\<Array\<AbilityRunningInfo>>): void
 
-Obtains the ability running information. This API uses an asynchronous callback to return the result.
+Obtains the UIAbility running information. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.GET_RUNNING_INFO
 
@@ -388,7 +388,7 @@ abilityManager.getTopAbility().then((data) => {
 
 acquireShareData(missionId: number, callback: AsyncCallback<{[key: string]: Object}>): void;
 
-Acquires the shared data of the target device. This API uses an asynchronous callback to return the result.
+Acquires the shared data of the target application. This API uses an asynchronous callback to return the result. **missionId** indicates the target application's mission ID, which can be obtained by running the **hdc shell aa dump -a** command or calling the [missionManager.getMissionInfos()](js-apis-app-ability-missionManager.md#getmissioninfos) API after the target application is started. **callback** indicates the data shared by the target application through the [UIAbility.onShare()](js-apis-app-ability-uiAbility.md#onshare) lifecycle callback.
 
 **System capability**: SystemCapability.Ability.AbilityRuntime.Core
 
@@ -396,7 +396,7 @@ Acquires the shared data of the target device. This API uses an asynchronous cal
 
 | Name       | Type                                      | Mandatory  | Description            |
 | --------- | ---------------------------------------- | ---- | -------------- |
-| missionId | number                                   | Yes| Mission ID on the target device. The maximum value is 2<sup>31</sup>-1.|
+| missionId | number                                   | Yes| Mission ID on the target application. The maximum value is 2<sup>31</sup>-1.|
 | callback  | AsyncCallback<{[key: string]: Object}>  | Yes   | Callback used to return the API call result and the shared data. You can perform error handling or custom processing in it.     |
 
 **Error codes**
@@ -411,14 +411,17 @@ For details about the error codes, see [Ability Error Codes](../errorcodes/error
 
 ```ts
 import abilityManager from '@ohos.app.ability.abilityManager';
-
-abilityManager.acquireShareData(1, (err, data) => { 
+try {
+    abilityManager.acquireShareData(1, (err, wantParam) => { 
         if (err) {
             console.error(`acquireShareData fail, err: ${JSON.stringify(err)}`);
         } else {
-        console.log(`acquireShareData success, data: ${JSON.stringify(data)}`);
+            console.log(`acquireShareData success, data: ${JSON.stringify(wantParam)}`);
         }
-});
+    });
+} catch (paramError) {
+    console.error(`error.code: ${JSON.stringify(paramError.code)}, error.message: ${JSON.stringify(paramError.message)}`);
+}
 
 ```
 
@@ -426,7 +429,7 @@ abilityManager.acquireShareData(1, (err, data) => {
 
 acquireShareData(missionId: number): Promise<{[key: string]: Object}>;
 
-Acquires the shared data of the target device. This API uses a promise to return the result.
+Acquires the shared data of the target application. This API uses a promise to return the result. **missionId** indicates the target application's mission ID, which can be obtained by running the **hdc shell aa dump -a** command or calling the [missionManager.getMissionInfos()](js-apis-app-ability-missionManager.md#getmissioninfos) API after the target application is started. **Promise<{[key: string]: Object}>** indicates the data shared by the target application through the [UIAbility.onShare()](js-apis-app-ability-uiAbility.md#onshare) lifecycle callback.
  
 **System capability**: SystemCapability.Ability.AbilityRuntime.Core
 
@@ -449,8 +452,8 @@ For details about the error codes, see [Ability Error Codes](../errorcodes/error
 ```ts
 import abilityManager from '@ohos.app.ability.abilityManager';
 try {
-    abilityManager.acquireShareData(1).then((data) => {
-    console.log(`acquireShareData success, data: ${JSON.stringify(data)}`);
+    abilityManager.acquireShareData(1).then((wantParam) => {
+    console.log(`acquireShareData success, data: ${JSON.stringify(wantParam)}`);
     }).catch((err) => {
     console.error(`acquireShareData fail, err: ${JSON.stringify(err)}`);
     });

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

@@ -315,7 +315,7 @@ class MyUIAbility extends UIAbility {
 
 onShare(wantParam:{ [key: string]: Object }): void;
 
-Called when this UIAbility sets data to share. **ohos.extra.param.key.contentTitle** indicates the title of the content to share in the sharing box, and **ohos.extra.param.key.shareAbstract** provides an abstract description of the content, **ohos.extra.param.key.shareUrl** indicates the online address of the service. You need to set these three items as objects, with the key set to **title**, **abstract**, and **url**, respectively.
+Called when this UIAbility sets data to share. **ohos.extra.param.key.contentTitle** indicates the title of the content to share in the sharing box, **ohos.extra.param.key.shareAbstract** provides an abstract description of the content, and **ohos.extra.param.key.shareUrl** indicates the online address of the service. You need to set these three items as objects, with the key set to **title**, **abstract**, and **url**, respectively.
 
 **System capability**: SystemCapability.Ability.AbilityRuntime.AbilityCore
 

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

@@ -259,6 +259,103 @@ try {
 ```
 
 
+## bluetoothManager.pairCredibleDevice<sup>10+</sup>
+
+pairCredibleDevice(deviceId: string, transport: BluetoothTransport, callback: AsyncCallback&lt;void&gt;): void
+
+Pairs a trusted remote device whose address is obtained in a non-Bluetooth scan mode (such as using NFC).
+
+**System API**: This is a system API.
+
+**Required permissions**: ohos.permission.DISCOVER_BLUETOOTH
+
+**System capability**: SystemCapability.Communication.Bluetooth.Core
+
+**Parameters**
+
+| Name     | Type    | Mandatory  | Description                                 |
+| -------- | ------ | ---- | ----------------------------------- |
+| deviceId | string | Yes   | Address of the remote device to pair, for example, XX:XX:XX:XX:XX:XX.|
+| transport | [BluetoothTransport](#bluetoothtransport10) | Yes   | Device type, for example, a classic Bluetooth device or a Bluetooth low energy (BLE) device.|
+| callback | AsyncCallback&lt;void&gt; | Yes   | Callback invoked to return the result. If the operation is successful, **err** is **undefined**. Otherwise, **err** is an error object.  |
+
+**Error codes**
+
+For details about the error codes, see [Bluetooth Error Codes](../errorcodes/errorcode-bluetoothManager.md).
+
+| ID| Error Message|
+| -------- | ---------------------------- |
+|2900001 | Service stopped.                         |
+|2900003 | Bluetooth switch is off.                 |
+|2900099 | Operation failed.                        |
+
+**Example**
+
+```js
+try {
+    bluetoothManager.pairCredibleDevice("68:13:24:79:4C:8C", 1, err => {
+        if (err) {
+            console.error("errCode:" + err.code + ",errMessage:" + err.message);
+            return;
+        }
+        console.info("pairCredibleDevice,err:" + JSON.stringify(err));
+    });
+} catch (err) {
+    console.error("errCode:" + err.code + ",errMessage:" + err.message);
+}
+```
+
+
+## bluetoothManager.pairCredibleDevice<sup>10+</sup>
+
+pairCredibleDevice(deviceId: string, transport: BluetoothTransport): Promise&lt;void&gt;
+
+Pairs a trusted remote device whose address is obtained in a non-Bluetooth scan mode (such as using NFC).
+
+**System API**: This is a system API.
+
+**Required permissions**: ohos.permission.DISCOVER_BLUETOOTH
+
+**System capability**: SystemCapability.Communication.Bluetooth.Core
+
+**Parameters**
+
+| Name     | Type    | Mandatory  | Description                                 |
+| -------- | ------ | ---- | ----------------------------------- |
+| deviceId | string | Yes   | Address of the remote device to pair, for example, XX:XX:XX:XX:XX:XX.|
+| transport | [BluetoothTransport](#bluetoothtransport10) | Yes   | Device type, for example, a classic Bluetooth device or a BLE device.|
+
+**Return value**
+
+| Type                                             | Description               |
+| ------------------------------------------------- | ------------------- |
+| Promise&lt;void&gt; | Promise used to return the result.|
+
+**Error codes**
+
+For details about the error codes, see [Bluetooth Error Codes](../errorcodes/errorcode-bluetoothManager.md).
+
+| ID| Error Message|
+| -------- | ---------------------------- |
+|2900001 | Service stopped.                         |
+|2900003 | Bluetooth switch is off.                 |
+|2900099 | Operation failed.                        |
+
+**Example**
+
+```js
+try {
+    bluetoothManager.pairCredibleDevice("68:13:24:79:4C:8C", 0).then(() => {
+        console.info("PairCredibleDevice");
+    }, err => {
+        console.error("PairCredibleDevice:errCode" + err.code + ",errMessage:" + err.message);
+    });
+} catch (err) {
+    console.error("errCode:" + err.code + ",errMessage:" + err.message);
+}
+```
+
+
 ## bluetoothManager.getProfileConnectionState<a name="getProfileConnectionState"></a>
 
 getProfileConnectionState(profileId: ProfileId): ProfileConnectionState
@@ -694,7 +791,7 @@ try {
 ```
 
 
-## bluetoothManager.setDevicePinCode<sup>10+</sup><a name="setDevicePinCode"></a>
+## bluetoothManager.setDevicePinCode<sup>10+</sup><a name="setDevicePinCode-1"></a>
 
 setDevicePinCode(device: string, code: string): Promise&lt;void&gt;
 
@@ -985,7 +1082,7 @@ try {
 
 on(type: "stateChange", callback: Callback&lt;BluetoothState&gt;): void
 
-Subscribes to the Bluetooth connection state change events.
+Subscribes to Bluetooth state events.
 
 **Required permissions**: ohos.permission.USE_BLUETOOTH
 
@@ -1024,7 +1121,7 @@ try {
 
 off(type: "stateChange", callback?: Callback&lt;BluetoothState&gt;): void
 
-Unsubscribes from the Bluetooth connection state change events.
+Unsubscribes from Bluetooth state events.
 
 **Required permissions**: ohos.permission.USE_BLUETOOTH
 
@@ -2167,7 +2264,7 @@ For details about the error codes, see [Bluetooth Error Codes](../errorcodes/err
 
 ```js
 try {
-    let hidHostProfile = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
+    let hidHostProfile = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
     hidHostProfile.connect('XX:XX:XX:XX:XX:XX');
 } catch (err) {
     console.error("errCode:" + err.code + ",errMessage:" + err.message);
@@ -2208,7 +2305,7 @@ For details about the error codes, see [Bluetooth Error Codes](../errorcodes/err
 
 ```js
 try {
-    let hidHostProfile = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
+    let hidHostProfile = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
     hidHostProfile.disconnect('XX:XX:XX:XX:XX:XX');
 } catch (err) {
     console.error("errCode:" + err.code + ",errMessage:" + err.message);
@@ -2237,7 +2334,7 @@ Subscribes to the HidHost connection state change events.
 function onReceiveEvent(data) {
     console.info('hidHost state = '+ JSON.stringify(data));
 }
-let hidHost = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
+let hidHost = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
 hidHost.on('connectionStateChange', onReceiveEvent);
 ```
 
@@ -2263,7 +2360,7 @@ Unsubscribes from the HidHost connection state change events.
 function onReceiveEvent(data) {
     console.info('hidHost state = '+ JSON.stringify(data));
 }
-let hidHost = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
+let hidHost = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_HID_HOST) as bluetoothManager.HidHostProfile;
 hidHost.on('connectionStateChange', onReceiveEvent);
 hidHost.off('connectionStateChange', onReceiveEvent);
 ```
@@ -2307,7 +2404,7 @@ For details about the error codes, see [Bluetooth Error Codes](../errorcodes/err
 
 ```js
 try {
-    let panProfile = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
+    let panProfile = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
     panProfile.disconnect('XX:XX:XX:XX:XX:XX');
 } catch (err) {
     console.error("errCode:" + err.code + ",errMessage:" + err.message);
@@ -2336,7 +2433,7 @@ Subscribes to the PAN connection state change events.
 function onReceiveEvent(data) {
     console.info('pan state = '+ JSON.stringify(data));
 }
-let panProfile = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
+let panProfile = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
 panProfile.on('connectionStateChange', onReceiveEvent);
 ```
 
@@ -2362,7 +2459,7 @@ Unsubscribes from the PAN connection state change events.
 function onReceiveEvent(data) {
     console.info('pan state = '+ JSON.stringify(data));
 }
-let panProfile = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
+let panProfile = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
 panProfile.on('connectionStateChange', onReceiveEvent);
 panProfile.off('connectionStateChange', onReceiveEvent);
 ```
@@ -2401,7 +2498,7 @@ For details about the error codes, see [Bluetooth Error Codes](../errorcodes/err
 
 ```js
 try {
-    let panProfile = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
+    let panProfile = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
     panProfile.setTethering(true);
 } catch (err) {
     console.error("errCode:" + err.code + ",errMessage:" + err.message);
@@ -2429,7 +2526,7 @@ Obtains the network sharing status.
 
 ```js
 try {
-    let panProfile = bluetoothManager.getProfileInst(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
+    let panProfile = bluetoothManager.getProfileInstance(bluetoothManager.ProfileId.PROFILE_PAN_NETWORK) as bluetoothManager.PanProfile;
     let ret = panProfile.isTetheringOn();
 } catch (err) {
     console.error("errCode:" + err.code + ",errMessage:" + err.message);
@@ -4355,6 +4452,7 @@ Defines the content of a BLE advertisement packet.
 | serviceUuids    | Array&lt;string&gt;                      | Yes   | Yes   | List of service UUIDs to broadcast.|
 | manufactureData | Array&lt;[ManufactureData](#manufacturedata)&gt; | Yes   | Yes   | List of manufacturers to broadcast.          |
 | serviceData     | Array&lt;[ServiceData](#servicedata)&gt; | Yes   | Yes   | List of service data to broadcast.              |
+| includeDeviceName<sup>10+</sup> | boolean                  | Yes   | Yes   | Whether the device name is contained. This parameter is optional.       |
 
 
 ## ManufactureData
@@ -4391,7 +4489,7 @@ Defines the pairing request parameters.
 | -------- | ------ | ---- | ---- | ----------- |
 | deviceId | string | Yes   | No   | ID of the device to pair.|
 | pinCode  | string | Yes   | No   | Key for the device pairing.  |
-| pinType<sup>10+</sup> | [PinType](#pintype10) | Yes   | No   | Type of the device to pair.  |
+| pinType<sup>10+</sup> | [PinType](#pintype10) | Yes   | No   | Type of the device to pair.<br>This is a system API.  |
 
 
 ## BondStateParam<a name="BondStateParam"></a>
@@ -4424,13 +4522,13 @@ Defines the properties of a GATT characteristic.
 
 **System capability**: SystemCapability.Communication.Bluetooth.Core
 
-| Name      | Type  | Read-only  | Mandatory  | Description         |
-| -------- | ------ | ---- | ---- | ----------- |
-| write<sup>10+</sup>    | boolean | Yes  | Yes   | Permits writes of the characteristic value (with a response).|
-| writeNoResponse<sup>10+</sup> | boolean | Yes   | Yes   | Permits writes of the characteristic value (without a response).|
-| read<sup>10+</sup> | boolean   | Yes   | Yes   | Permits reads of the characteristic value.|
-| notify<sup>10+</sup> | boolean   | Yes   | Yes   | Permits notifications of the characteristic value.|
-| indicate<sup>10+</sup> | boolean   | Yes   | Yes   | Permits notifications of the characteristic value without acknowledgement.|
+| Name      | Type | Mandatory  | Description         |
+| -------- | ------ |---- | ----------- |
+| write<sup>10+</sup>    | boolean | Yes | Permits writes of the characteristic value (with a response).|
+| writeNoResponse<sup>10+</sup> | boolean | Yes   | Permits writes of the characteristic value (without a response).|
+| read<sup>10+</sup> | boolean   |  Yes   | Permits reads of the characteristic value.|
+| notify<sup>10+</sup> | boolean   | Yes   | Permits notifications of the characteristic value.|
+| indicate<sup>10+</sup> | boolean   | Yes   | Permits notifications of the characteristic value without acknowledgement.|
 
 
 ## DeviceClass<a name="DeviceClass"></a>
@@ -4589,19 +4687,33 @@ Enumerates the Bluetooth profiles. API version 9 is added with **PROFILE_HID_HOS
 | PROFILE_PAN_NETWORK | 7 | PAN profile. |
 
 
+## BluetoothTransport<sup>10+</sup><a name="BluetoothTransport"></a>
+
+Enumerates the device types. The default device type is **TRANSPORT_BR_EDR**.
+
+**System capability**: SystemCapability.Communication.Bluetooth.Core
+
+| Name                              | Value   | Description             |
+| -------------------------------- | ------ | --------------- |
+| TRANSPORT_BR_EDR<sup>10+</sup>   | 0 | Classic Bluetooth (BR/EDR) device.|
+| TRANSPORT_LE<sup>10+</sup>  | 1 | BLE device. |
+
+
 ## PinType<sup>10+</sup><a name="PinType"></a>
 
 Enumerates the Bluetooth pairing types.
 
+**System API**: This is a system API.
+
 **System capability**: SystemCapability.Communication.Bluetooth.Core
 
 | Name                              | Value   | Description             |
 | -------------------------------- | ------ | --------------- |
-| PIN_TYPE_ENTER_PIN_CODE<sup>10+</sup> | 0 | The user needs to enter the PIN displayed on the peer device.|
-| PIN_TYPE_ENTER_PASSKEY<sup>10+</sup>  | 1 | The user needs to enter the PASSKEY displayed on the peer device. |
-| PIN_TYPE_CONFIRM_PASSKEY<sup>10+</sup>  | 2 | The user needs to confirm the PASSKEY displayed on the local device. |
-| PIN_TYPE_NO_PASSKEY_CONSENT<sup>10+</sup>  | 3 | There is no PASSKEY, and the user needs to accept or reject the pairing request. |
-| PIN_TYPE_NOTIFY_PASSKEY<sup>10+</sup>   | 4 | The user needs to enter the PASSKEY displayed on the local device on the peer device. |
-| PIN_TYPE_DISPLAY_PIN_CODE<sup>10+</sup>    | 5 | The user needs to enter the PIN displayed on the peer device for Bluetooth 2.0 devices. |
-| PIN_TYPE_OOB_CONSENT<sup>10+</sup>    | 6 | The user needs to accept or reject the out of band (OOB) pairing request. |
-| PIN_TYPE_PIN_16_DIGITS<sup>10+</sup>    | 7 | The user needs to enter the 16-digit PIN displayed on the peer device. |
+| PIN_TYPE_ENTER_PIN_CODE<sup>10+</sup> | 0 | The user needs to enter the PIN displayed on the peer device.<br>This is a system API.|
+| PIN_TYPE_ENTER_PASSKEY<sup>10+</sup>  | 1 | The user needs to enter the PASSKEY displayed on the peer device.<br>This is a system API. |
+| PIN_TYPE_CONFIRM_PASSKEY<sup>10+</sup>  | 2 | The user needs to confirm the PASSKEY displayed on the local device.<br>This is a system API. |
+| PIN_TYPE_NO_PASSKEY_CONSENT<sup>10+</sup>  | 3 | There is no PASSKEY, and the user needs to accept or reject the pairing request.<br>This is a system API. |
+| PIN_TYPE_NOTIFY_PASSKEY<sup>10+</sup>   | 4 | The user needs to enter the PASSKEY displayed on the local device on the peer device.<br>This is a system API. |
+| PIN_TYPE_DISPLAY_PIN_CODE<sup>10+</sup>    | 5 | The user needs to enter the PIN displayed on the peer device for Bluetooth 2.0 devices.<br>This is a system API. |
+| PIN_TYPE_OOB_CONSENT<sup>10+</sup>    | 6 | The user needs to accept or reject the out of band (OOB) pairing request.<br>This is a system API. |
+| PIN_TYPE_PIN_16_DIGITS<sup>10+</sup>    | 7 | The user needs to enter the 16-digit PIN displayed on the peer device.<br>This is a system API. |

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

@@ -153,14 +153,14 @@ Creates a spring animation curve. If multiple spring animations are applied to t
 | --------- | ------ | ---- | ----- |
 | response  | number | No   | Duration of one complete oscillation,<br>Default value: **0.55**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0.55**.|
 | dampingFraction      | number | No   | Damping coefficient.<br>**0**: undamped. In this case, the spring oscillates forever.<br>> 0 and < 1: underdamped. In this case, the spring overshoots the equilibrium position.<br>**1**: critically damped.<br>> 1: overdamped. In this case, the spring approaches equilibrium gradually.<br>Default value: **0.825**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0.55**.|
-| overlapDuration | number | No   | Duration for animations to overlap, in seconds. When animations overlap, if the **response** values of the two animations are different, they will transit smoothly over this duration.<br><br>Default value: **0**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0**.<br>The spring animation curve is physics-based. Its duration depends on the **springMotion** parameters and the previous velocity, rather than the **duration** parameter in **[animation](../arkui-ts/ts-animatorproperty.md)** or **[animateTo](../arkui-ts/ts-explicit-animation.md)**. The time cannot be normalized. Therefore, the interpolation cannot be obtained by using the **[interpolate](#interpolate)** function of the curve.|
+| overlapDuration | number | No   | Duration for animations to overlap, in seconds. When animations overlap, if the **response** values of the two animations are different, they will transit smoothly over this duration.<br><br>Default value: **0**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0**.<br>The spring animation curve is physics-based. Its duration depends on the **springMotion** parameters and the previous velocity, rather than the **duration** parameter in [animation](../arkui-ts/ts-animatorproperty.md) or [animateTo](../arkui-ts/ts-explicit-animation.md). The time cannot be normalized. Therefore, the interpolation cannot be obtained by using the **[interpolate](#interpolate)** function of the curve.|
 
 
 **Return value**
 
 | Type                          | Description            |
 | ---------------------------------- | ---------------- |
-|  [ICurve](#icurve)| Curve.<br>**NOTE**<br>The spring animation curve is physics-based. Its duration depends on the **springMotion** parameters and the previous velocity, rather than the **duration** parameter in **animation** or **animateTo**. The time cannot be normalized. Therefore, the interpolation cannot be obtained by using the **[interpolate](#interpolate)** function of the curve.|
+|  [ICurve](#icurve)| Curve.<br>**NOTE**<br>The spring animation curve is physics-based. Its duration depends on the **springMotion** parameters and the previous velocity, rather than the **duration** parameter in [animation](../arkui-ts/ts-animatorproperty.md) or [animateTo](../arkui-ts/ts-explicit-animation.md). The time cannot be normalized. Therefore, the interpolation cannot be obtained by using the **[interpolate](#interpolate)** function of the curve.|
 
 **Example**
 
@@ -187,13 +187,13 @@ Creates a responsive spring animation curve. It is a special case of [springMoti
 | --------- | ------ | ---- | ----- |
 | response  | number | No   | See **response** in **springMotion**.<br>Default value: **0.15**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0.15**.|
 | dampingFraction      | number | No   | See **dampingFraction** in **springMotion**.<br>Default value: **0.86**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0.86**.|
-| overlapDuration | number | No   | See **overlapDuration** in **springMotion**.<br>Default value: **0.25**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0.25**.<br> To apply custom settings for a spring animation, you are advised to use **springMotion**. When using **responsiveSpringMotion**, you are advised to retain the default settings.<br>The duration of the responsive spring animation depends on the **responsiveSpringMotion** parameters and the previous velocity, rather than the **duration** parameter in **[animation](../arkui-ts/ts-animatorproperty.md)** or **[animateTo](../arkui-ts/ts-explicit-animation.md)**. In addition, the interpolation cannot be obtained by using the **[interpolate](#interpolate)** function of the curve.|
+| overlapDuration | number | No   | See **overlapDuration** in **springMotion**.<br>Default value: **0.25**<br>Unit: second<br>Value range: [0, +∞)<br>**NOTE**<br>A value less than 0 evaluates to the default value **0.25**.<br> To apply custom settings for a spring animation, you are advised to use **springMotion**. When using **responsiveSpringMotion**, you are advised to retain the default settings.<br>The duration of the responsive spring animation depends on the **responsiveSpringMotion** parameters and the previous velocity, rather than the **duration** parameter in [animation](../arkui-ts/ts-animatorproperty.md) or [animateTo](../arkui-ts/ts-explicit-animation.md). In addition, the interpolation cannot be obtained by using the [interpolate](#interpolate) function of the curve.|
 
 **Return value**
 
 | Type                          | Description            |
 | ---------------------------------- | ---------------- |
-|  [ICurve](#icurve)| Curve.<br>**NOTE**<br>1. To apply custom settings for a spring animation, you are advised to use **springMotion**. When using **responsiveSpringMotion**, you are advised to retain the default settings.<br>2. The duration of the responsive spring animation depends on the **responsiveSpringMotion** parameters and the previous velocity, rather than the **duration** parameter in **animation** or **animateTo**. In addition, the interpolation cannot be obtained by using the **interpolate** function of the curve.|
+|  [ICurve](#icurve)| Curve.<br>**NOTE**<br>1. To apply custom settings for a spring animation, you are advised to use **springMotion**. When using **responsiveSpringMotion**, you are advised to retain the default settings.<br>2. The duration of the responsive spring animation depends on the **responsiveSpringMotion** parameters and the previous velocity, rather than the **duration** parameter in **animation** or **animateTo**. In addition, the interpolation cannot be obtained by using the [interpolate](#interpolate) function of the curve.|
 
 **Example**
 
@@ -220,14 +220,12 @@ Creates an interpolating spring curve animated from 0 to 1. The actual animation
 | stiffness | number | Yes   | Stiffness. It is the degree to which an object deforms by resisting the force applied. In an elastic system, the greater the stiffness, the stronger the ability to resist deformation, and the faster the speed of restoring to the equilibrium position.|
 | damping   | number | Yes   | Damping. It is a pure number and has no real physical meaning. It is used to describe the oscillation and attenuation of the system after being disturbed. The larger the damping, the smaller the number of oscillations of elastic motion, and the smaller the oscillation amplitude.|
 
-
 **Return value**
 
 | Type                          | Description            |
 | ---------------------------------- | ---------------- |
 |  [ICurve](#icurve)| Interpolation curve.|
 
-
 **Example**
 
 ```ts
@@ -235,6 +233,37 @@ import Curves from '@ohos.curves'
 Curves.interpolatingSpring(100, 1, 228, 30) // Create an interpolating spring curve whose duration is subject to spring parameters.
 ```
 
+## Curves.customCurve<sup>10+</sup>
+
+customCurve(interpolate: (fraction: number) => number): ICurve
+
+Creates a custom curve.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Parameters**
+
+| Name     | Type                        | Mandatory| Description                                                        |
+| ----------- | ---------------------------- | ---- | ------------------------------------------------------------ |
+| interpolate | (fraction: number) => number | Yes  | Custom interpolation callback.<br>**fraction**: input x value for interpolation when the animation starts. Value range: [0, 1]<br>The return value is the y value of the curve. Value range: [0, 1]<br>**NOTE**<br>If **fraction** is **0**, the return value **0** corresponds to the animation start point; any other return value means that the animation jumps at the start point.<br>If **fraction** is **1**, the return value **1** corresponds to the animation end point; any other return value means that the end value of the animation is not the value of the state variable, which will result in an effect of transition from that end value to the value of the state variable.|
+
+**Return value**
+
+| Type             | Description            |
+| ----------------- | ---------------- |
+| [ICurve](#icurve) | Interpolation curve.|
+
+**Example**
+
+```ts
+import Curves from '@ohos.curves'
+interpolate(fraction) {
+    return Math.sqrt(fraction);
+  }
+Curves.customCurve(this.interpolate) // Create a custom curve.
+```
+
+
 
 ## ICurve
 

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

@@ -4,7 +4,8 @@ The **accountManager** module provides APIs for account management of enterprise
 
 > **NOTE**
 >
-> The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The APIs of this module can be called only after a [device administrator application](js-apis-enterprise-adminManager.md#adminmanagerenableadmin) is enabled.
 
 ## Modules to Import
 
@@ -48,7 +49,7 @@ let wantTemp = {
     bundleName: "com.example.myapplication",
     abilityName: "EntryAbility",
 };
-accountManager.disallowAddLocalAccount(admin, true, (error) => {
+accountManager.disallowAddLocalAccount(wantTemp, true, (error) => {
     if (error != null) {
         console.log("error code:" + error.code + " error message:" + error.message);
     }

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

 # @ohos.enterprise.applicationManager (Application Management)
 
-The **applicationManager** module provides application management capabilities, including adding applications to or removing applications from an application blocklist, and obtaining the application blocklist. The application blocklist contains the applications that are forbidden to run. Only the enterprise device administrator applications can call the APIs provided by this module.
+The **applicationManager** module provides application management capabilities, including adding, removing, and obtaining the applications that are forbidden to run. Only the enterprise device administrator applications can call the APIs provided by this module.
 
 > **NOTE**
 >
@@ -17,7 +17,7 @@ import applicationManager from '@ohos.enterprise.applicationManager';
 
 addDisallowedRunningBundles(admin: Want, appIds: Array\<string>, callback: AsyncCallback&lt;void&gt;): void;
 
-Adds applications to the application blocklist using the specified device administrator application. This API uses an asynchronous callback to return the result. The applications added to the blocklist cannot run under the administrator user.
+Adds a list of applications that are forbidden to run by the current user through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -63,7 +63,7 @@ applicationManager.addDisallowedRunningBundles(wantTemp, appIds, (error) => {
 
 addDisallowedRunningBundles(admin: Want, appIds: Array\<string>, userId: number, callback: AsyncCallback&lt;void&gt;): void;
 
-Adds applications to the application list for a user using the specified device administrator application. This API uses an asynchronous callback to return the result. The applications added to the blocklist cannot run under the user specified by **userId**.
+Adds a list of applications that are forbidden to run by a given user through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -109,7 +109,7 @@ applicationManager.addDisallowedRunningBundles(wantTemp, appIds, 100, (error) =>
 
 addDisallowedRunningBundles(admin: Want, appIds: Array\<string>, userId?: number): Promise&lt;void&gt;;
 
-Adds applications to the application blocklist using the specified device administrator application. This API uses a promise to return the result. If **userId** is passed in when this API is called, the added applications cannot run under the specified user. If **userId** is not passed in, the added applications cannot run under the current user.
+Adds a list of applications that are forbiddedn to run by the specified user (if **userId** is passed in) or current user (if **userId** is not passed in) through the specified device administrator application.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -160,7 +160,7 @@ applicationManager.addDisallowedRunningBundles(wantTemp, appIds, 100).then(() =>
 
 removeDisallowedRunningBundles(admin: Want, appIds: Array\<string>, callback: AsyncCallback&lt;void&gt;): void;
 
-Removes applications from the application blocklist using the specified device administrator application. This API uses an asynchronous callback to return the result. If an application blocklist exists, the applications in the blocklist cannot run under the current user.
+Removes a list of applications that are forbiddedn to run by the current user through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -205,7 +205,7 @@ applicationManager.removeDisallowedRunningBundles(wantTemp, appIds, (error) => {
 
 removeDisallowedRunningBundles(admin: Want, appIds: Array\<string>, userId: number, callback: AsyncCallback&lt;void&gt;): void;
 
-Removes applications from the application blocklist of a user using the specified device administrator application. This API uses an asynchronous callback to return the result. If an application blocklist exists, the applications in the blocklist cannot run under the user specified by **userId**.
+Removes a list of applications that are forbiddedn to run by the specified user through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -251,7 +251,7 @@ applicationManager.removeDisallowedRunningBundles(wantTemp, appIds, 100, (error)
 
 removeDisallowedRunningBundles(admin: Want, appIds: Array\<string>, userId?: number): Promise&lt;void&gt;;
 
-Removes applications from the application blocklist using the specified device administrator application. This API uses a promise to return the result. If **userId** is passed in when this API is called to remove applications from the blocklist, the applications in the blocklist cannot run under the specified user. If **userId** is not passed in, the applications in the blocklist cannot run under the current user.
+Removes a list of applications that are forbiddedn to run by the specified user (if **userId** is passed in) or current user (if **userId** is not passed in) through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -302,7 +302,7 @@ applicationManager.removeDisallowedRunningBundles(wantTemp, appIds, 100).then(()
 
 getDisallowedRunningBundles(admin: Want, callback: AsyncCallback&lt;Array&lt;string&gt;&gt;): void;
 
-Obtains the application blocklist of the administrator user using the specified device administrator application. This API uses an asynchronous callback to return the result.
+Obtains the list of applications that are firbidded to run by the current user through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -345,7 +345,7 @@ applicationManager.getDisallowedRunningBundles(wantTemp, (error) => {
 
 getDisallowedRunningBundles(admin: Want, userId: number, callback: AsyncCallback&lt;Array&lt;string&gt;&gt;): void;
 
-Obtains the application blocklist of a user using the specified device administrator application. This API uses an asynchronous callback to return the result.
+Obtains the list of applications that are firbidded to run by the specified user through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -389,7 +389,7 @@ applicationManager.getDisallowedRunningBundles(wantTemp, 100, (error) => {
 
 getDisallowedRunningBundles(admin: Want, userId?: number): Promise&lt;Array&lt;string&gt;&gt;;
 
-Obtains the application blocklist using the specified device administrator application. This API uses a promise to return the result. If **userId** is passed in when this API is called, the device administrator application obtains the application blocklist of the specified user. If **userId** is not passed in, the device administrator application obtains the application blocklist of the current user. 
+Obtains the list of applications that are firbidded to run by the specified user (if **userId** is passed in) or current user (if **userId** is not passed in) through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_MANAGE_SET_APP_RUNNING_POLICY
 
@@ -408,7 +408,7 @@ Obtains the application blocklist using the specified device administrator appli
 
 | Type                  | Description                     |
 | --------------------- | ------------------------- |
-| Promise&lt;Array&lt;string&gt;&gt; | Promise used to return the application blocklist of the administrator user.|
+| Promise&lt;Array&lt;string&gt;&gt; | Promise used to return the application blocklist of the current user.|
 
 **Error codes**
 

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

@@ -4,7 +4,8 @@ The **dateTimeManager** module provides APIs for system time management. Only th
 
 > **NOTE**
 > 
-> The initial APIs of this module are supported since API version 9. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The 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 of this module can be called only after a [device administrator application](js-apis-enterprise-adminManager.md#adminmanagerenableadmin) is enabled.
 
 ## Modules to Import
 
@@ -16,7 +17,7 @@ import dateTimeManager from '@ohos.enterprise.dateTimeManager'
 
 setDateTime(admin: Want, time: number, callback: AsyncCallback\<void>): void
 
-Configures a device administrator application to set the system time. This API uses an asynchronous callback to return the result.
+Sets the system time through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_DATETIME
 
@@ -29,8 +30,8 @@ Configures a device administrator application to set the system time. This API u
 | Name  | Type                                 | Mandatory  | Description     |
 | ----- | ----------------------------------- | ---- | ------- |
 | admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application.|
-| time  | number | Yes| Timestamp (ms).|
-| callback | AsyncCallback\<void> | Yes| Callback used to return the result. If the operation is successful, **err** is **null**. Otherwise, **err** is an error object.|
+| time  | number | Yes| Timestamp to set, in ms.|
+| callback | AsyncCallback\<void> | Yes| Callback invoked to return the result. If the operation is successful, **err** is **null**. Otherwise, **err** is an error object.|
 
 **Error codes**
 
@@ -59,7 +60,7 @@ dateTimeManager.setDateTime(wantTemp, 1526003846000, (error) => {
 
 setDateTime(admin: Want, time: number): Promise\<void>
 
-Configures a device administrator application to set the system time. This API uses a promise to return the result.
+Sets the system time through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_DATETIME
 
@@ -72,7 +73,7 @@ Configures a device administrator application to set the system time. This API u
 | Name  | Type                                 | Mandatory  | Description     |
 | ----- | ----------------------------------- | ---- | ------- |
 | admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application.|
-| time  | number | Yes| Timestamp (ms).|
+| time  | number | Yes| Timestamp to set, in ms.|
 
 **Return value**
 
@@ -106,7 +107,7 @@ dateTimeManager.setDateTime(wantTemp, 1526003846000).then(() => {
 
 disallowModifyDateTime(admin: Want, disallow: boolean, callback: AsyncCallback\<void>): void
 
-Configures a device administrator application to disable modification of the system time. This API uses an asynchronous callback to return the result.
+Disallows modification of the system time through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_DATETIME
 
@@ -120,7 +121,7 @@ Configures a device administrator application to disable modification of the sys
 | ----- | ----------------------------------- | ---- | ------- |
 | admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application.|
 | disallow  | boolean | Yes| Whether to disable modification of the system time. The value **true** means to disable modification of the system time, and **false** means the opposite.|
-| callback | AsyncCallback\<void> | Yes| Callback used to return the result. If the operation is successful, **err** is **null**. Otherwise, **err** is an error object.|
+| callback | AsyncCallback\<void> | Yes| Callback invoked to return the result. If the operation is successful, **err** is **null**. Otherwise, **err** is an error object.|
 
 **Error codes**
 
@@ -149,7 +150,7 @@ dateTimeManager.disallowModifyDateTime(wantTemp, true, (error) => {
 
 disallowModifyDateTime(admin: Want, disallow: boolean): Promise\<void>
 
-Configures a device administrator application to disable modification of the system time. This API uses a promise to return the result.
+Disallows modification of the system time through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_DATETIME
 
@@ -168,7 +169,7 @@ Configures a device administrator application to disable modification of the sys
 
 | Type  | Description                                 |
 | ----- | ----------------------------------- |
-| Promise\<void> | that returns no value. If the operation fails, an error object is thrown.|
+| Promise\<void> | Promise that returns no value. An error object is thrown if the operation fails.|
 
 **Error codes**
 
@@ -196,7 +197,7 @@ dateTimeManager.disallowModifyDateTime(wantTemp, true).then(() => {
 
 isModifyDateTimeDisallowed(admin: Want, callback: AsyncCallback\<boolean>): void
 
-Configures a device administrator application to check whether modification of the system time is disabled. This API uses an asynchronous callback to return the result.
+Checks whether the modification of the system time is disallowed through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_DATETIME
 
@@ -209,7 +210,7 @@ Configures a device administrator application to check whether modification of t
 | Name  | Type                                 | Mandatory  | Description     |
 | ----- | ----------------------------------- | ---- | ------- |
 | admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application.|
-| callback | AsyncCallback\<boolean> | Yes| Callback used to return the result. The value **true** means that modification of the system time is disabled, and **false** means the opposite.|
+| callback | AsyncCallback\<boolean> | Yes| Callback invoked to return the result. The value **true** means that modification of the system time is disallowed, and **false** means the opposite.|
 
 **Error codes**
 
@@ -238,7 +239,7 @@ dateTimeManager.isModifyDateTimeDisallowed(wantTemp, (error) => {
 
 isModifyDateTimeDisallowed(admin: Want): Promise\<boolean>
 
-Configures a device administrator application to check whether modification of the system time is disabled. This API uses a promise to return the result.
+Checks whether the modification of the system time is disallowed through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_DATETIME
 
@@ -256,7 +257,7 @@ Configures a device administrator application to check whether modification of t
 
 | Type  | Description                                 |
 | ----- | ----------------------------------- |
-| Promise\<boolean> | Promise used to return the result. The value **true** means that modification of the system time is disabled, and **false** means the opposite.|
+| Promise\<boolean> | Promise used to return the result. The value **true** means that modification of the system time is disallowed, and **false** means the opposite.|
 
 **Error codes**
 
@@ -274,7 +275,7 @@ let wantTemp = {
     bundleName: "bundleName",
     abilityName: "abilityName",
 };
-dateTimeManager.disallowModifyDateTime(wantTemp).then(() => {
+dateTimeManager.isModifyDateTimeDisallowed(wantTemp).then(() => {
 }).catch((error) => {
     console.log("error code:" + error.code + " error message:" + error.message);
 })

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

-# @ohos.enterprise.deviceControl (Device Control Management)
+# @ohos.enterprise.deviceControl (Device Control)
 
-The **deviceControl** module provides APIs for device control, which can only be called by device administrator applications.
+The **deviceControl** module provides APIs for device control, which can be called only by device administrator applications.
 
 > **NOTE**
 > 
-> The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The APIs of this module can be called only after a [device administrator application](js-apis-enterprise-adminManager.md#adminmanagerenableadmin) is enabled.
 
 ## Modules to Import
 
@@ -18,6 +19,7 @@ resetFactory(admin: Want, callback: AsyncCallback\<void>): void
 
 Restores factory settings. This API uses an asynchronous callback to return the result.
 
+
 **Required permissions**: ohos.permission.ENTERPRISE_RESET_DEVICE
 
 **System capability**: SystemCapability.Customization.EnterpriseDeviceManager
@@ -28,8 +30,8 @@ Restores factory settings. This API uses an asynchronous callback to return the
 
 | Name  | Type                                 | Mandatory  | Description     |
 | ----- | ----------------------------------- | ---- | ------- |
-| admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application.|
-| callback | AsyncCallback\<void> | Yes| Callback used to return the result. If the setting is successful, **err** is **null**. Otherwise, **err** is an error object.|
+| admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application used to restore the factory settings.|
+| callback | AsyncCallback\<void> | Yes| Callback invoked to return the result. If the operation is successful, **err** is **null**. Otherwise, **err** is an error object.|
 
 **Error codes**
 
@@ -40,7 +42,7 @@ For details about the error codes, see [Enterprise Device Management Error Codes
 | 9200001 | the application is not an administrator of the device.                       |
 | 9200002 | the administrator application does not have permission to manage the device. |
 
-**Example:**
+**Example**
 
 ```js
 let wantTemp = {
@@ -70,13 +72,13 @@ Restores factory settings. This API uses a promise to return the result.
 
 | Name  | Type                                 | Mandatory  | Description     |
 | ----- | ----------------------------------- | ---- | ------- |
-| admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application.|
+| admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application used to restore the factory settings.|
 
 **Return value**
 
 | Type  | Description                                 |
 | ----- | ----------------------------------- |
-| Promise\<void> | Promise that returns no value.|
+| Promise\<void> | Promise that returns no value. If the operation fails, an error object is thrown.|
 
 **Error codes**
 
@@ -87,7 +89,7 @@ For details about the error codes, see [Enterprise Device Management Error Codes
 | 9200001 | the application is not an administrator of the device.                        |
 | 9200002 | the administrator application does not have permission to manage the device. |
 
-**Example:**
+**Example**
 
 ```js
 let wantTemp = {

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

 # @ohos.enterprise.deviceInfo (Device Information Management)
 
-The **deviceInfo** module provides APIs for enterprise device information management, including the API for obtaining device serial numbers. These APIs can only be called by device administrator applications.
+The **deviceInfo** module provides APIs for enterprise device information management, including the API for obtaining device serial numbers. Only the enterprise device administrator applications can call the APIs provided by this module.
 
 > **NOTE**
 >
-> The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The APIs of this module can be called only after a [device administrator application](js-apis-enterprise-adminManager.md#adminmanagerenableadmin) is enabled.
 
 ## Modules to Import
 
@@ -16,7 +17,7 @@ import deviceInfo from '@ohos.enterprise.deviceInfo';
 
 getDeviceSerial(admin: Want, callback: AsyncCallback<string>): void
 
-Configures a device administrator application to obtain the device serial number. This API uses an asynchronous callback to return the result.
+Obtains the device serial number through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_DEVICE_INFO
 
@@ -29,7 +30,7 @@ Configures a device administrator application to obtain the device serial number
 | Name     | Type                                      | Mandatory  | Description                      |
 | -------- | ---------------------------------------- | ---- | ------------------------------- |
 | admin    | [Want](js-apis-app-ability-want.md)     | Yes   | Device administrator application.                 |
-| callback | AsyncCallback&lt;string&gt;            | Yes   | Callback used to return the result.<br> If the operation is successful, **err** is **null** and **data** is the device serial number obtained. If the operation fails, **err** is an error object.      |
+| callback | AsyncCallback&lt;string&gt;            | Yes   | Callback invoked to return the result. If the operation is successful, **err** is **null** and **data** is the device serial number obtained. If the operation fails, **err** is an error object.      |
 
 **Error codes**
 
@@ -60,7 +61,7 @@ deviceInfo.getDeviceSerial(wantTemp, (error, result) => {
 
 getDeviceSerial(admin: Want): Promise&lt;string&gt;
 
-Configures a device administrator application to obtain the device serial number. This API uses a promise to return the result.
+Obtains the device serial number through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_DEVICE_INFO
 
@@ -107,7 +108,7 @@ deviceInfo.getDeviceSerial(wantTemp).then((result) => {
 
 getDisplayVersion(admin: Want, callback: AsyncCallback&lt;string&gt;): void;
 
-Configures a device administrator application to obtain the device version number. This API uses an asynchronous callback to return the result.
+Obtains the device version number through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_DEVICE_INFO
 
@@ -120,7 +121,7 @@ Configures a device administrator application to obtain the device version numbe
 | Name     | Type                                      | Mandatory  | Description                      |
 | -------- | ---------------------------------------- | ---- | ------------------------------- |
 | admin    | [Want](js-apis-app-ability-want.md)      | Yes   | Device administrator application.                 |
-| callback | AsyncCallback&lt;string&gt;            | Yes   | Callback used to return the result.<br> If the operation is successful, **err** is **null** and **data** is the device version number obtained. If the operation fails, **err** is an error object.      |
+| callback | AsyncCallback&lt;string&gt;            | Yes   | Callback invoked to return the result. If the operation is successful, **err** is **null** and **data** is the device version number obtained. If the operation fails, **err** is an error object.      |
 
 **Error codes**
 
@@ -151,7 +152,7 @@ deviceInfo.getDisplayVersion(wantTemp, (error, result) => {
 
 getDisplayVersion(admin: Want): Promise&lt;string&gt;
 
-Configures a device administrator application to obtain the device version number. This API uses a promise to return the result.
+Obtains the device version number through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_DEVICE_INFO
 
@@ -198,7 +199,7 @@ deviceInfo.getDisplayVersion(wantTemp).then((result) => {
 
 getDeviceName(admin: Want, callback: AsyncCallback&lt;string&gt;): void
 
-Configures a device administrator application to obtain the device name. This API uses an asynchronous callback to return the result.
+Obtains the device name through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_DEVICE_INFO
 
@@ -211,7 +212,7 @@ Configures a device administrator application to obtain the device name. This AP
 | Name     | Type                                      | Mandatory  | Description                      |
 | -------- | ---------------------------------------- | ---- | ------------------------------- |
 | admin    | [Want](js-apis-app-ability-want.md)      | Yes   | Device administrator application.                 |
-| callback | AsyncCallback&lt;string&gt;              | Yes   | Callback used to return the result.<br> If the operation is successful, **err** is **null** and **data** is the device name obtained. If the operation fails, **err** is an error object.      |
+| callback | AsyncCallback&lt;string&gt;              | Yes   | Callback invoked to return the result. If the operation is successful, **err** is **null** and **data** is the device name obtained. If the operation fails, **err** is an error object.      |
 
 **Error codes**
 
@@ -242,7 +243,7 @@ deviceInfo.getDeviceName(wantTemp, (error, result) => {
 
 getDeviceName(admin: Want): Promise&lt;string&gt;
 
-Configures a device administrator application to obtain the device name. This API uses a promise to return the result.
+Obtains the device name through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_DEVICE_INFO
 

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

@@ -4,7 +4,8 @@ The **networkManager** module provides APIs for network management of enterprise
 
 > **NOTE**
 >
-> The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The APIs of this module can be called only after a [device administrator application](js-apis-enterprise-adminManager.md#adminmanagerenableadmin) is enabled.
 
 ## Modules to Import
 
@@ -16,9 +17,9 @@ import networkManager from '@ohos.enterprise.networkManager';
 
 getAllNetworkInterfaces(admin: Want, callback: AsyncCallback<Array<string>>): void
 
-Obtains all active network interfaces through a device administrator application. This API uses an asynchronous callback to return the result.
+Obtains all active network interfaces through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
-**Required permissions**: ohos.permission.GET_NETWORK_INFO
+**Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
 
 **System capability**: SystemCapability.Customization.EnterpriseDeviceManager
 
@@ -47,7 +48,7 @@ let wantTemp = {
     bundleName: "com.example.myapplication",
     abilityName: "EntryAbility",
 };
-networkManager.getAllNetworkInterfaces(admin, (error, result) => {
+networkManager.getAllNetworkInterfaces(wantTemp, (error, result) => {
     if (error != null) {
         console.log("error code:" + error.code + " error message:" + error.message);
         return;
@@ -60,7 +61,7 @@ networkManager.getAllNetworkInterfaces(admin, (error, result) => {
 
 getAllNetworkInterfaces(admin: Want): Promise<Array<string>>
 
-Obtains all active network interfaces through a device administrator application. This API uses a promise to return the result.
+Obtains all active network interfaces through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
 
@@ -107,9 +108,9 @@ networkManager.getAllNetworkInterfaces(wantTemp).then((result) => {
 
 getIpAddress(admin: Want, networkInterface: string, callback: AsyncCallback<string>): void
 
-Obtains the device IP address based on the given network interface through a device administrator application. This API uses an asynchronous callback to return the result.
+Obtains the device IP address based on the given network interface through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
-**Required permissions**: ohos.permission.GET_NETWORK_INFO
+**Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
 
 **System capability**: SystemCapability.Customization.EnterpriseDeviceManager
 
@@ -152,7 +153,7 @@ networkManager.getIpAddress(wantTemp, "eth0", (error, result) => {
 
 getIpAddress(admin: Want, networkInterface: string): Promise<string>
 
-Obtains the device IP address based on the given network interface through a device administrator application. This API uses a promise to return the result.
+Obtains the device IP address based on the given network interface through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
 
@@ -200,7 +201,7 @@ networkManager.getIpAddress(wantTemp, "eth0").then((result) => {
 
 getMac(admin: Want, networkInterface: string, callback: AsyncCallback<string>): void
 
-Obtains the device MAC address based on the given network interface through a device administrator application. This API uses an asynchronous callback to return the result.
+Obtains the device MAC address based on the given network interface through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
 
@@ -245,7 +246,7 @@ networkManager.getMac(wantTemp, "eth0", (error, result) => {
 
 getIpAddress(admin: Want, networkInterface: string): Promise<string>
 
-Obtain the device MAC address based on the given network interface through a device administrator application. This API uses a promise to return the result.
+Obtain the device MAC address based on the given network interface through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
 
@@ -288,3 +289,191 @@ networkManager.getMac(wantTemp, "eth0").then((result) => {
     console.log("error code:" + error.code + " error message:" + error.message);
 });
 ```
+
+## networkManager.isNetworkInterfaceDisabled
+
+isNetworkInterfaceDisabled(admin: Want, networkInterface: string, callback: AsyncCallback<boolean>): void
+
+Checks whether a network interface is disabled through the specified device administrator application. This API uses an asynchronous callback to return the result.
+
+**Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
+
+**System capability**: SystemCapability.Customization.EnterpriseDeviceManager
+
+**System API**: This is a system API.
+
+**Parameters**
+
+| Name     | Type                                      | Mandatory  | Description                      |
+| -------- | ---------------------------------------- | ---- | ------------------------------- |
+| admin    | [Want](js-apis-app-ability-want.md)      | Yes   | Device administrator application that obtains the information.                 |
+| networkInterface    | string     | Yes   | Network interface.                 |
+| callback | AsyncCallback<boolean>            | Yes   | Callback invoked to return the result. If the operation is successful, **err** is **null**, and **data** indicates whether the network interface is disabled. The value **true** means the network interface is disabled; and **false** means the opposite. If the operation fails, **err** is an error object.      |
+
+**Error codes**
+
+For details about the error codes, see [Enterprise Device Management Error Codes](../errorcodes/errorcode-enterpriseDeviceManager.md).
+
+| ID| Error Message                                                                      |
+| ------- | ---------------------------------------------------------------------------- |
+| 9200001 | The application is not an administrator application of the device.                       |
+| 9200002 | The administrator application does not have permission to manage the device.|
+
+**Example**
+
+```js
+let wantTemp = {
+    bundleName: "com.example.myapplication",
+    abilityName: "EntryAbility",
+};
+networkManager.isNetworkInterfaceDisabled(wantTemp, "eth0", (error, result) => {
+    if (error != null) {
+        console.log("error code:" + error.code + " error message:" + error.message);
+        return;
+    }
+    console.log("result:" + result);
+});
+```
+
+## networkManager.isNetworkInterfaceDisabled
+
+isNetworkInterfaceDisabled(admin: Want, networkInterface: string): Promise<boolean>
+
+Checks whether a network interface is disabled through the specified device administrator application. This API uses a promise to return the result.
+
+**Required permissions**: ohos.permission.ENTERPRISE_GET_NETWORK_INFO
+
+**System capability**: SystemCapability.Customization.EnterpriseDeviceManager
+
+**System API**: This is a system API.
+
+**Parameters**
+
+| Name  | Type                                 | Mandatory  | Description     |
+| ----- | ----------------------------------- | ---- | ------- |
+| admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application that obtains the information.|
+| networkInterface    | string     | Yes   | Network interface.                 |
+
+**Return value**
+
+| Type                  | Description                     |
+| --------------------- | ------------------------- |
+| Promise<boolean> | Promise used to return the result. The value **true** means the network interface is disabled, and the value **false** means the opposite. |
+
+**Error codes**
+
+For details about the error codes, see [Enterprise Device Management Error Codes](../errorcodes/errorcode-enterpriseDeviceManager.md).
+
+| ID| Error Message                                                                    |
+| ------- | ---------------------------------------------------------------------------- |
+| 9200001 | The application is not an administrator application of the device.                       |
+| 9200002 | The administrator application does not have permission to manage the device.|
+
+**Example**
+
+```js
+let wantTemp = {
+    bundleName: "com.example.myapplication",
+    abilityName: "EntryAbility",
+};
+networkManager.isNetworkInterfaceDisabled(wantTemp, "eth0").then((result) => {
+    console.log("result:" + result);
+}).catch(error => {
+    console.log("error code:" + error.code + " error message:" + error.message);
+});
+```
+
+## networkManager.setNetworkInterfaceDisabled
+
+setNetworkInterfaceDisabled(admin: Want, networkInterface: string, isDisabled: boolean, callback: AsyncCallback<void>): void
+
+Sets a network interface through the specified device administrator application. This API uses an asynchronous callback to return the result.
+
+**Required permissions**: ohos.permission.ENTERPRISE_SET_NETWORK
+
+**System capability**: SystemCapability.Customization.EnterpriseDeviceManager
+
+**System API**: This is a system API.
+
+**Parameters**
+
+| Name     | Type                                      | Mandatory  | Description                      |
+| -------- | ---------------------------------------- | ---- | ------------------------------- |
+| admin    | [Want](js-apis-app-ability-want.md)      | Yes   | Device administrator application that obtains the information.                 |
+| networkInterface    | string     | Yes   | Network interface.                 |
+| isDisabled    | boolean     | Yes   | Network interface status to set. The value **true** means to disable the network interface, and **false** means to enable the network interface.                 |
+| callback | AsyncCallback<void>            | Yes   | Callback invoked to return the result. If the operation is successful, **err** is **null**. Otherwise, **err** is an error object.      |
+
+**Error codes**
+
+For details about the error codes, see [Enterprise Device Management Error Codes](../errorcodes/errorcode-enterpriseDeviceManager.md).
+
+| ID| Error Message                                                                    |
+| ------- | ---------------------------------------------------------------------------- |
+| 9200001 | The application is not an administrator application of the device.                      |
+| 9200002 | The administrator application does not have permission to manage the device.|
+
+**Example**
+
+```js
+let wantTemp = {
+    bundleName: "com.example.myapplication",
+    abilityName: "EntryAbility",
+};
+networkManager.setNetworkInterfaceDisabled(wantTemp, "eth0", true, (error) => {
+    if (error != null) {
+        console.log("error code:" + error.code + " error message:" + error.message);
+        return;
+    }
+    console.log("setNetworkInterfaceDisabled success!");
+});
+```
+
+## networkManager.setNetworkInterfaceDisabled
+
+setNetworkInterfaceDisabled(admin: Want, networkInterface: string, isDisabled: boolean): Promise<void>
+
+Sets a network interface through the specified device administrator application. This API uses a promise to return the result.
+
+**Required permissions**: ohos.permission.ENTERPRISE_SET_NETWORK
+
+**System capability**: SystemCapability.Customization.EnterpriseDeviceManager
+
+**System API**: This is a system API.
+
+**Parameters**
+
+| Name  | Type                                 | Mandatory  | Description     |
+| ----- | ----------------------------------- | ---- | ------- |
+| admin | [Want](js-apis-app-ability-want.md) | Yes   | Device administrator application that obtains the information.|
+| networkInterface    | string     | Yes   | Network interface.                 |
+| isDisabled    | boolean     | Yes   | Network interface status to set. The value **true** means to disable the network interface, and **false** means to enable the network interface.                 |
+
+**Return value**
+
+| Type                  | Description                     |
+| --------------------- | ------------------------- |
+| Promise<void> | Promise that returns no value. An error object is thrown if the network interface fails to be disabled. |
+
+**Error codes**
+
+For details about the error codes, see [Enterprise Device Management Error Codes](../errorcodes/errorcode-enterpriseDeviceManager.md).
+
+| ID| Error Message                                                                    |
+| ------- | ---------------------------------------------------------------------------- |
+| 9200001 | The application is not an administrator application of the device.                      |
+| 9200002 | The administrator application does not have permission to manage the device.|
+
+**Example**
+
+```js
+let wantTemp = {
+    bundleName: "com.example.myapplication",
+    abilityName: "EntryAbility",
+};
+networkManager.setNetworkInterfaceDisabled(wantTemp, "eth0", true).then(() => {
+    console.log("setNetworkInterfaceDisabled success!");
+}).catch(error => {
+    console.log("error code:" + error.code + " error message:" + error.message);
+});
+```

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

@@ -4,7 +4,8 @@ The **wifiManager** module provides APIs for Wi-Fi management of enterprise devi
 
 > **NOTE**
 >
-> The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The initial APIs of this module are supported since API version 10. Newly added APIs will be marked with a superscript to indicate their earliest API version.
+> - The APIs of this module can be called only after a [device administrator application](js-apis-enterprise-adminManager.md#adminmanagerenableadmin) is enabled.
 
 ## Modules to Import
 
@@ -16,7 +17,7 @@ import wifiManager from '@ohos.enterprise.wifiManager';
 
 isWifiActive(admin: Want, callback: AsyncCallback<boolean>): void
 
-Checks whether Wi-Fi is active through a device administrator application. This API uses an asynchronous callback to return the result.
+Checks whether Wi-Fi is active through the specified device administrator application. This API uses an asynchronous callback to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_WIFI
 
@@ -52,7 +53,7 @@ wifiManager.isWifiActive(wantTemp, (error, result) => {
         console.log("error code:" + error.code + " error message:" + error.message);
         return;
     }
-    console.log(result);
+    console.log("result:" + result);
 });
 ```
 
@@ -60,7 +61,7 @@ wifiManager.isWifiActive(wantTemp, (error, result) => {
 
 isWifiActive(admin: Want): Promise<boolean>
 
-Checks whether Wi-Fi is active through a device administrator application. This API uses a promise to return the result.
+Checks whether Wi-Fi is active through the specified device administrator application. This API uses a promise to return the result.
 
 **Required permissions**: ohos.permission.ENTERPRISE_SET_WIFI
 
@@ -97,7 +98,7 @@ let wantTemp = {
     abilityName: "EntryAbility",
 };
 wifiManager.isWifiActive(wantTemp).then((result) => {
-    console.log(result);
+    console.log("result:" + result);
 }).catch(error => {
     console.log("error code:" + error.code + " error message:" + error.message);
 });
@@ -139,7 +140,7 @@ let wantTemp = {
     bundleName: "com.example.myapplication",
     abilityName: "EntryAbility",
 };
-let profile : WifiProfile = {
+let profile : wifiManager.WifiProfile = {
     "ssid": "name",
     "preSharedKey": "passwd",
     "securityType": wifiManager.WifiSecurityType.WIFI_SEC_TYPE_PSK
@@ -194,12 +195,12 @@ let wantTemp = {
     bundleName: "com.example.myapplication",
     abilityName: "EntryAbility",
 };
-let profile : WifiProfile = {
+let profile : wifiManager.WifiProfile = {
     "ssid": "name",
     "preSharedKey": "passwd",
     "securityType": wifiManager.WifiSecurityType.WIFI_SEC_TYPE_PSK
 };
-wifiManager.isWifiActive(wantTemp, profile).then(() => {
+wifiManager.setWifiProfile(wantTemp, profile).then(() => {
     console.log("set wifi success");
 }).catch(error => {
     console.log("error code:" + error.code + " error message:" + error.message);

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

@@ -22,7 +22,7 @@ Defines a file metadata object, which includes the application name and file URI
 | Name      | Type  | Mandatory| Description                                                                                          |
 | ---------- | ------ | ---- | ---------------------------------------------------------------------------------------------- |
 | bundleName | string | Yes  | Bundle name of the application, which can be obtained by using the method provided by [bundle.BundleInfo](js-apis-bundle-BundleInfo.md).         |
-| uri        | string | Yes  | Name of the file in the application sandbox.<br>Currently, the URI has not been upgraded to the standard format. It can consist of digits (0–9), letters (a–z and A–Z), underscores (_), and period (.) only.|
+| uri        | string | Yes  | URI of the file in the application sandbox.<br>Currently, the URI is not in the standard format. It can consist of digits (0–9), letters (a–z and A–Z), underscores (_), and period (.) only.|
 
 ## FileData
 
@@ -51,7 +51,7 @@ inherits from [FileMeta](#filemeta) and [FileData](#filedata).
 
 ## GeneralCallbacks
 
-Provides general callbacks invoked during the backup or restoration process. The backup service uses these callbacks to notify the client of the backup/restoration phase of the application.
+Provides callbacks to be used in the backup or restoration process. The backup service uses these callbacks to notify the client of the backup/restoration phase of the application.
 
 **System capability**: SystemCapability.FileManagement.StorageService.Backup
 
@@ -263,7 +263,7 @@ The following is an example of the file obtained:
     "versionCode" : 1000000,
     "versionName" : "1.0.0"
     }],
-  "deviceType" : "phone",
+  "deviceType" : "default",
   "systemFullName" : "OpenHarmony-4.0.0.0"
  }
  ```
@@ -324,7 +324,7 @@ For details about the error codes, see [File Management Error Codes](../errorcod
     "versionCode" : 1000000,
     "versionName" : "1.0.0"
     }],
-  "deviceType" : "phone",
+  "deviceType" : "default",
   "systemFullName" : "OpenHarmony-4.0.0.0"
  }
  ```
@@ -546,7 +546,7 @@ For details about the error codes, see [File Management Error Codes](../errorcod
 
 ## SessionRestore
 
-Provides a restoration process object to support the data restoration process of applications. Before using the APIs of this class, you need to create a **SessionRestore** instance.
+Provides an object to support the data restoration process of applications. Before using the APIs of this class, you need to create a **SessionRestore** instance.
 
 ### constructor
 

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

@@ -14,6 +14,8 @@ 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:
 
+**Stage Model**
+
  ```js
 import UIAbility from '@ohos.app.ability.UIAbility';
 
@@ -25,6 +27,19 @@ export default class EntryAbility extends UIAbility {
 }
  ```
 
+**FA Model**
+
+ ```js
+ import featureAbility from '@ohos.ability.featureAbility';
+ 
+ let context = featureAbility.getContext();
+ context.getFilesDir().then((data) => {
+      let pathDir = data;
+ })
+ ```
+
+For details about how to obtain the FA model context, see [Context](js-apis-inner-app-context.md#context).
+
 ## fileUri.getUriFromPath
 
 getUriFromPath(path: string): string

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

+# @ohos.font (Custom Font Registration)
+
+The **font** module provides APIs for registering custom fonts.
+
+> **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
+
+```ts
+import font from '@ohos.font'
+```
+
+## font.registerFont
+
+registerFont(options: FontOptions): void
+
+Registers a custom font with the font manager.
+
+**System capability**: SystemCapability.ArkUI.ArkUI.Full
+
+**Parameters**
+
+| Name    | Type                         | Mandatory  | Description         |
+| ------- | --------------------------- | ---- | ----------- |
+| options | [FontOptions](#fontoptions) | Yes   | Information about the custom font to register.|
+
+## FontOptions
+
+| Name        | Type    | Mandatory  | Description          |
+| ---------- | ------ | ---- | ------------ |
+| familyName | string | Yes   | Name of the custom font to register.  |
+| familySrc  | string | Yes   | Path of the custom font to register.|
+
+## Example
+
+```ts
+// xxx.ets
+import font from '@ohos.font';
+
+@Entry
+@Component
+struct FontExample {
+  @State message: string =' Hello, World'
+
+  aboutToAppear() {
+    font.registerFont({
+      familyName: 'medium',
+      familySrc: '/font/medium.ttf'
+    })
+  }
+
+  build() {
+    Column() {
+      Text(this.message)
+        .align(Alignment.Center)
+        .fontSize(20)
+        .fontFamily('medium') // medium: name of the custom font to register.
+        .height('100%')
+    }.width('100%')
+  }
+}
+```

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

@@ -88,7 +88,7 @@ The permission usage record includes the application identity (token ID) of the
 | permissionName | Permissions | Yes  | Name of the permission.|
 | successCount | number | Yes  | Number of successful accesses.|
 | failCount | number | Yes  | Number of failed accesses.|
-| callback | AsyncCallback<void> | Yes  | Callback invoked to return the result. If a usage record is added successfully, **err** is **undefined**. Otherwise, **err** is an error object.|
+| callback | AsyncCallback<void> | Yes  | Callback invoked to return the result. If the operation is successful, **err** is **undefined**. Otherwise, **err** is an error object.|
 
 **Error codes**
 
@@ -196,7 +196,7 @@ Obtains historical permission usage records. This API uses an asynchronous callb
 | Name  | Type                | Mandatory| Description                                      |
 | -------- | -------------------  | ---- | ------------------------------------------ |
 | request | [PermissionUsedRequest](#permissionusedrequest) | Yes| Request for querying permission usage records.|
-| callback | AsyncCallback<[PermissionUsedResponse](#permissionusedresponse)> | Yes| Callback invoked to return the result. If the query is successful, **err** is **undefined** and **data** is the permission usage record. Otherwise, **err** is an error object.|
+| callback | AsyncCallback<[PermissionUsedResponse](#permissionusedresponse)> | Yes| Callback invoked to return the result. If the operation is successful, **err** is **undefined** and **data** is the permission usage record obtained. Otherwise, **err** is an error object.|
 
 **Error codes**
 
@@ -307,7 +307,7 @@ Starts to use a permission and flushes the permission usage record. This API is
 | -------------- | --------------------- | ---- | ------------------------------------ |
 | tokenID        | number                | Yes  | Application token ID of the invoker. The value can be obtained from [ApplicationInfo](js-apis-bundle-ApplicationInfo.md).|
 | permissionName | Permissions                | Yes  | Permission to use.                    |
-| callback       | AsyncCallback&lt;void&gt; | Yes  | Callback invoked to return the result. If the permission is successfully used, **err** is **undefined**. Otherwise, **err** is an error object.|
+| callback       | AsyncCallback&lt;void&gt; | Yes  | Callback invoked to return the result. If the operation is successful, **err** is **undefined**. Otherwise, **err** is an error object.|
 
 **Error codes**
 

en/application-dev/reference/apis/js-apis-resourceschedule-backgroundTaskManager.md

@@ -628,9 +628,11 @@ Enumerates the efficiency resource types.
 | Name                    | Value | Description                   |
 | ----------------------- | ---- | --------------------- |
 | CPU                     | 1    | CPU resources, which prevent the application from being suspended.            |
-| COMMON_EVENT            | 2    | A type of software resources, which prevent common events from being proxied when the application is suspended. |
-| TIMER                   | 4    | A type of software resources, which prevent timers from being proxied when the application is suspended.   |
-| WORK_SCHEDULER          | 8    | WORK_SCHEDULER resources, which ensure that the application has more time to execute the task.     |
-| BLUETOOTH               | 16   | A type of hardware resources, which prevent Bluetooth resources from being proxied when the application is suspended. |
-| GPS                     | 32   | A type of hardware resources, which prevent GPS resources from being proxied when the application is suspended. |
-| AUDIO                   | 64   | A type of hardware resources, which prevent audio resources from being proxied when the application is suspended.|
+| COMMON_EVENT            | 2    | Common events are not proxied when the application is suspended.|
+| TIMER                   | 4    | System timers are not proxied when the application is suspended.|
+| WORK_SCHEDULER          | 8    | WorkScheduler uses a loose control policy by default. For details, see [Restrictions on Using Work Scheduler Tasks](../../task-management/background-task-overview.md#restrictions-on using-work-scheduler-tasks).|
+| BLUETOOTH               | 16   | Bluetooth resources are not proxied when the application is suspended.|
+| GPS                     | 32   | GPS resources are not proxied when the application is suspended.|
+| AUDIO                   | 64   | Audio resources are not proxied when the application is suspended.|
+| RUNNING_LOCK | 128 | RUNNING_LOCK resources are not proxied when the application is suspended.|
+| SENSOR | 256 | Sensor callbacks are not intercepted.|

en/application-dev/reference/apis/js-apis-system-date-time.md

@@ -128,7 +128,7 @@ Obtains the time elapsed since the Unix epoch. This API uses an asynchronous cal
 
 | Name  | Type              | Mandatory| Description                           |
 | -------- | ----------- | ---- | ---------------------------------- |
-| callback | AsyncCallback<number> | Yes  | Callback used to return the time elapsed since the Unix epoch.        |
+| callback | AsyncCallback<number> | Yes  | Callback used to return the time elapsed since the Unix epoch, in milliseconds.        |
 
 **Example**
 

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

@@ -191,7 +191,7 @@ Obtains the time elapsed since the Unix epoch. This API uses a promise to return
 
 | Name| Type   | Mandatory| Description                    |
 | ------ | ------- | ---- | ------------------------- |
-| isNano | boolean | No  | Whether the time to return is in nanoseconds.<br>- **true**: in nanoseconds.<br>- **false**: in milliseconds.|
+| isNano | boolean | No  | Whether the time to return is in nanoseconds.<br>- **true**: in nanoseconds.<br>- **false**: in milliseconds.<br/>Default value: **false** |
 
 **Return value**
 
@@ -310,7 +310,7 @@ Obtains the time elapsed since system startup, excluding the deep sleep time. Th
 
 | Name| Type   | Mandatory| Description                             |
 | ------ | ------- | ---- | ----------------------------------- |
-| isNano | boolean | No  | Whether the time to return is in nanoseconds.<br>- **true**: in nanoseconds.<br>- **false**: in milliseconds.|
+| isNano | boolean | No  | Whether the time to return is in nanoseconds.<br>- **true**: in nanoseconds.<br>- **false**: in milliseconds.<br/>Default value: **false** |
 
 **Return value**
 
@@ -429,7 +429,7 @@ Obtains the time elapsed since system startup, including the deep sleep time. Th
 
 | Name| Type   | Mandatory| Description                              |
 | ------ | ------- | ---- | ------------------------------- |
-| isNano | boolean | No  | Whether the time to return is in nanoseconds.<br>- **true**: in nanoseconds.<br>- **false**: in milliseconds.|
+| isNano | boolean | No  | Whether the time to return is in nanoseconds.<br>- **true**: in nanoseconds.<br>- **false**: in milliseconds.<br/>Default value: **false** |
 
 **Return value**
 

en/application-dev/reference/arkui-ts/ts-types.md

@@ -22,7 +22,9 @@ You can use `$r` or `$rawfile` to create a **Resource** object, but its attribut
 
   **filename**: name of the file in the **resources/rawfile** directory of the project.
 
-  **NOTE**<br>When referencing resources of the **Resource** type, make sure the data type is the same as that of the attribute method. For example, if an attribute method supports the **string | Resource** types, the data type of the **Resource** type must be string.
+  > **NOTE**
+  >
+  > When referencing resources of the **Resource** type, make sure the data type is the same as that of the attribute method. For example, if an attribute method supports the **string | Resource** types, the data type of the **Resource** type must be string.
 
 ## Length
 
@@ -230,7 +232,7 @@ The **CustomBuilder** type is used to define custom UI descriptions in component
 
 ## PixelStretchEffectOptions<sup>10+</sup>
 
-Describes the pixel stretch effect options.
+The **PixelStretchEffectOptions** type is used to describe the pixel stretch effect options.
 
 | Name    | Type               | Mandatory  | Description            |
 | ------ | ----------------- | ---- | -------------- |
@@ -245,6 +247,67 @@ The **ModalTransition** type is used to set the transition type for a full-scree
 
 | Name     | Description          |
 | ------- | ------------ |
-| None    | No transition animation for the full-screen modal.  |
-| Default | Slide-up and slide-down animation for the full-screen modal. |
-| Alpha   | Opacity animation for the full-screen modal.|
+| NONE    | No transition animation for the modal.  |
+| DEFAULT | Slide-up and slide-down animation for the modal. |
+| ALPHA   | Opacity gradient animation for the modal. |
+
+## Dimension<sup>10+</sup>
+
+The **Length** type is used to represent a size unit.
+
+| Type                   | Description                                    |
+| --------------------- | -------------------------------------- |
+| [PX](#px10)               | Physical pixel unit type. The unit px must be included, for example, **'10px'**.|
+| [VP](#vp10)                | Pixel unit type specific to the screen density. The unit vp must be included, for example, **'10vp'**.|
+| [FP](#fp10)                | Font pixel unit type. The unit fp must be included, for example, **'10fp'**.|
+| [LPX](#lpx10)              | Logical pixel unit type. The unit lpx must be included, for example, **'10lpx'**.|
+| [Percentage](#percentage10)        | Percentage type. The unit % must be included, for example, **'10%'**.|
+| [Resource](#resource) | Size referenced from system or application resources.|
+
+## PX<sup>10+</sup>
+
+The **PX** type is used to represent a length in px.
+
+| Type                   | Description                                    |
+| --------------------- | -------------------------------------- |
+| {number}px               | Physical pixel unit type. The unit px must be included, for example, **'10px'**.|
+
+## VP<sup>10+</sup>
+
+The **VP** type is used to represent a length in vp.
+
+| Type                   | Description                                    |
+| --------------------- | -------------------------------------- |
+| {number}vp               | Pixel unit type specific to the screen density. The unit vp must be included, for example, **'10vp'**.|
+
+## FP<sup>10+</sup>
+
+The **FP** type is used to represent a length in fp.
+
+| Type                   | Description                                    |
+| --------------------- | -------------------------------------- |
+| {number}fp               | Font pixel unit type. The unit fp must be included, for example, **'10fp'**.|
+
+## LPX<sup>10+</sup>
+
+The **LPX** type is used to represent a length in lpx.
+
+| Type                   | Description                                    |
+| --------------------- | -------------------------------------- |
+| {number}lpx               | Logical pixel unit type. The unit lpx must be included, for example, **'10lpx'**.|
+
+## Percentage<sup>10+</sup>
+
+The **Percentage** type is used to represent a length in percentage.
+
+| Type                   | Description                                    |
+| --------------------- | -------------------------------------- |
+| {number}%               | Percentage type. The unit % must be included, for example, **'10%'**.|
+
+## Degree<sup>10+</sup>
+
+The **Degree** type is used to represent a length in deg.
+
+| Type                   | Description                                    |
+| --------------------- | -------------------------------------- |
+| {number}deg               | Degree type. The unit deg must be included, for example, **'10deg'**.|

en/application-dev/reference/arkui-ts/ts-universal-attributes-background.md

 # Background
 
-You can set the background of a component.
+You can set the background for a component.
 
 >  **NOTE**
 >
@@ -11,12 +11,22 @@ You can set the background of a component.
 | Name| Type| Description|
 | -------- | -------- | -------- |
 | backgroundColor | [ResourceColor](ts-types.md#resourcecolor) | Background color of the component.<br>Since API version 9, this API is supported in ArkTS widgets.|
-| backgroundImage | src: [ResourceStr](ts-types.md#resourcestr),<br>repeat?: [ImageRepeat](ts-appendix-enums.md#imagerepeat) | **src**: image address, which can be the address of an Internet or a local image or a Base64 encoded image. SVG images are not supported.<br>**repeat**: whether the background image is repeatedly used. By default, the background image is not repeatedly used. If the set image has a transparent background and **backgroundColor** is set, the image is overlaid on the background color.<br>Since API version 9, this API is supported in ArkTS widgets.|
+| backgroundImage | src: [ResourceStr](ts-types.md#resourcestr),<br>repeat?: [ImageRepeat](ts-appendix-enums.md#imagerepeat) | **src**: image address, which can be the address of an Internet or a local image or a Base64 encoded image. SVG images are not supported.<br>**repeat**: whether the background image is repeated. By default, the background image is not repeated. If the set image has a transparent background and **backgroundColor** is set, the image is overlaid on the background color.<br>Since API version 9, this API is supported in ArkTS widgets.|
 | backgroundImageSize | {<br>width?: [Length](ts-types.md#length),<br>height?: [Length](ts-types.md#length)<br>} \| [ImageSize](ts-appendix-enums.md#imagesize) | Width and height of the background image. If the input is a **{width: Length, height: Length}** object and only one attribute is set, the other attribute is the set value multiplied by the original aspect ratio of the image. By default, the original image aspect ratio remains unchanged.<br>The value range of **width** and **height** is [0, +∞).<br>Default value: **ImageSize.Auto**<br>Since API version 9, this API is supported in ArkTS widgets.<br>**NOTE**<br>A value less than 0 evaluates to the value **0**. If **height** is set but **width** is not, the image width is adjusted based on the original aspect ratio of the image.|
 | backgroundImagePosition | [Position](ts-types.md#position8) \| [Alignment](ts-appendix-enums.md#alignment) | Position of the background image in the component, that is, the coordinates relative to the upper left corner of the component.<br>Default value:<br>{<br>x: 0,<br>y: 0<br>} <br> When **x** and **y** are set in percentage, the offset is calculated based on the width and height of the component.<br>Since API version 9, this API is supported in ArkTS widgets.|
+| backgroundBlurStyle<sup>9+</sup> | value:[BlurStyle](ts-appendix-enums.md#blurstyle9),<br>options<sup>10+</sup>?:[BackgroundBlurStyleOptions](#backgroundblurstyleoptions10) | Background blur style applied between the content and the background.<br>**value**: settings of the background blur style, including the blur radius, mask color, mask opacity, and saturation.<br>**options**: background blur options. Optional.<br>This API is supported in ArkTS widgets.|
+
+## BackgroundBlurStyleOptions<sup>10+</sup>
+
+| Name                       | Type                                               | Mandatory| Description                                                        |
+| --------------------------- | ------------------------------------------------------- | ---- | ------------------------------------------------------------ |
+| colorMode<sup>10+</sup>     | [ThemeColorMode](ts-appendix-enums.md#themecolormode10) | No  | Color mode used for the background blur.<br>Default value: **ThemeColorMode.System**|
+| adaptiveColor<sup>10+</sup> | [AdaptiveColor](ts-appendix-enums.md#adaptivecolor10)   | No  | Adaptive color mode.<br>Default value: **AdaptiveColor.Default**|
 
 ## Example
 
+### Example 1
+
 ```ts
 // xxx.ets
 @Entry
@@ -84,3 +94,30 @@ struct BackgroundExample {
 ```
 
 ![en-us_image_0000001211898502](figures/en-us_image_0000001211898502.png)
+
+### Example 2
+
+```ts
+// xxx.ets
+@Entry
+@Component
+struct BackgroundBlurStyleDemo {
+  build() {
+    Column() {
+      Row() {
+        Text("Thin Material")
+      }
+      .width('50%')
+      .height('50%')
+      .backgroundBlurStyle(BlurStyle.Thin, { colorMode: ThemeColorMode.LIGHT, adaptiveColor: AdaptiveColor.DEFAULT })
+      .position({ x: '15%', y: '30%' })
+    }
+    .height('100%')
+    .width('100%')
+    .backgroundImage($r('app.media.bg'))
+    .backgroundImageSize(ImageSize.Cover)
+  }
+}
+```
+
+![en-us_image_background_blur_style](figures/en-us_image_background_blur_style.png)

en/application-dev/reference/arkui-ts/ts-universal-attributes-backgroundBlurStyle.md

-# Background Blur
-
-You can apply background blur effects to a component.
-
->  **NOTE**
-> 
->  The APIs of this module are supported since API version 9. Updates will be marked with a superscript to indicate their earliest API version.
->
->  The APIs provided by this module are system APIs.
-
-## Attributes
-
-| Name                 | Parameter                    | Description                    |
-| -------------------- | ----------------------- | ------------------------ |
-| backgroundBlurStyle  | value:[BlurStyle](ts-appendix-enums.md#blurstyle9),<br>options<sup>10+</sup>?:[BackgroundBlurStyleOptions](#backgroundblurstyleoptions10) | Background blur style applied between the content and the background.<br>**value**: settings of the background blur style, including the blur radius, mask color, mask opacity, and saturation.<br>**options**: background blur options. This parameter is optional.<br>This API is supported in ArkTS widgets.|
- 
-## BackgroundBlurStyleOptions<sup>10+</sup>
-
-| Name| Type| Mandatory| Description|
-| ----------- | ------| ------ | ------ |
-| colorMode<sup>10+</sup> | [ThemeColorMode](ts-appendix-enums.md#themecolormode10) | No| Color mode used for the background blur.<br>Default value: **ThemeColorMode.System**|
-| adaptiveColor<sup>10+</sup> | [AdaptiveColor](ts-appendix-enums.md#adaptivecolor10) | No| Adaptive color mode.<br>Default value: **AdaptiveColor.Default**|
-
-## Example
-
-```ts
-// xxx.ets
-@Entry
-@Component
-struct BackgroundBlurStyleDemo {
-  build() {
-    Column() {
-      Row() {
-        Text("Thin Material")
-      }
-      .width('50%')
-      .height('50%')
-      .backgroundBlurStyle(BlurStyle.Thin, { colorMode: ThemeColorMode.Light, adaptiveColor: AdaptiveColor.Default })
-      .position({ x: '15%', y: '30%' })
-    }
-    .height('100%')
-    .width('100%')
-    .backgroundImage($r('app.media.bg'))
-    .backgroundImageSize(ImageSize.Cover)
-  }
-}
-```
-![en-us_image_background_blur_style](figures/en-us_image_background_blur_style.png)

en/application-dev/reference/arkui-ts/ts-universal-attributes-flex-layout.md

@@ -14,6 +14,7 @@
 | flexGrow   | number                                      | Percentage of the parent container's remaining space that is allocated to the component.<br>Default value: **0**<br>Since API version 9, this API is supported in ArkTS widgets.|
 | flexShrink | number                                      | Percentage of the parent container's shrink size that is allocated to the component.<br>When the parent container is **\<Row>** or **\<Column>**, the default value is **0**.<br> When the parent container is **\<Flex>**, the default value is **1**.<br>Since API version 9, this API is supported in ArkTS widgets.|
 | alignSelf  | [ItemAlign](ts-appendix-enums.md#itemalign) | Alignment mode of the child components along the cross axis of the parent container. The setting overwrites the **alignItems** setting of the parent container (**\<Flex>**, **\<Column>**, **\<Row>**, or **\<GridRow>**).<br>**\<GridCol>** can have the **alignsSelf** attribute bound to change its own layout along the cross axis.<br>Default value: **ItemAlign.Auto**<br>Since API version 9, this API is supported in ArkTS widgets.|
+| layoutWeight   | number \| string                                   | Weight of the component during layout. When the container size is determined, the container space is allocated along the main axis among the component and sibling components based on the layout weight, and the component size setting is ignored.<br>Default value: **0**<br>Since API version 9, this API is supported in ArkTS widgets.<br>**NOTE**<br>This attribute is valid only for the **\<Row>**, **\<Column>**, and **\<Flex>** layouts.<br>The value can be a number greater than or equal to 0 or a string that can be converted to a number.|
 
 
 ## Example

en/application-dev/reference/arkui-ts/ts-universal-attributes-lightUpEffect.md

-# Light Up Effect
-
-You can apply a light up effect to a component.
-
->  **NOTE**
->
->  This attribute is supported since API Version 10. Updates will be marked with a superscript to indicate their earliest API version. This is a system API.
-
-## Attributes
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| lightUpEffect | [number] | Light up degree of the component.<br>The value ranges from 0 to 1.<br>If the value is 0, the component is dark. If the value is 1, the component is fully illuminated. Between 0 and 1, a greater value indicates higher luminance. A value less than 0 evaluates to the value **0**. A value greater than 1 evaluates to the value **1**.|
-
-## Example
-
-### Example 1
-```ts
-// xxx.ets
-@Entry
-@Component
-struct LightUpExample {
-  build() {
-    Stack() {
-      Text('This is the text content with letterSpacing 0.')
-        .letterSpacing(0)
-        .fontSize(12)
-        .border({ width: 1 })
-        .padding(10)
-        .width('50%')
-        .lightUpEffect(0.6)
-    }.alignContent(Alignment.Center).width("100%").height("100%")
-  }
-}
-
-```
-Below is how the component looks with **lightUpEffect** set to **0.6**:
-
-![textLightUp3](figures/textLightUp3.png)
-
-Below is how the component looks with **lightUpEffect** set to **0.2**:
-
-![textLightUp2](figures/textLightUp2.png)
-
-Below is how the component looks without the light up effect applied:
-
-![textLightUp1](figures/textLightUp1.png)
-### Example 2
-
-```ts
-// xxx.ets
-@Entry
-@Component
-struct LightUpExample {
-  @State isLunar: boolean = false
-  private selectedDate: Date = new Date('2028-08-08')
-  build() {
-    Stack() {
-      DatePicker({
-        start: new Date('1970-1-1'),
-        end: new Date('2100-1-1'),
-        selected: this.selectedDate
-      })
-        .lunar(this.isLunar)
-        .onChange((value: DatePickerResult) => {
-          this.selectedDate.setFullYear(value.year, value.month, value.day)
-          console.info('select current date is: ' + JSON.stringify(value))
-        })
-        .lightUpEffect(0.6)
-
-    }.alignContent(Alignment.Center).width("100%").height("100%")
-  }
-}
-```
-
-![datePickerLightUp2](figures/datePickerLightUp2.png)
-
-Below is how the component looks without the light up effect applied:
-
-![datePickerLightUp1](figures/datePickerLightUp1.png)

en/application-dev/reference/arkui-ts/ts-universal-attributes-pixelStretchEffect.md

-# Pixel Stretch Effect
-
-You can apply a pixel stretch effect to a component.
-
->  **NOTE**
->
->  This attribute is supported since API Version 10. Updates will be marked with a superscript to indicate their earliest API version. This is a system API.
-
-## Attributes
-
-| Name| Type| Description|
-| -------- | -------- | -------- |
-| pixelStretchEffect | [PixelStretchEffectOptions](ts-types.md#pixelstretcheffectoptions10) | Pixel stretch effect options.<br>The **options** parameter includes the length by which a pixel is stretched toward the four edges.<br>**NOTE**<br>1. If the length is a positive value, the original image is stretched, and the image size increases. The edge pixels grow by the set length toward the top, bottom, left, and right edges.<br>2. If the length is a negative value, the original image shrinks as follows, but the image size remains unchanged:<br> (1) The image shrinks from the four edges by the absolute value of length set through **options**. (2) The image is stretched back to the original size with edge pixels.<br>3. Constraints on **options**:<br>(1) The length values for the four edges must be all postive or all negative. That is, the four edges are stretched or shrink at the same time in the same direction. 2. The length values must all be a percentage or a specific value. Combined use of the percentage and specific value is not allowed. 3. If the input value is invalid, the image is displayed as {0, 0, 0, 0}, that is, the image is the same as the original image.|
-
-## Example
-
-### Example 1
-
-```ts
-// xxx.ets
-@Entry
-@Component
-struct PixelStretchExample {
-  build() {
-    Stack() {
-      Text('This is the text content with letterSpacing 0.')
-        .letterSpacing(0)
-        .fontSize(12)
-        .border({ width: 1 })
-        .padding(10)
-        .width('50%')
-        .pixelStretchEffect({top:10,left:10,right:10,bottom:10 })
-    }.alignContent(Alignment.Center).width("100%").height("100%")
-  }
-}
-
-```
-Below is how the component looks with the pixel stretch effect applied:
-
-![textPixelStretch1](figures/textPixelStretch1.png)
-
-Below is how the component looks without the pixel stretch effect applied:
-
-![textPixelStretch2](figures/textPixelStretch2.png)
-
-A comparison of the preceding two figures shows that, if the length values are positive, the original image is stretched.
-
-### Example 2
-
-Based on Example 1, change the length values of the pixel stretch effect to negative:
-
-```ts
-// xxx.ets
-@Entry
-@Component
-struct PixelStretchExample {
-  build() {
-    Stack() {
-      Text('This is the text content with letterSpacing 0.')
-        .letterSpacing(0)
-        .fontSize(12)
-        .border({ width: 1 })
-        .padding(10)
-        .width('50%')
-        .pixelStretchEffect({top:-10,left:-10,right:-10,bottom:-10 })
-    }.alignContent(Alignment.Center).width("100%").height("100%")
-  }
-}
-```
-Below is how the component looks:
-
-![textPixelStretch3](figures/textPixelStretch3.png)
-
-Compared with the original image, the effect drawing is implemented in two steps:
-
-1. The image size is reduced. The resultant size is the originial image size minus the lengths by which the pixels shrink. For example, if the original image size is 100 x 100 and **pixelStretchEffect({top:-10,left:-10,right:-10,bottom:-10})** is set, the resultant size is (100-10-10) x (100-10-10), that is, 8080. 
-
-2. Edge pixels are stretched to restore the image to its original size.
\ No newline at end of file

en/application-dev/reference/arkui-ts/ts-universal-attributes-popup.md

@@ -29,6 +29,8 @@ You can bind a popup to a component, specifying its content, interaction logic,
 | messageOptions<sup>10+</sup>          | [PopupMessageOptions](#popupmessageoptions10)                | No  | Parameters of the popup message.                                      |
 | targetSpace<sup>10+</sup>             | [Length](ts-types.md#length)                                 | No  | Space between the popup and the target.                                     |
 | placement<sup>10+</sup>               | [Placement](ts-appendix-enums.md#placement8)                 | No  | Position of the popup relative to the target. The default value is **Placement.Bottom**.<br>If both **placementOnTop** and **placement** are set, the latter prevails.|
+| offset<sup>10+</sup>                  | [Position](ts-types.md#position8)                            | No  | Offset of the popup relative to the display position specified by **placement**.          |
+| enableArrow<sup>10+</sup>             | boolean | No  | Whether to display the arrow.<br>Default value: **true**|
 
 ## PopupMessageOptions<sup>10+</sup>
 
@@ -40,7 +42,7 @@ You can bind a popup to a component, specifying its content, interaction logic,
 
 | Name                          | Type                                      | Mandatory  | Description                                      |
 | ---------------------------- | ---------------------------------------- | ---- | ---------------------------------------- |
-| builder                      | [CustomBuilder](ts-types.md#custombuilder8) | Yes   | Popup builder.                             |
+| builder                      | [CustomBuilder](ts-types.md#custombuilder8) | Yes   | Popup builder.<br>**NOTE**<br>The **popup** attribute is a universal attribute. A custom popup does not support display of another popup. The **position** attribute cannot be used for the first-layer container under the builder. If the **position** attribute is used, the popup will not be displayed.                             |
 | placement                    | [Placement](ts-appendix-enums.md#placement8) | No   | Preferred position of the popup. If the set position is insufficient for holding the popup, it will be automatically adjusted.<br>Default value: **Placement.Bottom**|
 | popupColor                   | [ResourceColor](ts-types.md#resourcecolor) | No   | Color of the popup.                                |
 | enableArrow                  | boolean                                  | No   | Whether to display an arrow.<br>Since API version 9, if the position set for the popup is not large enough, the arrow will not be displayed. For example, if **placement** is set to **Left**, but the popup height (80 vp) is less than the sum of the arrow width (32 vp) and diameter of popup rounded corner (48 vp), the arrow will not be displayed.<br>Default value: **true**|
@@ -48,8 +50,10 @@ You can bind a popup to a component, specifying its content, interaction logic,
 | onStateChange                | (event: { isVisible: boolean }) =&gt; void | No   | Callback for the popup status change event.<br/>**isVisible**: whether the popup is visible.           |
 | arrowOffset<sup>9+</sup>     | [Length](ts-types.md#length)             | No   | Offset of the popup arrow relative to the popup.<br/>When the arrow is at the top or bottom of the popup: The value **0** indicates that the arrow is located on the leftmost, and any other value indicates the distance from the arrow to the leftmost; the arrow is centered by default.<br/>When the arrow is on the left or right side of the popup: The value indicates the distance from the arrow to the top; the arrow is centered by default.<br/>When the popup is displayed on either edge of the screen, it will automatically deviate leftward or rightward to stay within the safe area. When the value is **0**, the arrow always points to the bound component. |
 | showInSubWindow<sup>9+</sup> | boolean                                  | No   | Whether to show the popup in the subwindow. The default value is **false**.                   |
+| maskColor<sup>(deprecated)</sup> | [ResourceColor](ts-types.md#resourcecolor)   | No  | Color of the popup mask.<br>**NOTE**<br>This parameter is deprecated since API version 10. You are advised to use **mask** instead.|
 | mask<sup>10+</sup>           | boolean \| [ResourceColor](ts-types.md#resourcecolor) | No   | Whether to apply a mask to the popup. The value **true** means to apply a transparent mask to the popup, **false** means not to apply a mask to the popup, and a color value means to apply a mask in the corresponding color to the popup.|
 | targetSpace<sup>10+</sup>    | [Length](ts-types.md#length)             | No   | Space between the popup and the target.                          |
+| offset<sup>10+</sup>         | [Position](ts-types.md#position8)                            | No  | Offset of the popup relative to the display position specified by placement.|
 
 ## Example
 ```ts
@@ -112,7 +116,7 @@ struct PopupExample {
         .bindPopup(this.customPopup, {
           builder: this.popupBuilder,
           placement: Placement.Top,
-          maskColor: '0x33000000',
+          mask: {color:'0x33000000'},
           popupColor: Color.Yellow,
           enableArrow: true,
           showInSubWindow: false,