Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.

Add swarm guide to /docs#1513

Merged
skylenet merged 2 commits intomasterfrom
add-swarm-guide
Jun 26, 2019
Merged

Add swarm guide to /docs#1513
skylenet merged 2 commits intomasterfrom
add-swarm-guide

Conversation

@skylenet
Copy link
Copy Markdown
Contributor

@skylenet skylenet commented Jun 25, 2019 •
edited
Loading

Imported from ethersphere/swarm-guide (master@1f8d30f)

Todo after merging:

  • On the readthedocs admin page for the swarm-guide project, change Repository URL to https://github.com/ethersphere/swarm
  • Archive ethersphere/swarm-guide ?

@nonsense
Copy link
Copy Markdown
Contributor

nonsense commented Jun 25, 2019

I personally suggest deleting swarm-guide after the guide is moved, rather than archived.

nonsense
nonsense previously approved these changes Jun 25, 2019
View reviewed changes
@acud
Copy link
Copy Markdown
Contributor

acud commented Jun 25, 2019

agree with @nonsense about swarm-guide. reduce clutter. erase. obliterate.

@acud
Copy link
Copy Markdown
Contributor

acud commented Jun 25, 2019

@skylenet why do we need to commit the build files into the repo? they should be generated on a build hook and published somewhere. i don't see any reason why they should be here. only sources

@skylenet
Copy link
Copy Markdown
Contributor Author

skylenet commented Jun 25, 2019

@skylenet why do we need to commit the build files into the repo? they should be generated on a build hook and published somewhere. i don't see any reason why they should be here. only sources

wow. good catch! cp -r * was a bad idea.

@skylenet
Copy link
Copy Markdown
Contributor Author

skylenet commented Jun 25, 2019

@acud I've deleted the build dir and also created a .gitignore to exclude the build dir.

holisticode
holisticode approved these changes Jun 25, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@holisticode holisticode left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for this, did you also already check how the deployment works? Will the automatic deployment still work after we merge?

@holisticode holisticode requested a review from nonsense June 25, 2019 16:50
@holisticode
Copy link
Copy Markdown
Contributor

holisticode commented Jun 25, 2019

@nonsense there was something which looked like a refresh button, but it actually means "re-request review", that is then what happened and a review has been re-requested to you :) sorry for that.

@skylenet skylenet merged commit 4d66995 into master Jun 26, 2019
@skylenet
Copy link
Copy Markdown
Contributor Author

skylenet commented Jun 26, 2019

https://swarm-guide.readthedocs.io/en/latest/ is now using the source from ethersphere/swarm.

I've also moved recent issues from the swarm-guide to the swarm repo and labeled them with area:docs.

For now I've archived the swarm-guide repo. And will delete it "soon".

@skylenet skylenet mentioned this pull request Jun 26, 2019
Closed
@acud acud deleted the add-swarm-guide branch June 26, 2019 16:29
vojtechsimetka added a commit that referenced this pull request Jul 9, 2019
@vojtechsimetka
Merge branch 'master' into cheques-protocol
43d3cc3 
* master:
  network/newstream: new stream! protocol base implementation (#1500)
  swarm: fix bzz_info.port when using dynamic port allocation (#1537)
  cmd/swarm: make bzzaccount flag optional and add bzzkeyhex flag (#1531)
  cmd/swarm: remove separate function to parse env vars (#1536)
  network/bitvector: Multibit set/unset + string rep (#1530)
  swarm: 0.4.3 unstable (#1526)
  travis: also build on release tags (#1527)
  swarm: release v0.4.2 (#1496)
  network: bump bzz stream hive (#1522)
  docker: update ca-certificates file (#1525)
  Add swarm guide to /docs (#1513)
  network/simulation: Add ExecAdapter capability to swarm simulations (#1503)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@acud acud Awaiting requested review from acud

@nonsense nonsense Awaiting requested review from nonsense

1 more reviewer

@holisticode holisticode holisticode approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@skylenet @nonsense @acud @holisticode