Skip to content

Doc improvements to alarm control panel, zwave #3601

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

Merged
merged 4 commits into from
Oct 31, 2017

Conversation

netopiax
Copy link
Contributor

@netopiax netopiax commented Oct 13, 2017

Description: Improving documentation for manual alarm control panel

Pull request in home-assistant (if applicable): N/A

@netopiax netopiax closed this Oct 13, 2017
@netopiax netopiax reopened this Oct 13, 2017
Options.xml isn't needed for network key anymore, it should be set in configuration.yaml. Linked that section back to the main Z-Wave page that explains it.
@netopiax netopiax changed the title Adding examples for notifications, disarming Doc improvements to alarm control panel, zwave Oct 13, 2017
@frenck
Copy link
Member

frenck commented Oct 18, 2017

@netopiax Thank you for this PR.

The pull request referenced in your original post has nothing to do with this documentation change. Could you please provide us the correct corresponding PR on the home-assistant/home-assistant repository?

Secondly, this PR has a merge conflict, if you could take a look at them as well? That would be awesome, thanks!

@frenck frenck added Enhancement Hacktoberfest An PR on this issue (or the PR itself) is eligible towards Hacktoberfest! labels Oct 18, 2017
@netopiax
Copy link
Contributor Author

My fault, I'm new to the process. AFAIK there is no corresponding PR in the home-assistant/home-assistant repository - these were just some doc changes I saw a need for and submitted. I resolved the merge conflict.

Copy link
Member

@fabaff fabaff left a comment

Choose a reason for hiding this comment

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

Thanks 🐦

@fabaff fabaff merged commit 6b9956a into home-assistant:next Oct 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hacktoberfest An PR on this issue (or the PR itself) is eligible towards Hacktoberfest!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants