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
wiki: Move client quick install guide. #1715
Conversation
docs/wiki/Home.md
Outdated
|
||
`cd wiki; git remote add me https://github.com/your-username/dcrdex.wiki.git` | ||
``` | ||
git push wiki `git subtree split --prefix docs/wiki HEAD`:master --force |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool learning about subtree
!
Was looking at docs for the commands and came across tihs:
push <repository> [+][<local-commit>:]<remote-ref>
Does a split using the <prefix> subtree of <local-commit> and then
does a git push to push the result to the <repository> and
<remote-ref>. This can be used to push your subtree to different
branches of the remote repository. Just as with split, if no
<local-commit> is given, then HEAD is used. The optional leading + is
ignored.
Sounds like git subtree push
does a split
and then a git push
. Doesn't that make this command the same as git subtree push -f --prefix docs/wiki wiki HEAD:master
(where HEAD is actually implied if omitted)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does -f force? Testing...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For me -f doesn't work. The subtree commands seem to be limited. So, we force push the changes to our wiki
branch. Forcing because it's easiest.
The commits in the dcrdex wiki also look clean. Here they are after this pr and changes are pushed:
commit fb034729f912cc3b0e50e7705293bb2cf2407108 (HEAD -> master, origin/master, origin/HEAD)
Author: JoeGruff <joegruffins@gmail.com>
Date: Mon Jul 18 17:39:30 2022 +0900
wiki: Move client quick install guide.
commit a30891073d7d646fe2d055e2c15b356d1580d4fe
Author: JoeGruff <joegruffins@gmail.com>
Date: Mon Jul 18 15:13:42 2022 +0900
wiki: Update contributing instructions.
commit 3f0a68ea2897c54c64c9d859b7b7c5575fd4387e (upstream/master)
Author: Jonathan Chappelow <chappjc@users.noreply.github.com>
Date: Fri Jul 8 14:28:02 2022 -0500
Updated Native BTC Wallet Recovery and Rescanning (markdown)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, force is cleanest - just reset the remote ref.
I figured [<options>]
would get passed through to the underlying git commands (i.e. push
), but clearly not.
In that case, yeah, your command looks good. Except lets use $()
evaluation instead of backticks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HEAD was not necessary so removed.
Except lets use $()
ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using $()
.
7e5eaae
to
1c5924f
Compare
`git clone https://github.com/decred/dcrdex.wiki.git wiki` | ||
``` | ||
git remote add wiki https://github.com/your-username/dcrdex.wiki.git | ||
git subtree push --prefix docs/wiki wiki master |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm assuming that wiki master does not yet exist here. I'm not sure tho... Will try to test will a different repo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Trying on a different repo, it looks like master is created with an initial commit. So, delete master and then push.
I think I've added something wierd with commit 5571c0d edit: fixed.. |
eea8eca
to
de0f73f
Compare
Will rebase on top of #1747 |
docs/wiki/Client.mediawiki
Outdated
===Sync Blockchains=== | ||
|
||
Once installed, begin syncing your blockchains. In a new console, run | ||
|
||
<code>cd ~/decred</code> | ||
|
||
<code>./dcrd</code> | ||
|
||
Decred should sync within a couple of hours. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not current advice for a "quick start" guide. Let's direct them to use the native wallets instead.
You can move the RPC wallet instructions somewhere else, but I'm not sure it makes sense to try to describe Decred and Bitcoin together anymore.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated with #1747 so ok?
docs/wiki/Client.mediawiki
Outdated
'''WARNING''': If instead of using '''dcrinstall''' you decide to build from source and | ||
you plan to trade on mainnet, use the <code>release-v0.3</code> branch instead of <code>master</code>. | ||
Furthermore, if you build dcrd and dcrwallet from source, you '''must''' use their | ||
<code>release-v1.7</code> branches, not <code>master</code>. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
release-v1.7.4 for both, right now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an interesting point. The branch for all 1.7.x releases is release-v1.7
while the latest tag will be something like release-v1.7.4
. I've been leaning toward release branches to avoid needing to update the docs for every release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using release-v1.7...
docs/wiki/Client.mediawiki
Outdated
@@ -1,4 +1,63 @@ | |||
==Client (dexc) == | |||
=Guides= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Am I the only one who seriously dislikes mediawiki? Would anything be lost by using md? I guess the nice tables for the various payloads rely on it.
BTW, what's the audience for this page? Before it was some advanced technical docs, which are still at the bottom, but now it begins with some basic setup stuff.
I hope my modifications to the README "quick start" in #1747 aren't off-base, but I feel like I've reduced it to very basics that a prospective user dropping in on the github repo would need. Namely, how to install, how to run and configure, and anything else to keep in mind.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Am I the only one who seriously dislikes mediawiki? Would anything be lost by using md? I guess the nice tables for the various payloads rely on it.
Meh.
BTW, what's the audience for this page? Before it was some advanced technical docs, which are still at the bottom, but now it begins with some basic setup stuff.
I was kind of thinking that too. The page seems to be a catchall for client stuff. I figured we can always break it up later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I figured we can always break it up later
Sounds good. Let's just get things moving. It's just the wiki.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do... you want to do .md? I have absolutely no preference and don't know a whole lot about either.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok to leave this client control mediawiki since it actually uses mediawiki stuff, but might as well keep things markdown if they are already markdown, and new pages should prefer md.
There's just no simple way to render mediawiki without deploying it to a webserver.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Newest comment just makes a new .md
file.
d170789
to
e239331
Compare
e239331
to
40887e8
Compare
The first comment has not changed but second one now makes a new file |
Depends on #1714 atm. Depends on #1747.Part of #1641.