Skip to content

[trivial] Fix markdown, links and help messages #7136

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Dec 1, 2015
Merged

[trivial] Fix markdown, links and help messages #7136

merged 5 commits into from
Dec 1, 2015

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 30, 2015

No description provided.

laanwj
laanwj reviewed Nov 30, 2015
View reviewed changes
src/wallet/rpcwallet.cpp
@@ -2174,7 +2174,7 @@ UniValue settxfee(const UniValue& params, bool fHelp)
if (fHelp || params.size() < 1 || params.size() > 1)
throw runtime_error(
"settxfee amount\n"
"\nSet the transaction fee per kB.\n"
"\nSet the transaction fee per kB. (Overwrites the paytxfee parameter)\n"
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Either

  • "Set the transaction fee per kB (overwrites the paytxfee parameter)." or
  • "Set the transaction fee per kB. (Overwrites the paytxfee parameter.)"

(http://english.stackexchange.com/questions/6632/where-does-the-period-go-when-using-parentheses)

Copy link
Member Author

Choose a reason for hiding this comment

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

Maybe?

-            "\nSet the transaction fee per kB.\n"
+            "\nSet the transaction fee per kB. Overwrites the paytxfee parameter.\n"

Copy link
Member

Choose a reason for hiding this comment

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

Great

@laanwj laanwj added the Docs label Nov 30, 2015
@maflcko maflcko force-pushed the MarcoFalke-2015-trivial5 branch from fa5e844 to fa19a58 Compare November 30, 2015 17:03
@paveljanik
Copy link
Contributor

ACK

@laanwj laanwj merged commit fa19a58 into bitcoin:master Dec 1, 2015
laanwj added a commit that referenced this pull request Dec 1, 2015
@laanwj
Merge pull request #7136
8f761e8 
fa19a58 HelpMessage: Don't hide -mintxfee behind showDebug (MarcoFalke)
faffc17 rpcwallet: Clarify what settxfee does (MarcoFalke)
9999cb0 Fix url in .travis.yml (MarcoFalke)
fa22a10 contrib: Del. gitian downloader config and update gitian README (MarcoFalke)
fad3035 [doc] Minor markdown fixes (MarcoFalke)
@maflcko maflcko deleted the MarcoFalke-2015-trivial5 branch December 1, 2015 12:52
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 1, 2015
@luke-jr
[doc] Minor markdown fixes
5abca6d 
Github-Pull: bitcoin#7136
Rebased-From: fad3035
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 1, 2015
@luke-jr
contrib: update gitian README
6f64bfb 
Github-Pull: bitcoin#7136
Rebased-From: fa22a10
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 1, 2015
@luke-jr
Fix url in .travis.yml
f711635 
Github-Pull: bitcoin#7136
Rebased-From: 9999cb0
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
@luke-jr
[doc] Minor markdown fixes
9e26e8a 
Github-Pull: bitcoin#7136
Rebased-From: fad3035
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
@luke-jr
contrib: update gitian README
17966ac 
Github-Pull: bitcoin#7136
Rebased-From: fa22a10
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
@luke-jr
Fix url in .travis.yml
f41b28e 
Github-Pull: bitcoin#7136
Rebased-From: 9999cb0
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Feb 26, 2016
Fix url in .travis.yml
dc9ae4c 
Github-Pull: bitcoin#7136
Rebased-From: 9999cb0
laanwj pushed a commit that referenced this pull request Mar 1, 2016
@laanwj
Fix url in .travis.yml
a0e13f0 
Github-Pull: #7136
Rebased-From: 9999cb0
dexX7 pushed a commit to dexX7/bitcoin that referenced this pull request Apr 24, 2016
@dexX7
Fix url in .travis.yml
5fc92e9 
Github-Pull: bitcoin#7136
Rebased-From: 9999cb0
tempgit9 pushed a commit to tempgit9/bitcoin that referenced this pull request Jan 16, 2017
@romanornr
Merge remote-tracking branch 'bitcoin/0.10' (bitcoin#42)
66c5ffb 
* Fix url in .travis.yml

Github-Pull: bitcoin#7136
Rebased-From: 9999cb0

* Workaround Travis-side CI issues

Github-Pull: bitcoin#7487
Rebased-From: 149641e c01f08d 5d1148c 1ecbb3b

* [depends] builders: No need to set -L and --location for curl

Github-Pull: bitcoin#7606
Rebased-From: fa7a5c5

* Bugfix: gitian: Add curl to packages (now needed for depends)

Conflicts:
	contrib/gitian-descriptors/gitian-osx.yml
Github-Pull: bitcoin#7614
Rebased-From: 5c70a6d
@str4d str4d mentioned this pull request Oct 29, 2017
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Nov 30, 2017
@zkbot
Auto merge of #2697 - str4d:darwin-build, r=<try>
b2399c1 
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114
zkbot added a commit to zcash/zcash that referenced this pull request Nov 30, 2017
@zkbot
Auto merge of #2697 - str4d:darwin-build, r=str4d
d3ca270 
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114
zkbot added a commit to zcash/zcash that referenced this pull request Nov 30, 2017
@zkbot
Auto merge of #2697 - str4d:darwin-build, r=str4d
02c4467 
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114
@str4d str4d mentioned this pull request Dec 17, 2019
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Dec 18, 2019
@zkbot
Auto merge of #4268 - str4d:2074-cleanup-2, r=str4d
577f7ef 
Bitcoin 0.12 cleanup PRs 2

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6631
- bitcoin/bitcoin#6664
  - Only the first commit (we already had the second through bitcoin/bitcoin#6825).
- bitcoin/bitcoin#6669
- bitcoin/bitcoin#6887
  - Only the non-QT parts.
- bitcoin/bitcoin#6962
- bitcoin/bitcoin#6822
  - Only first and third commits (we already had the second through an earlier PR).
- bitcoin/bitcoin#7136
  - Excludes Travis CI changes, and fixes to documents we don't have anymore.
- bitcoin/bitcoin#7084
- bitcoin/bitcoin#7509
- bitcoin/bitcoin#7617
- bitcoin/bitcoin#7726

Part of #2074.
reddink pushed a commit to reddcoin-project/reddcoin-3.10 that referenced this pull request May 27, 2020
@reddink
Fix url in .travis.yml
3618ea7 
Github-Pull: bitcoin#7136
Rebased-From: 9999cb0
(cherry picked from commit dc9ae4c)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Docs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@maflcko @paveljanik @laanwj