diff --git a/OAT.xml b/OAT.xml index d3349264b4fafeb5f57c55b20c1f54d61fcbe1a6..c84e1b4df3bdb1005b4c8912e0cc70055b57bd6d 100644 --- a/OAT.xml +++ b/OAT.xml @@ -63,7 +63,7 @@ - + diff --git a/en/application-dev/reference/arkui-js/js-components-common-events.md b/en/application-dev/reference/arkui-js/js-components-common-events.md index 8c181ceae24a5c35d72a16494bea5064c6f35531..85add526686aabc72fea09fe65629b89f916d8b5 100644 --- a/en/application-dev/reference/arkui-js/js-components-common-events.md +++ b/en/application-dev/reference/arkui-js/js-components-common-events.md @@ -165,7 +165,7 @@ Different from private events, universal events can be bound to most components.

DragEvent

-

Tiggered when dragging is ended.

+

Triggered when dragging is ended.

No

diff --git a/en/application-dev/reference/arkui-js/js-components-common-styles.md b/en/application-dev/reference/arkui-js/js-components-common-styles.md index 979847ff3472e782bab5d14f74278c35299bf5fc..3d8101ef286e7a4dc9d0ad607da1a3e4b5ce2a61 100644 --- a/en/application-dev/reference/arkui-js/js-components-common-styles.md +++ b/en/application-dev/reference/arkui-js/js-components-common-styles.md @@ -466,7 +466,7 @@ You can set component appearance in the **style** attribute or **.css** file

-

start | end must be used together with position to determine the offset of an element.

- +

z-index6+

