doc: add default bitcoin.conf locations #16621

GChuf · 2019-08-15T14:34:42Z

Added default bitcoin.conf data directories and paths

hebasto

Concept ACK

doc/bitcoin-conf.md

practicalswift

Concept ACK

doc/bitcoin-conf.md

GChuf · 2019-08-15T17:26:09Z

Updated - dropped italics and changed mac OSX

doc/bitcoin-conf.md

cvengler · 2019-08-15T17:33:31Z

Concept ACK.
Please take a look at this for a better markdown table syntax

hebasto · 2019-08-15T17:46:17Z

s/Mac OSX/macOS/

@Gapeman

... and changed mac OSX

Sorry for being misunderstood. I mean use macOS name only. See: release notes 0.18.

GChuf · 2019-08-15T18:55:31Z

Updated the table and macOS name.
Having troubles with squashing commits.

If it's possible to squash when merging, please do.

doc/bitcoin-conf.md

promag

This is partially documented in https://github.com/bitcoin/bitcoin/blob/master/doc/init.md, I think it's fine repeating it here.

doc/bitcoin-conf.md

practicalswift · 2019-08-16T12:58:45Z

Please squash to one commit :-)

$ git checkout patch-2
$ git rebase -i HEAD~7
# mark all except first as "fixup"
$ git push -f

GChuf · 2019-08-16T14:23:51Z

I had all sorts of problems when squashing. Following @practicalswift instructions did not go well.
head~7 was giving me last 12 commits or so, local branch was different from remote branch.
Anyway, i'm new to git so sorry for all the mess. All should be fine now.

GChuf · 2019-08-18T01:11:15Z

I think everything was addressed and this is ready to be merged, unless people have more proposals.

doc/bitcoin-conf.md

egp · 2019-08-19T14:37:02Z

LGTM

GChuf · 2019-08-19T16:39:34Z

I took the liberty of adding one more line to the end of the file in the latest commit.
I myself was struggling to find example bitcoin.conf file, so I think adding one more link to it might benefit someone.

Added default bitcoin.conf data directories and paths Added example bitcoin.conf link

DrahtBot · 2019-08-24T05:49:05Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

GChuf · 2019-08-25T11:08:15Z

Kindly asking for this PR to be merged, only 10 lines were changed. Thanks

ryanofsky

ACK 1373fa7

practicalswift · 2019-08-26T16:48:18Z

ACK 1373fa7

promag · 2019-08-26T17:22:19Z

ACK

hebasto · 2019-08-26T17:56:30Z

To achieve consistency between docs and the code base, may I suggest to remove Windows XP (< Vista) datadir path from this comment:

bitcoin/src/util/system.cpp

