10000 Post docs move by errordeveloper · Pull Request #612 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Post docs move #612

Merged
merged 4 commits into from
May 8, 2015
Merged

Conversation

errordeveloper
Copy link
Contributor

No description provided.

@rade
Copy link
Member
rade commented Apr 28, 2015

There are a few things here and in the broader docs move project that do not quite make sense to me, but perhaps that's just due to lack of explanation...

  1. Why does the README link in https://github.com/weaveworks/weave/wiki/WorkingOnWeave#working-on-docs point at the head rather than https://github.com/weaveworks/weave/tree/latest_release?
  2. I pointed out before that the "Installation Notes" heading in http://docs.weave.works/weave/latest_release/index.html is misleading since it gives the impression that the only two ways to install weave is via boot2docker and systemd. I'd bury that information; it has no place on the main docs page. Instead make the description of the link to the README read "Introduction, Installation and Example".
  3. Where can the docs for the 'master' version be found? Is the idea that we, and any of our users working with snapshots, would simply be looking at the .md files in the repo? That's ok in principle, except that none of the cross-file links work!
  4. https://github.com/weaveworks/weave/wiki/WorkingOnWeave#working-on-docs needs updating.
  5. What is the process for updating the published docs? e.g. when we correct typos and make other improvements. We need to be able to do that.

@errordeveloper
Copy link
Contributor Author
  1. I didn't realised that this was documented in the wiki, will update it
  2. I and @fintanr will be reworking the docs soon, but I don't see a reason for making any half-way changes right now
  3. As per Basic automation for publishing documentation #604, the docs for master branch can be found at docs.weave.works/weave/master
  4. see point 1
  5. This question had been raised, which might had been not explicit enough; so in order to update docs for a given release we will need to have those changes checked-in and thereby we will require release branches to accomplish that

@rade
Copy link
Member
rade commented Apr 29, 2015

re 5... we really need that process documented, step-by-step on the wiki. including instructions for how to make a change to the published docs and have the same change go into master. It's probably all just some git command sequences, but they are outside the ordinary day-to-day workflow and hence easy to get wrong.

@rade
Copy link
Member
rade commented Apr 29, 2015

re 2... it's not a half-way change. The bit I am complaining about does not appear at https://github.com/weaveworks/weave#find-out-more; it's something that got introduced elsewhere. You could just remove it.

@rade
Copy link
Member
rade commented May 4, 2015

Incidentally, 5 is already an issue now. A bunch of changes have been made on the 'master' docs which equally apply to the released version and hence really, really should be published on http://docs.weave.works/weave/latest_release/index.html too. So we also need a documented way of backporting docs from master to latest_release.

This uses a special branch `latest_release_doc_updates`, as don't
require docs to be updated in retrospect for releases other then
the latest.
@errordeveloper
Copy link
Contributor Author

@rade c9bff8b adds basic logic for updating docs at docs.weave.works/weave/latest_release/. I am going to update the wiki page to describe the workflow. I also would like to make this update as soon as this pull-request is merged, are all docs on master correct for latest_release at the moment?

@rade
Copy link
Member
rade commented May 6, 2015

re all docs on master correct for latest_release at the moment?

No, if you document how to cherry pick from master to latest_release, I'll do the rest.

@errordeveloper
Copy link
Contributor Author

The wiki should have sufficient information now, and we can always refine that later anyway.

@rade
Copy link
Member
rade commented May 8, 2015

This LGTM. I have fixed a few typos in the docs. All of my points except 2 have been addressed. I've raised #640 for that.

I'd like @paulbellamy to take a look at the mechanics.

@rade rade assigned paulbellamy and unassigned errordeveloper May 8, 2015
* [Features](http://docs.weave.works/weave/latest_release/features.html)
* [Troubleshooting](http://docs.weave.works/weave/latest_release/troubleshooting.html)
* [Building](http://docs.weave.works/weave/latest_release/building.html)
* [How it works](http://docs.weave.works/weave/latest_release/how-it-works.html)
* [Automatic Discovery with WeaveDNS](https://github.com/weaveworks/weave/tree/master/weavedns#readme)

This comment was marked as abuse.

This comment was marked as abuse.

@paulbellamy
Copy link
Contributor

What is the process for updating docs on a previous release? Is that something we need to worry about? Or just make another release (e.g. 0.9.0.1)

@rade
Copy link
Member
rade commented May 8, 2015

What is the process for updating docs on a previous release? Is that something we need to worry about?

We don't.

@errordeveloper
Copy link
Contributor Author

Or just make another release (e.g. 0.9.0.1)

Sort of could, but the idea of latest_release_doc_updates is to keep the process to the minimum. Also, a patch release would give an impression to the user that they have to pull latest binaries, while there is nothing new there for them.

...but I worry this branch will be neglected/forgotten.

Not unlikely, but the worst that can happen is that docs under weave.works/weave/latest_release have some typos of sorts. The only better way I can think of is to move docs to a separate repository which can have a slightly different branching structure to it.

@rade
Copy link
Member
rade commented May 8, 2015

I am completely lost now. I have no idea how latest_release_doc_updates works. Is what gets published under the latest_release URL a merge of the latest_release_doc_updates branch into latest_release?

@errordeveloper
Copy link
Contributor Author

Is what gets published under the latest_release URL a merge of the latest_release_doc_updates branch into latest_release?

A commit with tag latest_release is primary cause of release doc update. Secondary cause is a commit on latest_release_doc_updates.

A tag push would occur as result of someone running bin/release.

To update docs after the release you can either push directly to latest_release_doc_updates branch or make a pull-request to it.

@rade
Copy link
Member
rade commented May 8, 2015

So this whole process relies on ci to be operational at the time a change is pushed?

@errordeveloper
Copy link
Contributor Author

Yes, as otherwise the process would have much more dependencies. We can probably package up a container that developer can use in case CI is screwed, if that worries you.

@paulbellamy
Copy link
Contributor

@ilya:
Ah, ok. I hadn't realized that bin/release was updating the latest_release tag.
I do like having the docs tied into the main repo, as it keeps them in sync with the release process. In practice updating docs separately from a release may not be an issue. Let's wait and deal with that if it becomes a problem.

I'm assuming that the gsutils cp command will also be able to remove files?

@rade:
I'm less worried about depending on the CI being available, because you could just re-run the build when it comes back.

@paulbellamy
Copy link
Contributor

Also, we should back-fill the docs for older releases.

@rade
Copy link
Member
rade commented May 8, 2015

Also, we should back-fill the docs for older releases.

Not bothered. Except, maybe, for 0.10.

@paulbellamy
Copy link
Contributor

Ok, pending the gsutils cp removing files, this LGTM.

@errordeveloper
Copy link
Contributor Author

Not bothered. Except, maybe, for 0.10.

It's there already.

@rade
Copy link
Member
rade commented May 8, 2015

Yes, as otherwise the process would have much more dependencies.

I am not suggesting that we should be able to publish docs when CI isn't operational. But it would be nice if CI picked up any doc changes that may have been pushed while it was down.

@errordeveloper
Copy link
Contributor Author

@paulbellamy yeah, should probably switch to gsutil rsync, but I haven't tested that...

@paulbellamy
Copy link
Contributor

Cool, @errordeveloper pointed out that if nothing links to the files anymore it doesn't matter if they're left around. so this LGTM.

paulbellamy added a commit that referenced this pull request May 8, 2015
@paulbellamy paulbellamy merged commit 9c5323e into weaveworks:master May 8, 2015
paulbellamy added a commit that referenced this pull request May 11, 2015
@rade rade modified the milestone: 0.11.0 May 12, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0