diff --git a/en/application-dev/reference/arkui-js/js-framework-resource-restriction.md b/en/application-dev/reference/arkui-js/js-framework-resource-restriction.md index 8a2f1001e980397f95ff0bc5f4047b035125fbf4..8f4f462085a030629286e0289e819ba191409bd6 100644 --- a/en/application-dev/reference/arkui-js/js-framework-resource-restriction.md +++ b/en/application-dev/reference/arkui-js/js-framework-resource-restriction.md @@ -124,5 +124,5 @@ resources/res-defaults.json: ``` >![](../../public_sys-resources/icon-note.gif) **NOTE:** ->The resource qualifer file does not support color enumeration. +>The resource qualifier file does not support color enumeration. diff --git a/en/application-dev/reference/arkui-ts/ts-component-states-prop.md b/en/application-dev/reference/arkui-ts/ts-component-states-prop.md index f73b3437be3ea8d1236b79837d8973b9814ea9d3..84244e6076494bf15ba2ee13ddacb7a4cf636a33 100644 --- a/en/application-dev/reference/arkui-ts/ts-component-states-prop.md +++ b/en/application-dev/reference/arkui-ts/ts-component-states-prop.md @@ -32,7 +32,7 @@ struct ParentComponent { // when creatng ChildComponent, the initial value of its @Prop variable must be supplied // in a named constructor parameter - // also regular costOfOneAttempt (non-Prop) variable is initialied + // also regular costOfOneAttempt (non-Prop) variable is initialized CountDownComponent({ count: this.countDownStartValue, costOfOneAttempt: 2}) } } diff --git a/en/application-dev/reference/arkui-ts/ts-custom-component-initialization.md b/en/application-dev/reference/arkui-ts/ts-custom-component-initialization.md index f73c7ec596380cc9929c88a462d76ea4f8566951..da5931159c97ec5a5eeb28c798266f389059c225 100644 --- a/en/application-dev/reference/arkui-ts/ts-custom-component-initialization.md +++ b/en/application-dev/reference/arkui-ts/ts-custom-component-initialization.md @@ -218,7 +218,7 @@ struct CompA { Row() { CompB({bLink: $aLink, // valid init a @Link with reference of another @Link, bProp: this.aState}) // valid init a @Prop with value of a @State - CompB({aLink: $aState, // invalid: type missmatch expected ref to ClassA, provided reference to boolean + CompB({aLink: $aState, // invalid: type mismatch expected ref to ClassA, provided reference to boolean bProp: false}) // valid init a @Prop by constants value } } diff --git a/en/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md b/en/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md index 027f0115ea1864fa74266aeca9202a9fd8bf396b..c5f2d174752f660e81199acc49ba9650550912e0 100644 --- a/en/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md +++ b/en/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md @@ -8,7 +8,7 @@ None ## APIs -ellipse\(options?: \{width: Lenght, height: Length\}\) +ellipse\(options?: \{width: Length, height: Length\}\) - Parameters diff --git a/en/application-dev/reference/arkui-ts/ts-drawing-components-line.md b/en/application-dev/reference/arkui-ts/ts-drawing-components-line.md index 3952cbb4c2f22f9e0232bf3151c9c6864aa42b97..03fae2dad61dced71ac488f8fe77bc44b39de2ca 100644 --- a/en/application-dev/reference/arkui-ts/ts-drawing-components-line.md +++ b/en/application-dev/reference/arkui-ts/ts-drawing-components-line.md @@ -8,7 +8,7 @@ None ## APIs -Line\(options?: \{width: Lenght, height: Length\}\) +Line\(options?: \{width: Length, height: Length\}\) - Parameters diff --git a/en/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md b/en/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md index 9ec752513aeace9bfa09b9bef7735fcfbe92e767..d7a5b0cd53a8bf5eaf304b8ed6e17ec0ecb1b0ef 100644 --- a/en/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md +++ b/en/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md @@ -8,7 +8,7 @@ None ## APIs -Polygon\(value:\{options?: \{width: Lenght, height: Length\}\}\) +Polygon\(value:\{options?: \{width: Length, height: Length\}\}\) - Parameters diff --git a/en/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md b/en/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md index f0f2c07764c451749caefc637bef5498cb3cb339..1f0a60df04624328888b1f14693f1132c5fdaadf 100644 --- a/en/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md +++ b/en/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md @@ -8,7 +8,7 @@ None ## APIs -Polyline\(options?: \{width: Lenght, height: Length\}\) +Polyline\(options?: \{width: Length, height: Length\}\) - Parameters diff --git a/en/application-dev/reference/arkui-ts/ts-restrictions-for-generators.md b/en/application-dev/reference/arkui-ts/ts-restrictions-for-generators.md index 3ccd5629b9268486f2182892164a0fa858eed2c2..eb4392ba884da2d18dba7781dfdfd31f005f8336 100644 --- a/en/application-dev/reference/arkui-ts/ts-restrictions-for-generators.md +++ b/en/application-dev/reference/arkui-ts/ts-restrictions-for-generators.md @@ -17,7 +17,7 @@ build() { console.log(`a: ${a}`) // invalid: console.log only allowed in first line of build Column() { Text('Hello ${this.myName.toUpperCase()}') // ok. - ForEach(this.arr.reverse(), ..., ...) // invalid: Array.reverse modifies the @State array varible in place + ForEach(this.arr.reverse(), ..., ...) // invalid: Array.reverse modifies the @State array variable in place } buildSpecial() // invalid: no function calls Text(this.calcTextValue()) // this function call is ok. diff --git a/en/application-dev/reference/arkui-ts/ts-universal-attributes-size.md b/en/application-dev/reference/arkui-ts/ts-universal-attributes-size.md index d48dfcede4cbe04f70f9c911605e5f8ac2e3ce68..74b58e40645efc6af9cdcc881928a341fb902128 100644 --- a/en/application-dev/reference/arkui-ts/ts-universal-attributes-size.md +++ b/en/application-dev/reference/arkui-ts/ts-universal-attributes-size.md @@ -80,7 +80,7 @@ This topic describes the attributes used to set the component size.

minWidth?: Length,

maxWidth?: Length,

minHeight?: Length,

-

maxHeight?: Lenght

+

maxHeight?: Length

}

{

diff --git a/en/contribute/OpenHarmony-c-coding-style-guide.md b/en/contribute/OpenHarmony-c-coding-style-guide.md index 6231319194293ad1bfdf9dfd6d51affe408889a1..b75448dba5ec529d326259f723581ded0dcf1ba7 100755 --- a/en/contribute/OpenHarmony-c-coding-style-guide.md +++ b/en/contribute/OpenHarmony-c-coding-style-guide.md @@ -657,7 +657,7 @@ int c[][8] = { Note: -- If the left brace is placed at the end of the line, the corresponding right brace shoud be placed into a new line. +- If the left brace is placed at the end of the line, the corresponding right brace should be placed into a new line. - If the left brace is followed by the content, the corresponding right brace should also follow the content. ### Rule 2.11 When struct and union members are initialized, each member is initialized on a separate line. diff --git a/en/contribute/OpenHarmony-cpp-coding-style-guide.md b/en/contribute/OpenHarmony-cpp-coding-style-guide.md index 8a7ecbad0ca50c514f6b14380fca47613f505468..a95ae1b7c83951dbb46794038d7276ee57317e2f 100755 --- a/en/contribute/OpenHarmony-cpp-coding-style-guide.md +++ b/en/contribute/OpenHarmony-cpp-coding-style-guide.md @@ -2125,12 +2125,12 @@ class LockGuard { public: LockGuard(const LockType& lockType): lock_(lockType) { - lock_.Aquire(); + lock_.Acquire(); } ~LockGuard() { - lock_.Relase(); + lock_.Release(); } private: diff --git a/zh-cn/device-dev/kernel/kernel-small-debug-trace.md b/zh-cn/device-dev/kernel/kernel-small-debug-trace.md index a778ba504217ee87f1473ab5eb88a0564098b02a..072048df1001ac80e36ea3080d5829b40ddb2899 100644 --- a/zh-cn/device-dev/kernel/kernel-small-debug-trace.md +++ b/zh-cn/device-dev/kernel/kernel-small-debug-trace.md @@ -238,7 +238,7 @@ LOS_TraceHwiFilterHookReg(Example_HwiNumFilter); | LOSCFG_RECORDER_MODE_ONLINE | Trace work mode ->Online mode | Trace工作模式为在线模式 | YES/NO | | LOSCFG_TRACE_CLIENT_INTERACT | Enable Trace Client Visualization and Control | 使能与Trace IDE （dev tools）的交互，包括数据可视化和流程控制 | YES/NO | | LOSCFG_TRACE_FRAME_CORE_MSG | Enable Record more extended content ->Record cpuid, hardware interrupt status, task lock status | 记录CPUID、中断状态、锁任务状态 | YES/NO | -| LOSCFG_TRACE_FRAME_EVENT_COUNT | Enable Record more extended content ->Record event count, which indicate the sequence of happend events | 记录事件的次序编号 | YES/NO | +| LOSCFG_TRACE_FRAME_EVENT_COUNT | Enable Record more extended content ->Record event count, which indicate the sequence of happened events | 记录事件的次序编号 | YES/NO | | LOSCFG_TRACE_FRAME_MAX_PARAMS | Record max params | 配置记录事件的最大参数个数 | INT | | LOSCFG_TRACE_BUFFER_SIZE | Trace record buffer size | 配置Trace的缓冲区大小 | INT | diff --git "a/zh-cn/readme/\345\233\276\345\275\242\345\255\220\347\263\273\347\273\237.md" "b/zh-cn/readme/\345\233\276\345\275\242\345\255\220\347\263\273\347\273\237.md" index 6eb6a562b49d038e7493a58aec567df242916902..9e2c6040e91c245b637479d7ee7361b7e448fca2 100644 --- "a/zh-cn/readme/\345\233\276\345\275\242\345\255\220\347\263\273\347\273\237.md" +++ "b/zh-cn/readme/\345\233\276\345\275\242\345\255\220\347\263\273\347\273\237.md" @@ -114,7 +114,7 @@ graphic\_utils 提供多窗口能力 -- Input Manger +- Input Manager 多模输入模块，负责接收事件输