Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing preset variables #1104

Merged
merged 3 commits into from
Feb 27, 2020
Merged

Added missing preset variables #1104

merged 3 commits into from
Feb 27, 2020

Conversation

5iver
Copy link
Contributor

@5iver 5iver commented Dec 17, 2019

... and removed incorrect ones.

Signed-off-by: Scott Rushworth [email protected]

Signed-off-by: Scott Rushworth <[email protected]>
@netlify
Copy link

netlify bot commented Dec 17, 2019

Thanks for your pull request to the openHAB documentation! The result can be previewed at the URL below (this comment and the preview will be updated if you add more commits).

Built with commit 7a69a0a

https://deploy-preview-1104--openhab-docs-preview.netlify.com

@Confectrician
Copy link
Contributor

We could also look if we can find something useful in here:
https://v1.vuepress.vuejs.org/guide/markdown.html#markdown-extensions

@Confectrician Confectrician added the Feedback Waiting for feedback label Jan 6, 2020
@ghys ghys changed the base branch from master to 2.5.x February 10, 2020 17:53
@ghys
Copy link
Member

ghys commented Feb 10, 2020

Note: changed the base branch to 2.5.x which is the default for now, and will appear on the production website.
master is now the branch for openHAB 3.x docs.

@openhab/documentation-maintainers
Once this is merged to 2.5.x please remember to merge (for example, cherry-pick the commit) this to master as well if appropriate.
See #1133 for details.

Copy link
Contributor

@Confectrician Confectrician left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now.

Can you do a rebase, to solve the merge conflicts?

@5iver
Copy link
Contributor Author

5iver commented Feb 26, 2020

I've only been using the web UI for this, so I will setup a local repo to rebase or I'll delete it and start over.

@Confectrician
Copy link
Contributor

I have some kind of web interface here for this and could try that too. Before you delete that now.
I just didn't use that so far.

@5iver
Copy link
Contributor Author

5iver commented Feb 27, 2020

I found it... should be resolved now!

