[incubator-iotdb] 02/03: Merge branch 'HTHou-doc-changes'

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch new_doc_pr
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 5adfcbb64dd6d1e5f2b44a37c69e3aae9b4f8b3d
Merge: 1a9798e 00ad5fa
Author: qiaojialin <646274...@qq.com>
AuthorDate: Tue Oct 22 20:46:01 2019 +0800

    Merge branch 'HTHou-doc-changes'

 docs/Documentation-CHN/QuickStart.md               |   4 +-
 .../1-Key Concepts and Terminology.md              |   0
 .../2-Data Type.md                                 |   2 +-
 .../3-Encoding.md                                  |   0
 .../4-Compression.md                               |   2 +-
 .../1-Deployment.md                                |   4 +-
 .../2-Configuration.md                             |   2 +-
 .../3-Build and use IoTDB by Dockerfile.md}        |   2 +-
 .../4-TsFile library Installation.md}              |   3 +-
 .../UserGuide/3-Operation Manual/1-Sample Data.md  |  28 --
 .../4-Operation Manual/1-Cli Shell Tool.md         | 135 ++++++++
 .../2-Data Model Selection.md                      |  21 +-
 .../3-Data Import.md                               |   8 +-
 .../4-Data Query.md                                |  18 +-
 .../5-Data Maintenance.md                          |   8 +-
 .../6-Priviledge Management.md                     |   6 +-
 .../7-IoTDB Query Language.md}                     | 118 ++++++-
 .../8-TsFile Usage.md}                             |   3 +-
 .../5-IoTDB SQL Documentation/2-Reference.md       | 137 --------
 .../1-System Monitor.md}                           |  12 +-
 .../2-Performance Monitor.md}                      |  27 +-
 .../3-System log.md}                               |   6 +-
 .../4-Data Management.md}                          |  10 +-
 .../2-Status Code.md => 6-API/1-JDBC API.md}       |   6 +-
 .../1-Session API.md => 6-API/2-Session API.md}    |   4 +-
 .../1-Installation.md => 6-API/3-Python API.md}    |   3 +-
 .../1-Hierarchy.md}                                |   0
 .../1-Sync.md => 8-System Tools/1-Sync Tool.md}    |   3 +-
 .../2-Memory Estimation Tool.md                    |   4 +-
 .../3-JMX Tool.md                                  |   2 +-
 .../UserGuide/8-System Tools/4-Grafana.md          | 136 ++++++++
 .../8-System Tools/5-TsFile Hadoop Connector.md    | 217 +++++++++++++
 .../6-TsFile Spark Connector.md}                   |   4 +-
 .../7-Spark IoTDB Connector.md}                    |   4 +-
 .../8-Watermark Tool.md}                           |   3 +-
 docs/Documentation/QuickStart.md                   |   6 +-
 docs/Documentation/UserGuide/0-Content.md          |  51 +--
 .../UserGuide/1-Overview/4-Features.md             |  33 +-
 .../1-Key Concepts and Terminology.md              |   6 +-
 .../2-Data Type.md                                 |   2 +-
 .../3-Encoding.md                                  |   4 +-
 .../4-Compression.md                               |   2 +-
 .../1-Deployment.md                                |   6 +-
 .../2-Configuration.md                             |   4 +-
 .../3-Build and use IoTDB by Dockerfile.md}        |   6 +-
 .../4-TsFile library Installation.md}              |   9 +-
 .../UserGuide/3-Operation Manual/1-Sample Data.md  |  28 --
 .../4-Operation Manual/1-Cli Shell Tool.md         | 133 ++++++++
 .../2-Data Model Selection.md                      |  18 +-
 .../3-Data Import.md                               |   8 +-
 .../4-Data Query.md                                |  20 +-
 .../5-Data Maintenance.md                          |   8 +-
 .../6-Priviledge Management.md                     |   6 +-
 .../7-IoTDB Query Statement.md}                    | 124 +++++++-
 .../8-TsFile Usage.md}                             |  20 +-
 .../5-IoTDB SQL Documentation/2-Reference.md       | 137 --------
 .../1-System Monitor.md}                           |  10 +-
 .../2-Performance Monitor.md}                      |  12 +-
 .../3-System log.md}                               |   4 +-
 .../4-Data Management.md}                          |  10 +-
 .../UserGuide/{6-JDBC API => 6-API}/1-JDBC API.md  |  48 ++-
 .../1-Session API.md => 6-API/2-Session API.md}    |  22 +-
 docs/Documentation/UserGuide/6-API/3-Python API.md |  44 +++
 .../UserGuide/6-JDBC API/2-Status Code.md          |  64 ----
 .../1-Hierarchy.md}                                |   2 +-
 .../1-Sync.md => 8-System Tools/1-Sync Tool.md}    |  17 +-
 .../2-Memory Estimation Tool.md                    |  13 +-
 .../3-JMX Tool.md                                  |   2 +-
 .../UserGuide/8-System Tools/4-Grafana.md          | 140 +++++++++
 .../8-System Tools/5-TsFile Hadoop Connector.md    | 214 +++++++++++++
 .../8-System Tools/6-TsFile Spark Connector.md     | 344 +++++++++++++++++++++
 .../8-System Tools/7-Spark IoTDB Connecter.md      | 173 +++++++++++
 .../8-Watermark Tool.md}                           |  12 +-
 73 files changed, 2070 insertions(+), 634 deletions(-)