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

Move most Salt docs in tree #549

Merged
merged 1 commit into from Jan 10, 2017
Merged

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Dec 8, 2016

This also includes Vagrant information,
and should cover all the steps of a normal Salt workflow.

This does not (yet) include information about
setting up new Salt masters/minions,
or how to restart various services cleanly after a deploy.

r? @edunham @larsbergstrom
cc @Ms2ger per this comment


This change is Reviewable

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Dec 13, 2016

I think I'm generally OK with this.

@edunham what do you think?

@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

The latest upstream changes (presumably #547) made this pull request unmergeable. Please resolve the merge conflicts.

@aneeshusa aneeshusa force-pushed the aneeshusa:move-docs-in-tree branch from 7126cc7 to fa13090 Dec 23, 2016
@edunham
Copy link
Contributor

edunham commented Jan 10, 2017

As long as we replace the corresponding wiki docs with pointers to the docs in tree, I'm fine with this.

My only concern is that if we end up with parallel sets of docs on the same topic, one or the other will fall out of date and deciding which to follow becomes an unnecessary burden.

@aneeshusa aneeshusa force-pushed the aneeshusa:move-docs-in-tree branch 2 times, most recently from 5831d39 to 1c758fc Jan 10, 2017
This also includes Vagrant information,
and should cover all the steps of a normal Salt workflow.

This does not (yet) include information about
setting up new Salt masters/minions,
or how to restart various services cleanly after a deploy.

Moving docs in-tree ensures they stay up to date with code changes,
as opposed to having to remember to update the wiki after long
review cycles.
The corresponding sections will be removed from the wiki
and replaced with pointers to the in-tree docs.
@aneeshusa aneeshusa force-pushed the aneeshusa:move-docs-in-tree branch from 1c758fc to ecd13cd Jan 10, 2017
@aneeshusa
Copy link
Member Author

aneeshusa commented Jan 10, 2017

Yes, I'll replace those sections on the wiki with references to the in-tree docs after this merges.

Thanks for looking over this! @bors-servo r=edunham

@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

📌 Commit ecd13cd has been approved by edunham

@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

Testing commit ecd13cd with merge fc95cd5...

bors-servo added a commit that referenced this pull request Jan 10, 2017
Move most Salt docs in tree

This also includes Vagrant information,
and should cover all the steps of a normal Salt workflow.

This does not (yet) include information about
setting up new Salt masters/minions,
or how to restart various services cleanly after a deploy.

r? @edunham @larsbergstrom
cc @Ms2ger per [this comment](#545 (comment))

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/549)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

☀️ Test successful - status-travis

@bors-servo bors-servo merged commit ecd13cd into servo:master Jan 10, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@aneeshusa
Copy link
Member Author

aneeshusa commented Jan 10, 2017

I updated the Buildbot and SaltStack Administration pages on the wiki to remove the duplicate information and add pointers to the in-tree docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.