merge dev-ja

docs/README.md

@@ -1,6 +1,6 @@
 # M5Stack
 
-**welcome to M5Stack documents!**
+**Welcome to M5Stack Documents!**
 
 ## Introduction
 

docs/_coverpage.md

@@ -1,12 +0,0 @@
-![logo](assets/img/coverpage_logo.png)
-
-# Style Dictionary
-
-> Style once, use everywhere.
-
-**Style Dictionary** is a build system that allows you to define styles once, in a way for any platform or language to consume. A single place to create and edit your styles, and a single command exports these rules to all the places you need them - iOS, Android, CSS, JS, HTML, sketch files, style documentation, or anything you can think of. It is available as a CLI through npm, but can also be used like any normal node module if you want to extend its functionality.
-
-[GitHub](https://github.com/amzn/style-dictionary)
-[Get Started](README.md)
-
-![color](#D9F8F5)

docs/_navbar.md.orig

@@ -0,0 +1,3 @@
+- [中文](/zh-cn/)
+- [En](/)
+- [日本語](/ja/)

docs/_sidebar.md.orig

@@ -0,0 +1,14 @@
+<<<<<<< HEAD:docs/_sidebar.md
+- [Introduction](README)
+=======
+>>>>>>> origin/master:docs/sidebar.md
+- [Product Documents](product_documents)
+- [Quick Start](quick_start)
+- [API Rreference](api_reference)
+- [M5Stack Cases](m5stack_cases)
+- [FAQ](faq)
+
+
+- **Links**
+- [![Github](https://icongram.jgog.in/simple/github.svg?color=808080&size=16)Github](https://github.com/watson8544/M5Stack-Documentation-docsify)
+- [![Twitter](https://icongram.jgog.in/simple/twitter.svg?colored&size=16)@M5Stack](http://twitter.com/M5Stack)

docs/actions.md

@@ -1,44 +0,0 @@
-# Actions
-
-Actions provide a way to run custom build code such as generating binary assets like images.
-
-Here are all the actions that come with the Style Dictionary build system. We try to include what most people might need. You can define custom actions with the [`registerAction`](api.md#registeraction). If you think we are missing some things, take a look at our [contributing docs](https://github.com/amzn/style-dictionary/blob/master/CONTRIBUTING.md) and send us a pull request! If you have a specific need for your project, you can always write your own [custom actions](#adding-custom-actions).
-
-You use actions in your config file under platforms > [platform] > actions
-
-```json
-{
-  "source": ["properties/**/*.json"],
-  "platforms": {
-    "android": {
-      "transformGroup": "android",
-      "files": [],
-      "actions": ["copy_assets"]
-    }
-  }
-}
-```
-
-
-----
-
-## Pre-defined Actions
-
-[lib/common/actions.js](https://github.com/amzn/style-dictionary/blob/master/lib/common/actions.js)
-
-### android/copyImages 
-
-
-Action to copy images into appropriate android directories.
-
-
-* * *
-
-### copy_assets 
-
-
-Action that copies everything in the assets directory to a new assets directory in the build path of the platform.
-
-
-* * *
-

docs/coverpage.md

@@ -2,7 +2,7 @@
 
 > A documentation for [M5Stack](https://www.m5stack.com)
 
-- A modular stackable development device integrating WIFI/BLE
+- A series of modular stackable development devices integrating WIFI/BLE
 - For Industry Development/STEM Education
 - Programming with UIFlow(Blockly/MicroPython)
 

docs/en/product_documents.md

@@ -1,5 +1,7 @@
 # Product Documents
 
+[中文](zh_CN/product_documents_zh_CN.md) | English | [日本語](ja/product_documents_ja.md)
+
 <img src='assets/img/product_pics/1.jpg'> <img src='assets/img/product_pics/cores.png'>
 
 | M5Core        | MiniCore      |
@@ -17,7 +19,7 @@
 | [GPS](product_documents/modules/module_gps) | [PROTO](product_documents/modules/module_proto) | [STEPMOTOR](product_documents/modules/module_stepmotor)|
 | [LORA](product_documents/modules/module_lora)                  | [BATTERY](product_documents/modules/module_battery)            | [PLC](product_documents/modules/module_plc)                     |
 | [LAN](product_documents/modules/module_lan)                   | [BTC](product_documents/modules/module_btc)                | [FACES](product_documents/modules/module_face)                     |
-| [SIM800/GPRS/GSM](product_documents/modules/module_sim800)       | [PLUS](product_documents/modules/module_plus)                  | /                     |
+| [SIM800/GPRS/GSM](product_documents/modules/module_sim800)       | [PLUS](product_documents/modules/module_plus)                  | [Node](product_documents/modules/module_node)                     |
 | /                     | /                  | /                     |
 | /                     | /                  | /                     |
 | /                     | /                  | /                     |
@@ -63,4 +65,4 @@
 
 <img src='assets/img/product_pics/6.jpg'> <img src='assets/img/product_pics/tool.png'>
 
-- [M5Stack USB Downloader](product_documents/tools/tool_usb_downloader)
+- [M5Stack USB Downloader](product_documents/tools/tool_usb_downloader)

docs/en/product_documents/m5stack-core/m5core_basic.md

@@ -2,7 +2,7 @@
 
 ## DESCRIPTION
 
-The M5Stack BASIC is a development kit based on ESP32 chip. You can even
+The M5Stack **<mark>BASIC</mark>** is a development kit based on <mark>ESP32</mark> chip. You can even
 program The M5Stack BASIC through Blockly, Arduino or MicroPython.
 
 The M5Stack BASIC equips the ESP32 with everything necessary to program,
@@ -22,7 +22,7 @@ and so on.
 
 | Source        | Parameter      |
 | :----------:  |:------------: |
-| ESP32         | 240MHz dual core, 600 DMIPS, 520K, Wi-Fi, dual mode Bluetooth         |
+| <mark>ESP32</mark>         | 240MHz dual core, 600 DMIPS, 520K, Wi-Fi, dual mode Bluetooth         |
 | Flash)          | 4M-Bytes            |
 | Input          | 5V @ 500mA            |
 | Interface          | TypeC x 1, GROVE(I2C+I/0+UART) x 1            |
@@ -43,16 +43,12 @@ and so on.
 
 ## DOCUMENTS
 
--  [Schematic](https://github.com/m5stack/M5-3D_and_PCB/blob/master/M5_Core_SCH%2820171206%29.pdf)
+-  **[Schematic](https://github.com/m5stack/M5-3D_and_PCB/blob/master/M5_Core_SCH%2820171206%29.pdf)**
 
--  Example
+-  **Example** - [Arduino Example](https://github.com/m5stack/M5Stack/tree/master/examples)
 
-   - [Arduino Example](https://github.com/m5stack/M5Stack/tree/master/examples)
+-  **Datasheet** - [ESP32](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_cn.pdf)
 
--  Datasheet
+-  **GitHub** - [Arduino GitHub](https://github.com/m5stack/M5Stack)
 
-   - [ESP32](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_cn.pdf)
-
--  GitHub
-
-   - [Arduino GitHub](https://github.com/m5stack/M5Stack)
+-  **<mark>Quick Start</mark>** - Arduino - [MacOS](../../quick_start/m5core/m5stack_core_get_started_Arduino_MacOS) - [Windows_64](../../quick_start/m5core/m5stack_core_get_started_Arduino_Windows) - [MicroPython](../../quick_start/m5core/m5stack_core_get_started_MicroPython)