Merge with master.

ISSUE_TEMPLATE.md

@@ -17,6 +17,6 @@
 http://thingsboard.io/...
 
 <!--Optional Information (remove the comment tags around information you would like to include)-->
-<!--Thingsboard Version:-->
+<!--ThingsBoard Version:-->
 
 <!--Additional Information:-->

README.md

@@ -32,7 +32,7 @@ Clone our site:
 Make any changes you want. Then, to see your changes locally:
 
 	cd thingsboard.github.io
-	jekyll serve
+	bundle exec jekyll serve
 
 Your copy of the site will then be viewable at: [http://localhost:4000](http://localhost:4000)
 (or wherever Jekyll tells you).

_config.yml

@@ -1,12 +1,12 @@
-name: Thingsboard
+name: ThingsBoard
 author: thingsboard
 logo: /images/thingsboard_logo.png
 
 twitter:
   username: thingsboard
 
 social:
-  name: Thingsboard
+  name: ThingsBoard
   links:
     - https://twitter.com/thingsboard
     - https://github.com/thingsboard/thingsboard
@@ -28,6 +28,9 @@ incremental: true
 safe: false
 lsi: false
 
+sass:
+  style: compressed
+
 defaults:
   -
     scope:

_data/api.yml

@@ -1,7 +1,7 @@
-bigheader: "Thingsboard API reference"
+bigheader: "ThingsBoard API reference"
 abstract: "Device connectivity and server-side APIs."
 toc:
-- title: Thingsboard API reference
+- title: ThingsBoard API reference
   path: /docs/api/
 - title: Device Connectivity Protocols
   path: /docs/reference/protocols/

_data/contact-us.yml

@@ -1,5 +1,5 @@
 bigheader: "Contact us"
-abstract: "Get in touch with Thingsboard authors."
+abstract: "Get in touch with ThingsBoard authors."
 hidetoc: "true"
 toc:
 - title: Contact us

_data/docs-home.yml

@@ -1,29 +1,29 @@
-bigheader: "Thingsboard Documentation"
-abstract: "Documentation for using Thingsboard IoT Platform."
+bigheader: "ThingsBoard Documentation"
+abstract: "Documentation for using ThingsBoard IoT Platform."
 toc:
-- title: Thingsboard Documentation
+- title: ThingsBoard Documentation
   path: /docs/
-- title: What is Thingsboard?
+- title: What is ThingsBoard?
   path: /docs/getting-started-guides/what-is-thingsboard/
 - title: Getting Started
   path: /docs/getting-started-guides/helloworld/
 - title: Installation
   section:
   - title: Installation options
     path: /docs/user-guide/install/installation-options/
-  - title: Installing Thingsboard on Windows
+  - title: Installing ThingsBoard on Windows
     path: /docs/user-guide/install/windows/
-  - title: Installing Thingsboard on Linux (Ubuntu & CentOS)
+  - title: Installing ThingsBoard on Linux (Ubuntu & CentOS)
     path: /docs/user-guide/install/linux/
-  - title: Installing Thingsboard on Raspberry Pi 3
+  - title: Installing ThingsBoard on Raspberry Pi 3
     path: /docs/user-guide/install/rpi/
-  - title: Installing Thingsboard using Kubernetes (Google Cloud Platform)
+  - title: Installing ThingsBoard using Kubernetes (Google Cloud Platform)
     path: /docs/user-guide/install/kubernetes/
-  - title: Installing Thingsboard using Docker (Linux or Mac OS)
+  - title: Installing ThingsBoard using Docker (Linux or Mac OS)
     path: /docs/user-guide/install/docker/
-  - title: Installing Thingsboard using Docker (Windows)
+  - title: Installing ThingsBoard using Docker (Windows)
     path: /docs/user-guide/install/docker-windows/
-  - title: Installing Thingsboard on AWS EC2
+  - title: Installing ThingsBoard on AWS EC2
     path: /docs/user-guide/install/aws/
   - title: Building from sources
     path: /docs/user-guide/install/building-from-source/
@@ -59,6 +59,8 @@ toc:
     path: /docs/iot-gateway/sigfox-iot-data-visualization/
   - title: Persist and visualize IBM Watson IoT data
     path: /docs/iot-gateway/integration-with-ibm-watson-iot/
+  - title: Notifications and Alarms on your smartphone using Telegram Bot
+    path: /docs/iot-gateway/integration-with-telegram-bot/
 - title: Security
   section:
   - title: MQTT over SSL

_data/feedback.yml

@@ -1,5 +1,5 @@
 bigheader: "Customers testimonials and community feedback"
-abstract: "Feedback and testimonials about Thingsboard platform"
+abstract: "Feedback and testimonials about ThingsBoard platform"
 hidetoc: "true"
 toc:
 - title: Customers testimonials and community feedback

_data/iot-gateway.yml

@@ -1,9 +1,9 @@
-bigheader: "Thingsboard IoT Gateway"
-abstract: "Integrate legacy and third-party systems with Thingsboard platform using IoT Gateway."
+bigheader: "ThingsBoard IoT Gateway"
+abstract: "Integrate legacy and third-party systems with ThingsBoard platform using IoT Gateway."
 toc:
 - title: IoT Gateway
   path: /docs/iot-gateway/
-- title: What is Thingsboard IoT Gateway?
+- title: What is ThingsBoard IoT Gateway?
   path: /docs/iot-gateway/what-is-iot-gateway/
 - title: Getting Started
   path: /docs/iot-gateway/getting-started/

_data/iot-use-cases.yml

@@ -1,8 +1,10 @@
 bigheader: "Use cases"
-abstract: "IoT use cases where Thingsboard is being successfully utilized."
+abstract: "IoT use cases where ThingsBoard is being successfully utilized."
 toc:
 - title: Use cases
   path: /iot-use-cases/
+- title: Smart metering
+  path: /smart-metering/
 - title: Smart energy
   path: /smart-energy/
 - title: Smart farming

_data/iot-video-tutorials.yml

@@ -1,5 +1,5 @@
 bigheader: "Video Tutorials"
-abstract: "Series of video tutorials showing how to use Thingsboard."
+abstract: "Series of video tutorials showing how to use ThingsBoard."
 hidetoc: "true"
 toc:
 - title: Video Tutorials

_data/reference.yml

@@ -3,9 +3,9 @@ abstract: "Design docs, concept definitions, and references for APIs and CLIs."
 toc:
 - title: Reference Documentation
   path: /docs/reference/
-- title: Thingsboard Architecture
+- title: ThingsBoard Architecture
   path: /docs/reference/architecture/
-- title: Thingsboard Performance
+- title: ThingsBoard Performance
   section:
   - title: Data Collection Performance
     path: /docs/reference/performance/

_data/samples.yml

@@ -1,5 +1,5 @@
 bigheader: "Samples"
-abstract: "A collection of example applications that show how to use Thingsboard."
+abstract: "A collection of example applications that show how to use ThingsBoard."
 toc:
 - title: Samples
   path: /docs/samples/
@@ -21,7 +21,7 @@ toc:
       path: /docs/samples/esp8266/
     - title: Temperature upload over MQTT using ESP8266 and DHT22 sensor
       path: /docs/samples/esp8266/temperature/
-    - title: ESP8266 GPIO control over MQTT using Thingsboard
+    - title: ESP8266 GPIO control over MQTT using ThingsBoard
       path: /docs/samples/esp8266/gpio/
   - title: NodeMCU
     section:
@@ -33,17 +33,17 @@ toc:
     section:
     - title: Raspberry Pi overview
       path: /docs/samples/raspberry/
-    - title: Raspberry Pi GPIO control over MQTT using Thingsboard
+    - title: Raspberry Pi GPIO control over MQTT using ThingsBoard
       path: /docs/samples/raspberry/gpio/
-    - title: Raspberry Pi GPIO control using Android Things and Thingsboard
+    - title: Raspberry Pi GPIO control using Android Things and ThingsBoard
       path: /docs/samples/raspberry/gpio-android-things/
     - title: Temperature upload over MQTT using Raspberry Pi and DHT22 sensor
       path: /docs/samples/raspberry/temperature/
   - title: LinkIt ONE
     section:
     - title: LinkIt ONE overview
       path: /docs/samples/linkit-one/
-    - title: GPS data upload and visualization using LinkIt ONE and Thingsboard
+    - title: GPS data upload and visualization using LinkIt ONE and ThingsBoard
       path: /docs/samples/linkit-one/gps/
 - title: Tutorials
   section:

_data/services.yml

@@ -1,5 +1,5 @@
 bigheader: "Services"
-abstract: "Services provided by Thingsboard authors."
+abstract: "Services provided by ThingsBoard authors."
 toc:
 - title: Services
   path: /docs/services/

_includes/footer.html

@@ -12,7 +12,7 @@
 			<form id="newsletter-form" method="post" onsubmit="return validateNewsletterForm(this)">
 				<fieldset>
 					<div class="newsletterInputs">
-						<p class="subsTitle">Sign up for Thingsboard IoT newsletter</p>
+						<p class="subsTitle">Sign up for ThingsBoard IoT newsletter</p>
 						<input id="subsEmail" placeholder="Email" class="text-input" name="email" type="text" size="20" maxlength="80">
 						<input type="hidden" name="_next" value="/docs/newsletter-thanks/" />
 						<input type="text" name="_gotcha" style="display:none" />
@@ -36,7 +36,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} The Thingsboard Authors</div>
+		<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} The ThingsBoard Authors</div>
 	</main>
 
 	<script type="text/javascript">

_includes/templates/docker-files.md

@@ -1,4 +1,4 @@
-- Make folder to store docker files:
+- Make a folder to store docker files:
 
 ```bash
 mkdir <docker-folder>

_includes/templates/feedback.md

@@ -1,4 +1,4 @@
 ## Your feedback
 
-Don't hesitate to star Thingsboard on **[github](https://github.com/thingsboard/thingsboard)** to help us spread the word.
-If you have some questions about this sample - post it on the **[forum](https://groups.google.com/forum/#!forum/thingsboard)**.
+Don't hesitate to star ThingsBoard on **[github](https://github.com/thingsboard/thingsboard)** to help us spread the word.
+If you have any questions about this sample - post it on the **[forum](https://groups.google.com/forum/#!forum/thingsboard)**.

_includes/templates/install-db.md

@@ -1,6 +1,6 @@
 ThingsBoard is able to use SQL or NoSQL(Cassandra) database layer. 
 By default, ThingsBoard uses embedded HSQLDB instance which is very convenient for evaluation or development purposes. 
 
-If this is your first experience with ThingsBoard we recommend to **skip this step** and use embedded database.   
+If this is your first experience with ThingsBoard we recommend to **skip this step** and use the embedded database.   
 Alternatively, you can configure your platform to use either scalable Cassandra DB cluster or various SQL databases. 
 If you prefer to use an SQL database, we recommend PostgreSQL.

_includes/templates/live-demo-banner.md

@@ -7,7 +7,7 @@
       <br/>  
       <p><b>IoT PaaS Demo</b></p>
       <br/>  
-      <p>We recommend to use Thingsboard <a href="https://demo.thingsboard.io/signup"><b>Live Demo</b></a> for the seamless experience and the newest features from the latest source code!</p>
+      <p>We recommend to use ThingsBoard <a href="https://demo.thingsboard.io/signup"><b>Live Demo</b></a> for the seamless experience and the newest features from the latest source code!</p>
       <p>Save time on the installation and configuration with several pre-provisioned devices, dashboards available in the cloud and pre-integrated email server to create new customer accounts and users.</p>
   </td>
 </tr>

_includes/templates/postgres-post-install.md

@@ -1,5 +1,5 @@
-Once PostgreSQL is installed you may want to create new user or set password for the main user.
+Once PostgreSQL is installed you may want to create a new user or set the password for the the main user.
 
-See following guides for more details: 
+See the following guides for more details: 
 [using postgresql roles and databases](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-16-04#using-postgresql-roles-and-databases)
 and [changing the postgres user password](https://blog.2ndquadrant.com/how-to-safely-change-the-postgres-user-password-via-psql/)

_includes/templates/prerequisites.md

@@ -1,4 +1,4 @@
 ## Prerequisites
 
-You will need to Thingsboard server up and running. Use either [Live Demo](https://demo.thingsboard.io/signup) or 
-[Installation Guide](/docs/user-guide/install/installation-options/) to install Thingsboard.
+You will need to have ThingsBoard server up and running. Use either [Live Demo](https://demo.thingsboard.io/signup) or
+[Installation Guide](/docs/user-guide/install/installation-options/) to install ThingsBoard.

_includes/templates/run-install.md

@@ -1,8 +1,8 @@
 ### Run installation script
 
-Once ThingsBoard service is installed, you can execute following scripts:
+Once ThingsBoard service is installed, you can execute the following script:
 
 ```bash
 # --loadDemo option will load demo data: users, devices, assets, rules, widgets.
-/usr/share/thingsboard/bin/install/install.sh --loadDemo
+sudo /usr/share/thingsboard/bin/install/install.sh --loadDemo
 ```

_includes/templates/start-docker.md

@@ -1,10 +1,10 @@
-- If you would like to create system and demo data and to start Thingsboard node execute next command 
+- If you would like to create system and demo data and to start ThingsBoard node execute next command
 
 ```bash
 ADD_SCHEMA_AND_SYSTEM_DATA=true ADD_DEMO_DATA=true bash -c 'docker-compose up -d tb'
 ```
       
-- In case you would like to skip creation of system and demo data or you already added and you only need to start Thingsboard node then execute *docker-compose* command 
+- In case you would like to skip creation of system and demo data or you have already added and you only need to start ThingsBoard node then execute *docker-compose* command
 
 ```bash
 docker-compose up -d tb

_includes/templates/start-service.md

@@ -1,12 +1,12 @@
 ### Start ThingsBoard service
 
-Execute following command to start ThingsBoard:
+Execute the following command to start ThingsBoard:
 
 ```bash
 sudo service thingsboard start
 ```
 
-Once started, you will be able to open Web UI using following link:
+Once started, you will be able to open Web UI using the following link:
 
 ```bash
 http://localhost:8080/

_includes/templates/thingsboard-configuration.md

@@ -1,5 +1,5 @@
-## Thingsboard configuration
+## ThingsBoard configuration
 
-**Note** Thingsboard configuration steps are necessary only in case of **local Thingsboard installation**.
+**Note** ThingsBoard configuration steps are necessary only in case of **local ThingsBoard installation**.
 If you are using [**Live Demo**](https://demo.thingsboard.io/) instance all entities are pre-configured for your demo account.
-However, we recommend to review this steps because you will still need to get device access token to send requests to Thingsboard.
+However, we recommend reviewing this steps because you will still need to get device access token to send requests to ThingsBoard.

_includes/templates/what-is-thingsboard.md

@@ -1,4 +1,4 @@
-Thingsboard is an open-source server-side platform that allows you to monitor and control IoT devices. 
+ThingsBoard is an open-source server-side platform that allows you to monitor and control IoT devices.
 It is free for both personal and commercial usage and you can deploy it anywhere. 
 If this is your first experience with the platform we recommend to review 
 [what-is-thingsboard](/docs/getting-started-guides/what-is-thingsboard/) page and [getting-started](/docs/getting-started-guides/helloworld/) guide.

_layouts/docwithnav.html

@@ -12,9 +12,9 @@ <h5>Open <a style="font-weight: 500; color: #50b1ff;" href="http://v12.thingsboa
   <div id="vendorStrip" class="light-text">
     <div id="docsList">
         <ul>
-          <li><a href="/docs/" {% if site.data[foundTOC].bigheader == "Thingsboard Documentation" %}class="YAH"{% endif %}>DOCS HOME</a></li>
-          <li><a href="/docs/api/" {% if site.data[foundTOC].bigheader == "Thingsboard API reference" %}class="YAH"{% endif %}>API</a></li>
-          <li><a href="/docs/iot-gateway/" {% if site.data[foundTOC].bigheader == "Thingsboard IoT Gateway" %}class="YAH"{% endif %}>IOT GATEWAY</a></li>
+          <li><a href="/docs/" {% if site.data[foundTOC].bigheader == "ThingsBoard Documentation" %}class="YAH"{% endif %}>DOCS HOME</a></li>
+          <li><a href="/docs/api/" {% if site.data[foundTOC].bigheader == "ThingsBoard API reference" %}class="YAH"{% endif %}>API</a></li>
+          <li><a href="/docs/iot-gateway/" {% if site.data[foundTOC].bigheader == "ThingsBoard IoT Gateway" %}class="YAH"{% endif %}>IOT GATEWAY</a></li>
           <li><a href="/docs/reference/" {% if site.data[foundTOC].bigheader == "Reference Documentation" %}class="YAH"{% endif %}>REFERENCE</a></li>
           <li><a href="/docs/samples/" {% if site.data[foundTOC].bigheader == "Samples" %}class="YAH"{% endif %}>SAMPLES</a></li>
           <li><a href="/iot-use-cases/" {% if site.data[foundTOC].bigheader == "Use cases" %}class="YAH"{% endif %}>USE CASES</a></li>

community.html

@@ -13,9 +13,9 @@ <h1>Community</h1>
 <section id="mainContent">
 	<main>
 		<div class="content">
-			<h3>Ensuring Thingsboard works well everywhere and for everyone.</h3>
-			<p>Connect with the Thingsboard community on our <a href="https://gitter.im/thingsboard/chat">Gitter channel</a> or join the
-				<a href="https://groups.google.com/forum/#!forum/thingsboard">Thingsboard Google group</a>.
+			<h3>Ensuring ThingsBoard works well everywhere and for everyone.</h3>
+			<p>Connect with the ThingsBoard community on our <a href="https://gitter.im/thingsboard/chat">Gitter channel</a> or join the
+				<a href="https://groups.google.com/forum/#!forum/thingsboard">ThingsBoard Google group</a>.
 		</div>
 		<div class="content">
 			<h3>Events</h3>
@@ -30,7 +30,7 @@ <h3>Events</h3>
 <section id="talkToUs">
 	<main>
 		<h3>Talk to Us!</h3>
-		<h4>We would love to hear from you, how you are using Thingsboard,<br> and what we can do to make it better.</h4>
+		<h4>We would love to hear from you, how you are using ThingsBoard,<br> and what we can do to make it better.</h4>
 		<div id="bigSocial">
 			<div>
 				<a href="https://twitter.com/thingsboard">@thingsboard</a>
@@ -46,7 +46,7 @@ <h4>We would love to hear from you, how you are using Thingsboard,<br> and what
 			</div>
 			<div>
 				<a href="http://stackoverflow.com/questions/tagged/thingsboard">Stack Overflow</a>
-				<p>The Thingsboard team will also monitor posts tagged thingsboard. If there aren’t any existing questions that help, please ask a new one!</p>
+				<p>The ThingsBoard team will also monitor posts tagged thingsboard. If there aren’t any existing questions that help, please ask a new one!</p>
 			</div>
 		</div>
 	</main>

docs/api.md

@@ -1,22 +1,22 @@
 ---
 layout: docwithnav
-title: Thingsboard API reference
-description: Thingsboard API reference and supported IoT Protocols
+title: ThingsBoard API reference
+description: ThingsBoard API reference and supported IoT Protocols
 
 ---
 
-Thingsboard API consist of two main parts: device API and server-side API. 
+ThingsBoard API consists of two main parts: device API and server-side API.
 
 Device API is grouped by supported communication protocols:
 
 * [**MQTT API**](/docs/reference/mqtt-api)
 * [**CoAP API**](/docs/reference/coap-api)
 * [**HTTP API**](/docs/reference/http-api)
 
-[**Gateway MQTT API**](/docs/reference/gateway-mqtt-api) allows you to connect **existing** devices to the platform using **[Thingsboard Gateway](/docs/iot-gateway/what-is-iot-gateway/)** 
+[**Gateway MQTT API**](/docs/reference/gateway-mqtt-api) allows you to connect **existing** devices to the platform using **[ThingsBoard Gateway](/docs/iot-gateway/what-is-iot-gateway/)**
 or implement your own gateway.
 
-Server-side API consist of core REST API and a set of specific APIs that are provided by various plugins:
+Server-side API consists of core REST API and a set of specific APIs that are provided by various plugins:
 
 * [**Administration REST API**](/docs/reference/rest-api) - The server-side core APIs.
 * [**Attributes query API**](/docs/user-guide/attributes/#data-query-api) - The server-side APIs provided by [Telemetry plugin](/docs/reference/plugins/telemetry/).