@Confectrician Confectrician merged commit a7a3c1a into openhab:2.5.x Feb 27, 2020
ghys added a commit that referenced this pull request Sep 21, 2020
* Update README (2.5.x) (#1153)

Change branch name.

Signed-off-by: Yannick Schaus <[email protected]>

* Update items.md (#1156)

* Added var and VA units to UoM (#1146)

VA (Volt-Ampere - apparent power) and var (Volt-Ampere reactive) are used to measure power and energy consumption in AC circuits.


Signed-off-by: Nagy Attila Gabor <[email protected]>

* Fix filepath to keystore (#1148)

Default openHAB userdata environment variable should be `$OPENHAB_USERDATA`, not `$USER_DATA` shouldn't it? At least, this is the default on my fresh openHABian and also the most popular variant to find in the docs.

* Slight language corrections (#1150)

I think it reads better this way

Signed-off-by: Richard Davies <[email protected]>

* additional example for non default persistence service (#1152)

For me it was confusing how to pass on the serviceId into methods that already had an argument. An extra example is always good.

Signed-off-by: jaco <[email protected]>

* Adding 12 new logos for OH Add-Ons page on website (#1158)

Signed-off-by: bracklanna [email protected]

* Added missing preset variables (#1104)

* Added missing preset variables

Signed-off-by: Scott Rushworth <[email protected]>

* Cleaned up blank lines, fixed table, and added file name for SimpleRule

Signed-off-by: Scott Rushworth <[email protected]>

* Fix broken link (#1165)

* Added Hotlink from "label" section to "state presentation" (#1167)

* Added note about broken action (#1164)

* Added note about broken action

See openhab/openhab-core#1374

Signed-off-by: Christoph Weitkamp <[email protected]>

* Incorporated changes from review

Signed-off-by: Christoph Weitkamp <[email protected]>

* Incorporated changes from review

Signed-off-by: Christoph Weitkamp <[email protected]>

* Update index.md (#1170)

Link appears to be wrong and does not work when I click on it in Edge. Loads the same page again instead of loading the correct new page from the hyperlink.

https://www.openhab.org/docs/developer/guidelines.html

* Added Airthings logo (#1171)

* typo in exambp (#1172)

`Temperature.averageSince(now.minusMinutes(5),"influxdb")`

* file.encoding=UTF-8 (#1173)

* Update demo URL and add demo.rules URL (#1174)

Based on: https://community.openhab.org/t/demo-setup-missing/94850
Old Link is broken leading to 404.
The link to the demo.rules on github is an extra :)

* Replace outdated zulu.org link. (#1177)

* Replace outdated zulu.org link.

As of 3/23/2020 zulu.org has an SSL cert that expired on 9/28/2019. Changed link to azul.com/downloads, since that appears to be the new official source.

Signed-off-by: Billy Stevens <[email protected]>

* Changed all http links to https for installation/index.md.

All changed links working, tested on 3/24/2020.

Signed-off-by: Billy Stevens <[email protected]>

* Minor language tweak (#1178)

* Ending an active scan/stopScan (#1179)

Signed-off-by: Mark Theiding <[email protected]>

* Add files via upload (#1184)

* Update persistence.md (#1185)

Clarify return objects for max/min rules extensions.

Signed-off-by: Ross Kennedy [email protected]

* Update things.md (#1186)

Amended example code to include using label and location when defining a Thing with a bridge that is defined elsewhere.

* Correct typos (#1190)

* Correct usage of its/it's

"It's" is always a contraction of "it is" or "it has".  "Its" is a
possessive.  Correct a few places where they were used backwards.

Signed-off-by: Bjorn Helgaas <[email protected]>

* Correct "Z-Wave" spelling

Per https://www.z-wave.com/, the canonical spelling appears to be "Z-Wave".
Most places use "Z-Wave" already; change the remaining references to match.

Signed-off-by: Bjorn Helgaas <[email protected]>

* Correct typos and grammatical errors

Correct some typos and grammatical errors.

Signed-off-by: Bjorn Helgaas <[email protected]>

* Update sitemap.md section charts (#1191)

I observed that the unique first word in the labels of items charted in a group isn't causing an empty chart anymore. I'm on openHAB 2.5.1.

Signed-off-by: Juergen Baginski [email protected]

* Add image for insteon binding (#1196)

Signed-off-by: Rob Nielsen <[email protected]>

* typo (#1198)

Signed-off-by: Mark Theiding <[email protected]>

* Installation details (#1197)

Added more details around the installation and configuration process.
Fixed that engine no longer logs "Activated scripting support..."

Signed-off-by: Mark Theiding <[email protected]>

* Update sitemaps.md (#1202)

Added full item definition for usage of visibility. See https://community.openhab.org/t/sitemap-visibility-basic-ui/97304/9

* Updated ecobee logo (https://brand.ecobee.com/) (#1203)

Signed-off-by: Rob Nielsen <[email protected]>

* tutorial: Fix description of sitemap 'type' (#1204)

In the tutorial, the generic sitemap description says that ItemType has
to be the same as the type defined in default.items.
Looking at
https://www.openhab.org/docs/configuration/items.html#type and
https://www.openhab.org/docs/configuration/sitemaps.html#element-types
this is incorrect as they take different values.
The example is even mislading as `Switch` is one of the only types which
is common between items and sitemaps. Might be better to describe
`Default` instead.

Signed-off-by: Christophe Fergeau <[email protected]>

* Added information about DateTime Group functions LATEST/EARLIEST (#1206)

Signed-off-by: Christoph Weitkamp <[email protected]>

* Add section for documentation contributions (#1205)

Hopefully this will lower the hurdle for people to submit documentation contributions. I know from myself that I didn't submit various documentation improvements, because I didn't know git and thought it would be a much more involved process. 
Ideally there would be a separate documentation section, but submitting this under the development contribution page for now (as per discussion with @Confectrician in #1179 (comment)).
Note that I am addressing the issue of DCO failures wrt specifying the full name that I ran into myself in #1197 (comment). I found a good discussion of the issue at dcoapp/app#43.

Signed-off-by: Mark Theiding <[email protected]>

* fix typo (#1209)

* add description of Ephemeris localization support (#1210)

Add a new section to describe the localization support and how-to steps

Signed-off-by: Michael Roßner [email protected]

* Line 115 broken link - should be: (#1217)

* Line 115 broken link - should be:

({{base}}/docs/configuration/sitemaps.html#element-types)

was:
({{base}}/configuration/configuration/sitemaps.html#element-types)

* Removed diplicated docs breadcrumb

Signed-off-by: Jerome Luckenbach <[email protected]>

Co-authored-by: Jerome Luckenbach <[email protected]>

* add missing space between words (#1212)

* Update configuration.md (#1215)

I'm a beginner myself. Though I liked this tutorial very much, it took me some time trying and erroring and finally reading forum posts to get behind this. I didn't even know there was something like a more modern ping. So maybe others are happy to learn this right from the beginning.

* Remove architecture from Docker tags (#1220)

Docker automatically detects the architecture and downloads the appropriate image (openhab/openhab-docker#213).
BuildKit will no longer generate new tags having the architecture (openhab/openhab-docker#293).

Signed-off-by: Wouter Born <[email protected]>

* slight readability improvements (#1221)

* slight readability improvements

* Update introduction.md

* Update introduction.md

* minor wording update

* Update eclipse.md (#1225)

Clarifying that it's no longer possible to make changes in the Core Framework for 2.5.x.

Signed-off-by: Mark Theiding <[email protected]>

* [fmiweather] logo for FMI Weather binding (#929)

Signed-off-by: Sami Salonen <[email protected]>

* Update eclipse.md (#1226)

Added additional structure around install, run, debug and update steps. Provided more pointers to interactions with Eclipse, Maven and Git.

Signed-off-by: Mark Theiding <[email protected]>

* Update contributing.md (#1227)

Need to escape \< and \> in the sign off message format so users see them explicitly in the Contributing to the Documentation section. 

Signed-off-by: Mark Theiding <[email protected]>

* Update contributing.md (#1228)

Small refinement on documentation change submission flow. 

Signed-off-by: Mark Theiding <[email protected]>

* Add doc folder to the binding directory structure (#1230)

Signed-off-by: Fabian Wolter <[email protected]>

* Make Subheadings Use Proper Subheading Syntax (#1234)

This way they render out as proper markdown and don't look weird on the website

Signed-off-by: Stefan Zabka <[email protected]>

* Remove unnecessary isCancelled() from code example (#1235)

Cancelling an already canceled task has no effect. IMHO this check is not necesssary and removal would simplify the code. I came to this because I saw this pattern in many bindings during reviewing.

Signed-off-by: Fabian Wolter <[email protected]>

* Update thing-xml.md (#1236)

Signed-off-by: Christoph Weitkamp <[email protected]>

* Fix broken ESH links (#1231)

Signed-off-by: Wouter Born <[email protected]>

* Update logging.md (#1238)

Add information on how to find out the symbolic names of the bundles

* Remove Apache Commons from Default Libraries (#1229)

See openhab/openhab-addons#7722
Signed-off-by: Fabian Wolter <[email protected]>

* Update introduction.md (#1239)

* Update introduction.md

Signed-off-by: Markus Storm [email protected]

* Update introduction.md

* Revise Java recommendations (#1240)

* Revise Java recommendations

* Delete pine.md

Do not recommend PINE, it's not supported any longer by openHABian.

* Removed sidebar link in config

Signed-off-by: Jerome Luckenbach <[email protected]>

Co-authored-by: Jerome Luckenbach <[email protected]>

* Update security.md (#1241)

Been using FreeDNS for many years (ever since all these companies got rid of their free tiers) and never an issue!

* Fix DecimalType hex conversion example (#1243)

See: openhab/openhab-core#1526

Signed-off-by: Wouter Born <[email protected]>

* Fix typo (#1244)

Signed-off-by: Wouter Born <[email protected]>

* Update persistence.md (#1246)

Fixes link to quartz docs page.

* Revision. (#1187) (#1237)

* Revision. (#1187)

- Update of screenshots, removal of old screenshots
- Chapters for better formatting
- Removal of ZWave chapter (one example of adding things should be enough IMHO)
- Adding items in simple mode and in "manual" mode

Signed-off-by: Sascha Billian <[email protected]>

* Use one line per sentence
Signed-off-by: Sascha Billian <[email protected]>

Co-authored-by: Jerome Luckenbach <[email protected]>

* Add notes for configuring Synology Diskstation (#1219)

* Add notes for configuring Synology Diskstation

I have a working set up for SSL enabled remote access on a Synology diskstation, taking advantage of the GUI as much as possible, to ensure automatic renewal of certs from Let's Encrypt, etc. It took me about 8 hours to suss it all out, but it could be achieved in about 30 mins if you knew exactly what to do... may not be widely useful, but since Synology is officially supported, I figured this might be a good addition.

There's also a minor error in the 'allow' masks - these should be 192.168.0.0/24 to allow access to anything in the 192.168.0.xxx range.

* Updated to use one line per sentence

Updated to use one line per sentence - sorry for the delay!

* Update security.md

* Updated for one line per sentence

Updated for one line per sentence

Signed-off-by: Andrew Mills [email protected]

* Bad subnet (#1245)

Nginx warns about low address bits of `192.168.0.1/24` because they are meaningless.
The correct subnet mask should be `192.168.0.0/24`

Signed-off-by: Olivier Béraud <[email protected]>

* Fixed broken images. (#1247)

* Fixed broken images.

Signed-off-by: Jerome Luckenbach <[email protected]>

* Fix image path

Signed-off-by: Jerome Luckenbach <[email protected]>

* [documentation] clarification of representation property (#1248)

* [documentation] clarification of representation property

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] typo

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] adopt suggestions of reviewers

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] commas

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] typo

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] addopted suggestions of @bobadair

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] typo

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentaion] example added back

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentaion] simplified text

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] typo

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* [documentation] adopted reviewer comment

Signed-off-by: Andrew Fiddian-Green <[email protected]>

* Add Alexa mapping along side a channel mapping (#1249)

* Add Alexa mapping along side a channel mapping

It took me a while to find this https://community.openhab.org/t/tagging-devices-for-alexa-support/98155/3 on the Forum and its not clearly documented in the openHAB Amazon Alexa Smart Home Skill or here in Item Metadata.
I originally suggested this as an update to the openHAB Amazon Alexa Smart Home Skill documentaion, but it fits better here, then other integrations using metadata (e.g. HomeKit or Google Assistant) could refer to it as well.

* Update items.md

* Mention defaults for element type setpoint. (#1250)

Mention defaults for min, max and step value for element type setpoint.

Signed-off-by: Thomas Weiler <[email protected]>

* Update index.md (#1251)

I thought 'workl' was probably intended to be 'work'.

* Items - Bedroom_Light written as Light_Bedroom (#1252)

Fix small error which might mislead some readers.

* Added example for time-weighted averages (#1253)

Signed-off-by: Christoph Weitkamp <[email protected]>

* Remove deprecated UIs, Eclipse Marketplace from sidebar

Signed-off-by: Yannick Schaus <[email protected]>

* Update branch name in README

Signed-off-by: Yannick Schaus <[email protected]>

Co-authored-by: Markus Storm <[email protected]>
Co-authored-by: Nagy Attila Gábor <[email protected]>
Co-authored-by: Christoph Thiede <[email protected]>
Co-authored-by: Richard Davies <[email protected]>
Co-authored-by: jwaes <[email protected]>
Co-authored-by: bracklanna <[email protected]>
Co-authored-by: Scott Rushworth <[email protected]>
Co-authored-by: cpmeister <[email protected]>
Co-authored-by: Ross Kennedy <[email protected]>
Co-authored-by: Christoph Weitkamp <[email protected]>
Co-authored-by: Skinah <[email protected]>
Co-authored-by: pali <[email protected]>
Co-authored-by: ljsquare <[email protected]>
Co-authored-by: PatrikG <[email protected]>
Co-authored-by: Elias H <[email protected]>
Co-authored-by: Billy Stevens <[email protected]>
Co-authored-by: theiding <[email protected]>
Co-authored-by: jadcx <[email protected]>
Co-authored-by: Bjorn Helgaas <[email protected]>
Co-authored-by: Jürgen Baginski <[email protected]>
Co-authored-by: robnielsen <[email protected]>
Co-authored-by: GumbyMan82 <[email protected]>
Co-authored-by: Christophe Fergeau <[email protected]>
Co-authored-by: Paulo "JCranky" Siqueira <[email protected]>
Co-authored-by: Michael Rossner <[email protected]>
Co-authored-by: BugSmurF <[email protected]>
Co-authored-by: Jerome Luckenbach <[email protected]>
Co-authored-by: josefscript <[email protected]>
Co-authored-by: Wouter Born <[email protected]>
Co-authored-by: Sami Salonen <[email protected]>
Co-authored-by: Fabian Wolter <[email protected]>
Co-authored-by: Stefan Zabka <[email protected]>
Co-authored-by: TRS-80 <[email protected]>
Co-authored-by: sihui <[email protected]>
Co-authored-by: Andrew Mills <[email protected]>
Co-authored-by: Olivier Béraud <[email protected]>
Co-authored-by: Andrew Fiddian-Green <[email protected]>
Co-authored-by: LeeC77 <[email protected]>
Co-authored-by: Thomas Weiler <[email protected]>
Co-authored-by: garretcook <[email protected]>
Co-authored-by: Michael Fielding <[email protected]>
@5iver 5iver deleted the patch-2 branch September 25, 2020 17:26
@Confectrician Confectrician added this to the 2.x.x milestone Nov 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feedback Waiting for feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants