Skip to content

Conversation

altersis
Copy link

Proposed change

Type of change

  • Spelling, grammar or other readability improvements (current branch).
  • Adjusted missing or incorrect information in the current documentation (current branch).
  • Added documentation for a new integration I'm adding to Home Assistant (next branch).
  • Added documentation for a new feature I'm adding to Home Assistant (next branch).
  • Removed stale or deprecated documentation.

Additional information

  • Link to parent pull request in the codebase: #48048
  • Link to parent pull request in the Brands repository: Add unit of measurement #2337
  • This PR fixes or closes issue:

Checklist

  • This PR uses the correct branch, based on one of the following:
    • I made a change to the existing documentation and used the current branch.
    • I made a change that is related to an upcoming version of Home Assistant and used the next branch.
  • The documentation follows the Home Assistant documentation standards.

ludeeus and others added 29 commits March 14, 2021 15:21
Co-authored-by: Joakim Sørensen <joasoe@gmail.com>
Co-authored-by: Franck Nijhof <frenck@frenck.nl>
Co-authored-by: Franck Nijhof <frenck@frenck.nl>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.1 to 1.11.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.11.1...v1.11.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…16990)

second parameter is  temperature instead of dhw_override
* Update verisure documentation for 2fa bug

* fixed textlint suggestions

* Full stops on list items

* Changed title & Removed data

* Changed title and location

* Added details about why to create a new user

* reword steps

* added recommended note style

* Change login to be an action

* typo

* changed login to log in as it's an action

* Changed mypages to My Pages

* Small Tweaks

Co-authored-by: Franck Nijhof <frenck@frenck.nl>
Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
Bumps [textlint](https://github.com/textlint/textlint) from 11.8.2 to 11.8.3.
- [Release notes](https://github.com/textlint/textlint/releases)
- [Commits](https://github.com/textlint/textlint/compare/textlint@11.8.2...textlint@11.8.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@probot-home-assistant probot-home-assistant bot added the in-progress This PR/Issue is currently being worked on label Mar 19, 2021
@probot-home-assistant probot-home-assistant bot added the needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch label Mar 19, 2021
@probot-home-assistant probot-home-assistant bot added the next This PR goes into the next branch label Mar 19, 2021
@probot-home-assistant
Copy link

It seems that this PR is targeted against an incorrect branch. Documentation updates which apply to our current stable release should target the current branch. Please change the target branch of this PR to current and rebase if needed. If this is documentation for a new feature, please add a link to that PR in your description.
(message by DocsTargetBranch)

@klaasnicolaas
Copy link
Member

Please rebase your branch to the next branch, since you have a lot of unrelated commits in your pull request.

@altersis
Copy link
Author

Thanks @klaasnicolaas. My PR is actually just about a single file... don't really understand how all the other commits made it there, as I followed the procedure explained in the developer website (forked from current and pr to next). Will do the rebase sortly.

@altersis altersis closed this Mar 19, 2021
@probot-home-assistant probot-home-assistant bot removed needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch in-progress This PR/Issue is currently being worked on labels Mar 19, 2021
@klaasnicolaas
Copy link
Member

The commits appear because you cannot merge a branch descending from current (with a pull request) into next. If you create a branch that descends from next then it should be fine next time 😉

@github-actions github-actions bot locked and limited conversation to collaborators Mar 20, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed next This PR goes into the next branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.