This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch new_slides
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/new_slides by this push:
new d8e2eee add slides in 2020
d8e2eee is described below
commit d8e2eee5b44cec64323581e3ca3544f5cfe36e91
Author: xiangdong huang <[email protected]>
AuthorDate: Fri Jan 29 11:51:05 2021 +0800
add slides in 2020
---
docs/Community/Feedback.md | 2 +
docs/Community/Materials.md | 2 -
docs/zh/Community/Feedback.md | 4 +-
docs/zh/Community/Materials.md | 95 ------------------------------------------
4 files changed, 5 insertions(+), 98 deletions(-)
diff --git a/docs/Community/Feedback.md b/docs/Community/Feedback.md
index bc67a05..4810751 100644
--- a/docs/Community/Feedback.md
+++ b/docs/Community/Feedback.md
@@ -37,6 +37,8 @@ As an Apache project, we are using mailing list, JIRA, and
Github Issues to obta
* Twitter: https://twitter.com/apacheiotdb
+* For Chinese users, we have a QQ Group: 659990460.
+
* We look forward to you sharing the experience of using IoTDB:
[Survey](https://github.com/apache/iotdb/issues/748)
* For Chinese users, we have a Wechat Public Account. For more details, read
[交流](../zh/Community/Feedback.md)
diff --git a/docs/Community/Materials.md b/docs/Community/Materials.md
index 0f8338b..0f13dbc 100644
--- a/docs/Community/Materials.md
+++ b/docs/Community/Materials.md
@@ -19,8 +19,6 @@
-->
-<!-- just copy this file to cover zh/Community/Materials.md-->
-
Tips: All English Slides and videos are on slideshare.net and Youtube;
All Chinese Slides and videos are on myslide.cn and bilibili.
(所有的中文材料都在 myslide.cn 和 bilibili上.)
diff --git a/docs/zh/Community/Feedback.md b/docs/zh/Community/Feedback.md
index 9073c86..5d295d0 100644
--- a/docs/zh/Community/Feedback.md
+++ b/docs/zh/Community/Feedback.md
@@ -35,10 +35,12 @@
* Twitter: https://twitter.com/apacheiotdb
+* 对中文用户，欢迎加入QQ群: 659990460.
+
* 我们非常期待您分享您使用IoTDB的经验: [调研问卷](https://github.com/apache/iotdb/issues/748)
* 对中文用户，欢迎关注微信公众号，IoTDB漫游指南
* 对中文用户，我们提供了钉钉群，可以搜索群名称加入：Apache IoTDB交流1群
-IoTDB社区会不定期举办Meetup，相关信息会在邮件列表和[研讨会议和报告列表](Materials.md) 页面找到。
+IoTDB社区会不定期举办Meetup，相关信息会在邮件列表和[研讨会议和报告列表](https://iotdb.apache.org/Community/Materials.html)
页面找到。
diff --git a/docs/zh/Community/Materials.md b/docs/zh/Community/Materials.md
deleted file mode 100644
index bba39bf..0000000
--- a/docs/zh/Community/Materials.md
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-## 活动与报告
-
-* 2020.03.02, Building IoT 2020. Essen, Germany.
- * (German) [Industrial IoT mit Open
Source]((https://www.buildingiot.de/lecture.php?id=10856&source=)). Reporter:
Julian Feinauer, Chirstofer Dutz.
-
-* 2020.01.12, Apache IoTDB x Apache ShardingSphere Meetup. Beijing, China.
-
-* 2020.01.04, Apache IoTDB x Apache Pulsar Meetup. Beijing, China.
- * (Chinese) [Managing Time series data with IoTDB](#meetup2019-pulsar1).
基于IoTDB的时序数据开源解决方案. Reporter: Jialin Qiao
- * (Chinese) [Apache IoTDB: History and Technical
Details](#meetup2019-pulsar2). Apache IoTDB的前世今生与技术细节. Reporter: Xiangdong Huang
-
-* 2019.12.28, Apache RocketMQ x Apache IoTDB Meetup. Dalian, China.
- * (Chinese) [Apache IoTDB: Why We Need a Time Series
Database](#meetup2019-dalian). Apache IoTDB：为什么我们需要一个时序数据库. Reporter: Xiangdong
Huang
-
-* 2019.11.09, Apache Event: Embrace Apache Software Foundation. Beijing China.
- * (Chinese) Open Source in Campus - Apache IoTDB as an Example. 从 Apache
IoTDB 看高校学生的 Apache 开源实践. Reporter: Xiangdong Huang
-
-* 2019.10.23, ApacheCon Europe 2019. Berlin, Germany.
- * (English) [Apache IoTDB: Time Series Database for Industrial
IoT](#apeu2019). Reporter: Xiangdong Huang, Julian Feinauer
-
-* 2019.09.10, ApacheCon North America 2019. Las Vegas, USA.
- * (English) [Hello World! Introducing Apache IoTDB - a Database for the
Internet of Things](#apna2019). Reporter: Xiangdong Huang, Julian Feinauer
-
-* 2019.07.13, 北京黑客马拉松 2019. 北京, 中国.
- * (Chinese) Apache IoTDB (incubating): Time Series Database for IIoT.
IoTDB：工业互联网时序数据库. Reporter: Xiangdong Huang
-
-* 2019.05.07, 第二届数字中国建设峰会. 福州, 中国.
- * (Chinese) Apache IoTDB (incubating): Time Series Database for IIoT.
IoTDB：工业互联网时序数据库. Reporter: Xiangdong Huang
-
-* 2019.02.21, 工业互联网峰会 2019. 北京, 中国.
- * (Chinese) Apache IoTDB (incubating): Time Series Database for IIoT.
IoTDB：工业互联网时序数据库. Reporter: Jianmin Wang
-
-* 2018.12.09, 清华开源之道大讲堂 2018. 北京, 中国.
- * (Chinese) IoTDB: from Tsinghua IoTDB to Apache IoTDB (incubating).
IoTDB:从清华IoTDB到Apache孵化器项目。Reporter: Xiangdong Huang
-
-## 幻灯片，音频和视频
-
-### 英语
-
-* Coding example (from Dalian Meetup 2019)
-
-<iframe
src="//www.slideshare.net/slideshow/embed_code/key/MZBHJIVnVxff8?startSlide=26"
width="640" height="480" frameborder="0" allowfullscreen> </iframe>
-
-* <span id = "apna2019"> ApacheCon North America 2019: Hello World!
Introducing Apache IoTDB - a Database for the Internet of Things</span>
-
-<audio
src="https://feathercast.apache.org/wp-content/uploads/2019/09/2019-09-10-hello-world-introducing-apache-iotdb-xiangdong-huang-julian-feinauer.mp3";
controls="controls">
-</audio>
-
-* <span id = "apeu2019"> ApacheCon Europe 2019: Apache IoTDB: Time Series
Database for Industrial IoT</span>
-
-<iframe src="//www.slideshare.net/slideshow/embed_code/key/lms4cEH1eqnRZC"
width="640" height="480" frameborder="0" scrolling="no" allowfullscreen>
</iframe>
-
-<iframe width="640" height="480"
src="https://www.youtube.com/embed/LLFc3yPyTFY"; frameborder="0"
allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen></iframe>
-
-### 中文
-
-* <span id = "meetup2019-pulsar1"> 北京Meetup 2019. 基于Apache IoTDB的时序数据开源解决方案.
</span>
-
-<iframe src="//www.slideshare.net/slideshow/embed_code/key/Fmz5kXAzNgmVSu"
width="640" height="480" frameborder="0" allowfullscreen> </iframe>
-
-<iframe
src="//player.bilibili.com/player.html?aid=83462398&bvid=BV1sJ411J783&cid=142782989&page=5"
width="640" height="480" scrolling="no" border="0" frameborder="no"
framespacing="0" allowfullscreen="true"> </iframe>
-
-* <span id = "meetup2019-pulsar2"> 北京Meetup 2019. Apache IoTDB的前世今生与技术细节.
</span>
-
-<iframe src="//www.slideshare.net/slideshow/embed_code/key/pEnS6vZrt8DJGl"
width="640" height="480" frameborder="0" allowfullscreen> </iframe>
-
-<iframe
src="//player.bilibili.com/player.html?aid=83462398&bvid=BV1sJ411J783&cid=142782348&page=3"
width="640" height="480" scrolling="no" border="0" frameborder="no"
framespacing="0" allowfullscreen="true"> </iframe>
-
-* <span id = "meetup2019-dalian"> 大连Meetup 2019. Apache IoTDB: 工业互联网时序数据库.
</span>
-
-<iframe src="//www.slideshare.net/slideshow/embed_code/key/MZBHJIVnVxff8"
width="640" height="480" frameborder="0" allowfullscreen> </iframe>
-
-* [IoTDB v0.8.0 Query Process
Implementation](https://h5.dingtalk.com/group-live-share/index.htm?encCid=b9f2eba34c2a3e9b8f06fbdaf65337e2&liveUuid=48161db6-d588-4251-a28a-1f929afee3ff#/),
Reporter: Lei Rui
-
