diff --git a/docs/en/12-taos-sql/20-keywords.md b/docs/en/12-taos-sql/20-keywords.md
index d7b9c73c4fa8b4409d95ac3aed5f35452c116e3d..f7eb067c960cd9599153a208cd2781b49b090511 100644
--- a/docs/en/12-taos-sql/20-keywords.md
+++ b/docs/en/12-taos-sql/20-keywords.md
@@ -5,7 +5,9 @@ title: Reserved Keywords
 
 ## Keyword List
 
-There are about 200 keywords reserved by TDengine, they can't be used as the name of database, STable or table with either upper case, lower case or mixed case. The following list shows all reserved keywords:
+There are more than 200 keywords reserved by TDengine, they can't be used as the name of database, table, STable, subtable, column or tag with either upper case, lower case or mixed case. If you need to use these keywords, use the symbol `` ` `` to enclose the keywords, e.g. \`ADD\`.
+
+The following list shows all reserved keywords:
 
 ### A
 
@@ -14,15 +16,20 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 - ACCOUNTS
 - ADD
 - AFTER
+- AGGREGATE
 - ALL
 - ALTER
+- ANALYZE
 - AND
+- APPS
 - AS
 - ASC
+- AT_ONCE
 - ATTACH
 
 ### B
 
+- BALANCE
 - BEFORE
 - BEGIN
 - BETWEEN
@@ -32,19 +39,27 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 - BITNOT
 - BITOR
 - BLOCKS
+- BNODE
+- BNODES
 - BOOL
+- BUFFER
+- BUFSIZE
 - BY
 
 ### C
 
 - CACHE
-- CACHELAST
+- CACHEMODEL
+- CACHESIZE
 - CASCADE
+- CAST
 - CHANGE
+- CLIENT_VERSION
 - CLUSTER
 - COLON
 - COLUMN
 - COMMA
+- COMMENT
 - COMP
 - COMPACT
 - CONCAT
@@ -52,15 +67,18 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 - CONNECTION
 - CONNECTIONS
 - CONNS
+- CONSUMER
+- CONSUMERS
+- CONTAINS
 - COPY
+- COUNT
 - CREATE
-- CTIME
+- CURRENT_USER
 
 ### D
 
 - DATABASE
 - DATABASES
-- DAYS
 - DBS
 - DEFERRED
 - DELETE
@@ -69,18 +87,23 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 - DESCRIBE
 - DETACH
 - DISTINCT
+- DISTRIBUTED
 - DIVIDE
 - DNODE
 - DNODES
 - DOT
 - DOUBLE
 - DROP
+- DURATION
 
 ### E
 
+- EACH
+- ENABLE
 - END
-- EQ
+- EVERY
 - EXISTS
+- EXPIRED
 - EXPLAIN
 
 ### F
@@ -88,18 +111,20 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 - FAIL
 - FILE
 - FILL
+- FIRST
 - FLOAT
+- FLUSH
 - FOR
 - FROM
-- FSYNC
+- FUNCTION
+- FUNCTIONS
 
 ### G
 
-- GE
 - GLOB
+- GRANT
 - GRANTS
 - GROUP
-- GT
 
 ### H
 
@@ -110,15 +135,18 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 - ID
 - IF
 - IGNORE
-- IMMEDIA
+- IMMEDIATE
 - IMPORT
 - IN
-- INITIAL
+- INDEX
+- INDEXES
+- INITIALLY
+- INNER
 - INSERT
 - INSTEAD
 - INT
 - INTEGER
-- INTERVA
+- INTERVAL
 - INTO
 - IS
 - ISNULL
@@ -126,6 +154,7 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 ### J
 
 - JOIN
+- JSON
 
 ### K
 
@@ -135,46 +164,57 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 
 ### L
 
-- LE
+- LAST
+- LAST_ROW
+- LICENCES
 - LIKE
 - LIMIT
 - LINEAR
 - LOCAL
-- LP
-- LSHIFT
-- LT
 
 ### M
 
 - MATCH
