Merge gh-pages to master

configuration/items.md

@@ -103,7 +103,7 @@ Available Item types are:
 | Type Name      | Description | Command Types |
 |----------------|-------------|---------------|
 | Color          | Color information (RGB) | OnOff, IncreaseDecrease, Percent, HSB |
-| Contact        | Status of contacts, e.g. door/window contacts | OpenClose |
+| Contact        | Status of contacts, e.g. door/window contacts. Does not accept commands, only status updates. | OpenClosed |
 | DateTime       | Stores date and time | - |
 | Dimmer         | Percentage value for dimmers | OnOff, IncreaseDecrease, Percent |
 | Group          | Item to nest other items / collect them in groups | - |
@@ -113,7 +113,7 @@ Available Item types are:
 | Player         | Allows control of players (e.g. audio players) | PlayPause, NextPrevious, RewindFastforward |
 | Rollershutter  | Roller shutter Item, typically used for blinds | UpDown, StopMove, Percent |
 | String         | Stores texts | String |
-| Switch         | Switch Item, typically used for lights (on/off) | OnOff |
+| Switch         | Switch Item, used for anything that needs to be switched ON and OFF | OnOff |
 
 More details about all of the available Item types and their commands are available under Concepts, see:
 [Item Types Overview]({{base}}/concepts/items.html)

configuration/rules-dsl.md

@@ -30,14 +30,10 @@ It therefore makes sense to have different rule files for different use-cases or
 
 ### IDE Support
 
-The [Eclipse SmartHome Designer]({{base}}/configuration/editors.html#esh-designer) offers support for rules building.
+The [openHAB VS Code Extension]({{base}}/configuration/editors.html#editors.html#openhab-vs-code-extension) offers support for rules building.
 It includes syntax checks and coloring, validation with error markers, content assist (Ctrl+Space) incl. templates etc.
 This makes the creation of rules very easy!
 
-> Bugs:
-> Please note that there are a couple of [open bugs](https://github.com/eclipse/smarthome/issues?q=is%3Aopen+is%3Aissue+label%3ADesigner+label%3Abug) related to the SmartHome Designer.
-> These result in error markers in the Designer, while the rules are executed nicely by the runtime.
-
 ### The Syntax
 
 Note: The rule syntax is based on [Xbase](http://www.eclipse.org/Xtext/#xbase) and as a result it is sharing many details with [Xtend](http://www.eclipse.org/xtend/), which is built on top of Xbase as well.

configuration/sitemaps.md

@@ -454,7 +454,7 @@ See this [Tutorial](https://community.openhab.org/t/13761/1) for more details.
 
 **Technical constraints and details:**
 
-- When using rrd4j persistence, you must use the `everyMinute` (60 seconds) logging strategy.  Otherwise rrd4j thinks that there is no data and will not properly draw the charts.
+- When using rrd4j persistence, the strategy `everyMinute` (60 seconds) has to be used. Otherwise no data will be persisted (stored) and the chart will not be drawn properly (see [rrd4j Persistence](https://www.openhab.org/addons/persistence/rrd4j)).
 - The visibility of multiple Chart objects may be toggled to simulate changing the Chart period; non-visible Chart widgets are NOT generated behind the scenes until they become visible.
 - When charting a group of item, make sure that every label is unique. If the label contains spaces, the first word of the label must be unique. Identical labels result in an empty chart.
 

installation/rasppi.md

@@ -7,7 +7,7 @@ title: Raspberry Pi
 
 # Raspberry Pi
 
-Because of it's **low price**, it's **small form factor** and the **low energy consumption**, the [Raspberry Pi](https://www.raspberrypi.org) is a quite popular platform for openHAB.
+Because of its **low price**, its **small form factor** and the **low energy consumption**, the [Raspberry Pi](https://www.raspberrypi.org) is a quite popular platform for openHAB.
 It is favored amongst existing users and a recommended choice for newcomers.
 
 ![Raspberry Pi 2 Model B](images/rpi2b.png)

installation/windows.md

@@ -37,7 +37,7 @@ On this page, we will be using `C:\openHAB2` as an example.
 The openHAB runtime is distributed using a platform-independent zip file.
 To install it, follow these simple steps:
 
-1.  Choose between the Stable Version [![Download](https://api.bintray.com/packages/openhab/mvn/openhab-distro/images/download.svg)](https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.2.0%2Fopenhab-2.2.0.zip) or the latest Snapshot Version [![Download](https://api.bintray.com/packages/openhab/mvn/openhab-distro/images/download.svg?version=2.3.0)](https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-2.3.0-SNAPSHOT.zip) of openHAB.
+1.  Download the latest Windows Stable or Snapshot ZIP archive file for manual installation from the [Download](https://www.openhab.org/download/) page.
 
 2.  Unzip the file in your chosen directory (e.g. `C:\openHAB2`)
 
@@ -85,14 +85,16 @@ To update manually, download a later version of the openHAB distribution zip fil
     - `userdata\etc\branding-ssh.properties`
     - `userdata\etc\config.properties`
     - `userdata\etc\custom.properties`
+    - `userdata\etc\custom.system.properties`
     - `userdata\etc\distribution.info`
     - `userdata\etc\jre.properties`
+    - `userdata\etc\org.openhab.addons.cfg`
     - `userdata\etc\org.ops4j.pax.url.mvn.cfg`
+    - `userdata\etc\overrides.properties`
     - `userdata\etc\profile.cfg`
     - `userdata\etc\startup.properties`
-    - `userdata\etc\version.properties`
     - `userdata\etc\system.properties`
-    - `userdata\etc\custom.system.properties`
+    - `userdata\etc\version.properties`
     - Any file in `userdata\etc` that starts with `org.apache.karaf`
     - The `userdata\cache` folder
     - The `userdata\tmp` folder