Lines 686 to 690 in adff8fe

    
           fs::path GetDefaultDataDir() 
        
           { 
        
               // Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin 
        
               // Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin 
        
               // Mac: ~/Library/Application Support/Bitcoin

?

It could be just

// Windows: C:\Users\username\AppData\Roaming\Bitcoin
// macOS: ~/Library/Application Support/Bitcoin
...

GChuf · 2019-08-27T00:14:20Z

Not sure about the Windows XP comment, I'll let the others chime in if they will.

GChuf · 2019-08-28T13:03:57Z

I suppose we should merge the PR as it is.

fanquake

ACK 1373fa7 - Already three ACKs and lots of discussion here, so I'm going to merge, and the other comment

bitcoin/src/util/system.cpp

Lines 686 to 690 in adff8fe

    
           fs::path GetDefaultDataDir() 
        
           { 
        
               // Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin 
        
               // Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin 
        
               // Mac: ~/Library/Application Support/Bitcoin

can be fixed later.

1373fa7 doc: add default bitcoin.conf locations (Chuf) Pull request description: Added default bitcoin.conf data directories and paths ACKs for top commit: practicalswift: ACK 1373fa7 ryanofsky: ACK 1373fa7 fanquake: ACK 1373fa7 - Already three ACKs and lots of discussion here, so I'm going to merge, and the other comment Tree-SHA512: 8bb1ed9868c5d171b6791bd6dc9598eddfdf64977d327ff4f333323cef8e3e76b1a67da21e4199f008a12f5610ac6dc6f34f4a13235e8846754eb6d6e5075da4

Summary: Added default bitcoin.conf data directories and paths Added example bitcoin.conf link Backport of Core [[bitcoin/bitcoin#16621 | PR16621]] Test Plan: Proofreading and testing link to example works Reviewers: O1 Bitcoin ABC, #bitcoin_abc, jasonbcox Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, jasonbcox Differential Revision: https://reviews.bitcoinabc.org/D7919

1373fa7 doc: add default bitcoin.conf locations (Chuf) Pull request description: Added default bitcoin.conf data directories and paths ACKs for top commit: practicalswift: ACK 1373fa7 ryanofsky: ACK 1373fa7 fanquake: ACK 1373fa7 - Already three ACKs and lots of discussion here, so I'm going to merge, and the other comment Tree-SHA512: 8bb1ed9868c5d171b6791bd6dc9598eddfdf64977d327ff4f333323cef8e3e76b1a67da21e4199f008a12f5610ac6dc6f34f4a13235e8846754eb6d6e5075da4

fanquake added the Docs label Aug 15, 2019

hebasto requested changes Aug 15, 2019

View reviewed changes

doc/bitcoin-conf.md Outdated Show resolved Hide resolved

practicalswift reviewed Aug 15, 2019

View reviewed changes

doc/bitcoin-conf.md Outdated Show resolved Hide resolved

cvengler reviewed Aug 15, 2019

View reviewed changes

doc/bitcoin-conf.md Outdated Show resolved Hide resolved

practicalswift reviewed Aug 15, 2019

View reviewed changes

doc/bitcoin-conf.md Outdated Show resolved Hide resolved

promag reviewed Aug 15, 2019

View reviewed changes

doc/bitcoin-conf.md Outdated Show resolved Hide resolved

doc/bitcoin-conf.md Outdated Show resolved Hide resolved

GChuf closed this Aug 16, 2019

GChuf deleted the patch-2 branch August 16, 2019 13:08

GChuf restored the patch-2 branch August 16, 2019 13:28

GChuf reopened this Aug 16, 2019

laanwj reviewed Aug 19, 2019

View reviewed changes

doc/bitcoin-conf.md Outdated Show resolved Hide resolved

doc: add default bitcoin.conf locations

1373fa7

Added default bitcoin.conf data directories and paths Added example bitcoin.conf link

ryanofsky approved these changes Aug 26, 2019

View reviewed changes

fanquake approved these changes Aug 29, 2019

View reviewed changes

fanquake merged commit 1373fa7 into bitcoin:master Aug 29, 2019

GChuf deleted the patch-2 branch September 5, 2019 18:32

bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021

	fs::path GetDefaultDataDir()
	{
	// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
	// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
	// Mac: ~/Library/Application Support/Bitcoin

doc: add default bitcoin.conf locations #16621

doc: add default bitcoin.conf locations #16621

Uh oh!

Conversation

GChuf commented Aug 15, 2019

Uh oh!

hebasto left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

practicalswift left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

GChuf commented Aug 15, 2019

Uh oh!

Uh oh!

cvengler commented Aug 15, 2019

Uh oh!

hebasto commented Aug 15, 2019

Uh oh!

GChuf commented Aug 15, 2019

Uh oh!

Uh oh!

promag left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

practicalswift commented Aug 16, 2019

Uh oh!

GChuf commented Aug 16, 2019

Uh oh!

GChuf commented Aug 18, 2019

Uh oh!

Uh oh!

egp commented Aug 19, 2019

Uh oh!

GChuf commented Aug 19, 2019

Uh oh!

DrahtBot commented Aug 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

GChuf commented Aug 25, 2019

Uh oh!

ryanofsky left a comment

Choose a reason for hiding this comment

Uh oh!

practicalswift commented Aug 26, 2019

Uh oh!

promag commented Aug 26, 2019

Uh oh!

hebasto commented Aug 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GChuf commented Aug 27, 2019

Uh oh!

GChuf commented Aug 28, 2019

Uh oh!

fanquake left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DrahtBot commented Aug 24, 2019 •

edited

Loading

hebasto commented Aug 26, 2019 •

edited

Loading