+- MAX_DELAY
 - MAXROWS
+- MERGE
+- META
 - MINROWS
 - MINUS
+- MNODE
 - MNODES
 - MODIFY
 - MODULES
 
 ### N
 
-- NE
+- NCHAR
+- NEXT
+- NMATCH
 - NONE
 - NOT
 - NOTNULL
 - NOW
 - NULL
+- NULLS
 
 ### O
 
 - OF
 - OFFSET
+- ON
 - OR
 - ORDER
+- OUTPUTTYPE
 
 ### P
 
-- PARTITION
+- PAGES
+- PAGESIZE
+- PARTITIONS
 - PASS
 - PLUS
+- PORT
 - PPS
 - PRECISION
 - PREV
@@ -182,47 +222,63 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 
 ### Q
 
+- QNODE
+- QNODES
 - QTIME
-- QUERIE
+- QUERIES
 - QUERY
-- QUORUM
 
 ### R
 
 - RAISE
-- REM
+- RANGE
+- RATIO
+- READ
+- REDISTRIBUTE
+- RENAME
 - REPLACE
 - REPLICA
 - RESET
-- RESTRIC
+- RESTRICT
+- RETENTIONS
+- REVOKE
+- ROLLUP
 - ROW
-- RP
-- RSHIFT
 
 ### S
 
+- SCHEMALESS
 - SCORES
 - SELECT
 - SEMI
+- SERVER_STATUS
+- SERVER_VERSION
 - SESSION
 - SET
 - SHOW
-- SLASH
+- SINGLE_STABLE
 - SLIDING
 - SLIMIT
-- SMALLIN
+- SMA
+- SMALLINT
+- SNODE
+- SNODES
 - SOFFSET
-- STable
-- STableS
+- SPLIT
+- STABLE
+- STABLES
 - STAR
 - STATE
-- STATEMEN
-- STATE_WI
+- STATE_WINDOW
+- STATEMENT
 - STORAGE
 - STREAM
 - STREAMS
+- STRICT
 - STRING
+- SUBSCRIPTIONS
 - SYNCDB
+- SYSINFO
 
 ### T
 
@@ -233,20 +289,24 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 - TBNAME
 - TIMES
 - TIMESTAMP
+- TIMEZONE
 - TINYINT
+- TO
+- TODAY
 - TOPIC
 - TOPICS
+- TRANSACTION
+- TRANSACTIONS
 - TRIGGER
+- TRIM
 - TSERIES
 - TTL
 
 ### U
 
-- UMINUS
 - UNION
 - UNSIGNED
 - UPDATE
-- UPLUS
 - USE
 - USER
 - USERS
@@ -256,8 +316,11 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 
 - VALUE
 - VALUES
+- VARCHAR
 - VARIABLE
 - VARIABLES
+- VERBOSE
+- VGROUP
 - VGROUPS
 - VIEW
 - VNODES
@@ -265,14 +328,25 @@ There are about 200 keywords reserved by TDengine, they can't be used as the nam
 ### W
 
 - WAL
+- WAL_FSYNC_PERIOD
+- WAL_LEVEL
+- WAL_RETENTION_PERIOD
+- WAL_RETENTION_SIZE
+- WAL_ROLL_PERIOD
+- WAL_SEGMENT_SIZE
+- WATERMARK
 - WHERE
+- WINDOW_CLOSE
+- WITH
+- WRITE
 
 ### \_
 
 - \_C0
-- \_QSTART
-- \_QSTOP
 - \_QDURATION
-- \_WSTART
-- \_WSTOP
+- \_QEND
+- \_QSTART
+- \_ROWTS
 - \_WDURATION
+- \_WEND
+- \_WSTART
diff --git a/docs/zh/12-taos-sql/20-keywords.md b/docs/zh/12-taos-sql/20-keywords.md
index 57a45b0a009dc57ef334c756774ef0c409187edd..7530e803db44f49048f02e2ad6980a288c14fa12 100644
--- a/docs/zh/12-taos-sql/20-keywords.md
+++ b/docs/zh/12-taos-sql/20-keywords.md
@@ -6,7 +6,8 @@ description: TDengine 保留关键字的详细列表
 
 ## 保留关键字
 
