Skip to content

Commit 7d13e3f

Browse files
committed
Merge branch 'bugfix/docs_prs_from_github' into 'master'
Small documenation and API fixes from GitHub See merge request idf/esp-idf!1952
2 parents 22ae5ad + 37b98f7 commit 7d13e3f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ static void btc_gattc_prepare_write_char_descr(btc_ble_gattc_args_t *arg)
631631
arg->prep_write_descr.auth_req);
632632
}
633633

634-
static void btc_gattc_execute_wrtie(btc_ble_gattc_args_t *arg)
634+
static void btc_gattc_execute_write(btc_ble_gattc_args_t *arg)
635635
{
636636
BTA_GATTC_ExecuteWrite(arg->exec_write.conn_id, arg->exec_write.is_execute);
637637
}
@@ -711,7 +711,7 @@ void btc_gattc_call_handler(btc_msg_t *msg)
711711
btc_gattc_prepare_write_char_descr(arg);
712712
break;
713713
case BTC_GATTC_ACT_EXECUTE_WRITE:
714-
btc_gattc_execute_wrtie(arg);
714+
btc_gattc_execute_write(arg);
715715
break;
716716
case BTC_GATTC_ACT_REG_FOR_NOTIFY:
717717
btc_gattc_reg_for_notify(arg);

docs/api-guides/romconsole.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Expressions, Math
4444
Control
4545
-------
4646

47-
- IF expression THEN statement - *perform statement if expression is true*
47+
- IF expression statement - *perform statement if expression is true*
4848
- FOR variable = start TO end - *start for block*
4949
- FOR variable = start TO end STEP value - *start for block with step*
5050
- NEXT - *end of for block*

docs/get-started/index-cn.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ ESP-IDF 将会被下载到 ``~/esp/esp-idf``。
142142
:example:`get-started/hello_world` 拷贝到 ``~/esp`` 目录: ::
143143

144144
cd ~/esp
145-
cp -r $IDF_PATH/examples/get-started/hello_world
145+
cp -r $IDF_PATH/examples/get-started/hello_world .
146146

147147
ESP-IDF 的 :idf:`examples` 目录下有一系列示例工程,都可以按照上面的方法进行创建。
148148

0 commit comments

Comments
 (0)