-目前 TDengine 有将近 200 个内部保留关键字，这些关键字无论大小写如果需要用作库名、表名、STable 名、数据列名及标签列名等，需要使用符号 `` ` `` 将关键字括起来使用，例如 \`ADD\`。
+目前 TDengine 有 200 多个内部保留关键字，这些关键字如果需要用作库名、表名、超级表名、子表名、数据列名及标签列名等，无论大小写，需要使用符号 `` ` `` 将关键字括起来使用，例如 \`ADD\`。
+
 关键字列表如下：
 
 ### A
@@ -16,15 +17,20 @@ description: TDengine 保留关键字的详细列表
 - ACCOUNTS
 - ADD
 - AFTER
+- AGGREGATE
 - ALL
 - ALTER
+- ANALYZE
 - AND
+- APPS
 - AS
 - ASC
+- AT_ONCE
 - ATTACH
 
 ### B
 
+- BALANCE
 - BEFORE
 - BEGIN
 - BETWEEN
@@ -34,19 +40,27 @@ description: TDengine 保留关键字的详细列表
 - BITNOT
 - BITOR
 - BLOCKS
+- BNODE
+- BNODES
 - BOOL
+- BUFFER
+- BUFSIZE
 - BY
 
 ### C
 
 - CACHE
-- CACHELAST
+- CACHEMODEL
+- CACHESIZE
 - CASCADE
+- CAST
 - CHANGE
+- CLIENT_VERSION
 - CLUSTER
 - COLON
 - COLUMN
 - COMMA
+- COMMENT
 - COMP
 - COMPACT
 - CONCAT
@@ -54,15 +68,18 @@ description: TDengine 保留关键字的详细列表
 - CONNECTION
 - CONNECTIONS
 - CONNS
+- CONSUMER
+- CONSUMERS
+- CONTAINS
 - COPY
+- COUNT
 - CREATE
-- CTIME
+- CURRENT_USER
 
 ### D
 
 - DATABASE
 - DATABASES
-- DAYS
 - DBS
 - DEFERRED
 - DELETE
@@ -71,18 +88,23 @@ description: TDengine 保留关键字的详细列表
 - DESCRIBE
 - DETACH
 - DISTINCT
+- DISTRIBUTED
 - DIVIDE
 - DNODE
 - DNODES
 - DOT
 - DOUBLE
 - DROP
+- DURATION
 
 ### E
 
+- EACH
+- ENABLE
 - END
-- EQ
+- EVERY
 - EXISTS
+- EXPIRED
 - EXPLAIN
 
 ### F
@@ -90,18 +112,20 @@ description: TDengine 保留关键字的详细列表
 - FAIL
 - FILE
 - FILL
+- FIRST
 - FLOAT
+- FLUSH
 - FOR
 - FROM
-- FSYNC
+- FUNCTION
+- FUNCTIONS
 
 ### G
 
-- GE
 - GLOB
+- GRANT
 - GRANTS
 - GROUP
-- GT
 
 ### H
 
@@ -112,15 +136,18 @@ description: TDengine 保留关键字的详细列表
 - ID
 - IF
 - IGNORE
-- IMMEDIA
+- IMMEDIATE
 - IMPORT
 - IN
-- INITIAL
+- INDEX
+- INDEXES
+- INITIALLY
+- INNER
 - INSERT
 - INSTEAD
 - INT
 - INTEGER
-- INTERVA
+- INTERVAL
 - INTO
 - IS
 - ISNULL
@@ -128,6 +155,7 @@ description: TDengine 保留关键字的详细列表
 ### J
 
 - JOIN
+- JSON
 
 ### K
 
@@ -137,46 +165,57 @@ description: TDengine 保留关键字的详细列表
 
 ### L
 
-- LE
+- LAST
+- LAST_ROW
+- LICENCES
 - LIKE
 - LIMIT
 - LINEAR
 - LOCAL
-- LP
-- LSHIFT
-- LT
 
 ### M
 
 - MATCH
+- MAX_DELAY
 - MAXROWS
+- MERGE
+- META
 - MINROWS
 - MINUS
+- MNODE
 - MNODES
 - MODIFY
 - MODULES
 
 ### N
 
-- NE
+- NCHAR
+- NEXT
+- NMATCH
 - NONE
 - NOT
 - NOTNULL
 - NOW
 - NULL
+- NULLS
 
 ### O
 
 - OF
 - OFFSET
+- ON
 - OR
 - ORDER
+- OUTPUTTYPE
 
 ### P
 
-- PARTITION
+- PAGES
+- PAGESIZE
+- PARTITIONS
 - PASS
 - PLUS
+- PORT
 - PPS
 - PRECISION
 - PREV
@@ -184,47 +223,63 @@ description: TDengine 保留关键字的详细列表
 
 ### Q
 
+- QNODE
+- QNODES
 - QTIME
-- QUERIE
+- QUERIES
 - QUERY
-- QUORUM
 
 ### R
 
 - RAISE
-- REM
+- RANGE
+- RATIO
+- READ
+- REDISTRIBUTE
+- RENAME
 - REPLACE
 - REPLICA
 - RESET
-- RESTRIC
+- RESTRICT
+- RETENTIONS
+- REVOKE
+- ROLLUP
 - ROW
-- RP
-- RSHIFT
 
 ### S
 
+- SCHEMALESS
 - SCORES
 - SELECT
 - SEMI
+- SERVER_STATUS
+- SERVER_VERSION
 - SESSION
 - SET
 - SHOW
-- SLASH
+- SINGLE_STABLE
 - SLIDING
 - SLIMIT
-- SMALLIN
+- SMA
+- SMALLINT
+- SNODE
+- SNODES
 - SOFFSET
-- STable
-- STableS
+- SPLIT
+- STABLE
+- STABLES
 - STAR
 - STATE
-- STATEMEN
-- STATE_WI
+- STATE_WINDOW
+- STATEMENT
 - STORAGE
 - STREAM
 - STREAMS
+- STRICT
 - STRING
+- SUBSCRIPTIONS
 - SYNCDB
+- SYSINFO
 
 ### T
 
@@ -235,20 +290,24 @@ description: TDengine 保留关键字的详细列表
 - TBNAME
 - TIMES
 - TIMESTAMP
+- TIMEZONE
 - TINYINT
+- TO
+- TODAY
 - TOPIC
 - TOPICS
+- TRANSACTION
+- TRANSACTIONS
 - TRIGGER
+- TRIM
 - TSERIES
 - TTL
 
 ### U
 
-- UMINUS
 - UNION
 - UNSIGNED
 - UPDATE
-- UPLUS
 - USE
 - USER
 - USERS
@@ -258,8 +317,11 @@ description: TDengine 保留关键字的详细列表
 
 - VALUE
 - VALUES
+- VARCHAR
 - VARIABLE
 - VARIABLES
+- VERBOSE
+- VGROUP
 - VGROUPS
 - VIEW
 - VNODES
@@ -267,14 +329,25 @@ description: TDengine 保留关键字的详细列表
 ### W
 
 - WAL
+- WAL_FSYNC_PERIOD
+- WAL_LEVEL
+- WAL_RETENTION_PERIOD
+- WAL_RETENTION_SIZE
+- WAL_ROLL_PERIOD
+- WAL_SEGMENT_SIZE
+- WATERMARK
 - WHERE
+- WINDOW_CLOSE
+- WITH
+- WRITE
 
 ### \_
 
 - \_C0
-- \_QSTART
-- \_QSTOP
 - \_QDURATION
-- \_WSTART
-- \_WSTOP
+- \_QEND
+- \_QSTART
+- \_ROWTS
 - \_WDURATION
+- \_WEND
+- \_WSTART