Skip to content
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

document the config options #2974

Merged
merged 3 commits into from
Jul 19, 2016
Merged

document the config options #2974

merged 3 commits into from
Jul 19, 2016

Conversation

whyrusleeping
Copy link
Member

cc @RichardLitt @lgierth @Kubuxu

License: MIT
Signed-off-by: Jeromy [email protected]

@Kubuxu
Copy link
Member

Kubuxu commented Jul 16, 2016

Option added in: #2973 is missing as well as #2904.

```

## `API`
Contains information used by the api gateway.
Copy link
Member

Choose a reason for hiding this comment

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

Capitalize API consistently. Same for HTTP.

@RichardLitt
Copy link
Member

Added some small comments. Mostly good.

Add a Table of Contents.

@whyrusleeping
Copy link
Member Author

@RichardLitt PRs welcome ;)

@RichardLitt
Copy link
Member

I am really unhappy, because I have no idea why there is a merge commit in here. I tried this:

$ git branch
> master
$ git checkout feat/config-docs
> merge commit??
$ git checkout <sha of @whyrusleeping's commit>
> on detached branch
$ <edit files>
$ git add -A && git commit -m 'My changes'
> Add stuff
$ git checkout feat/config-docs
> left commit behind
$ git branch new-branch <sha of new commit with edits>
$ git checkout new-branch
$ git rebase feat/config-docs
$ git checkout feat/config-docs
$ git merge new-branch
$ git log
> commit 7866ede31ff2e5177a710600cb02d36a931aa123
Author: Richard Littauer <[email protected]>
Date:   Tue Jul 19 12:40:39 2016 +0100

    Capitalized acronyms, add ToC

    License: MIT
    Signed-off-by: Richard Littauer <[email protected]>

commit f94d1f412626fc1f5c2bb04813306969e30af844
Merge: 0c7ba07 0e4c195
Author: Richard Littauer <[email protected]>
Date:   Tue Jul 19 12:35:16 2016 +0100

    Merge https://github.com/ipfs/go-ipfs into feat/config-docs

commit 0e4c19558fcec59dc69ddab695f55baf094b80c6
Merge: 8fbbd7f 228c4db
Author: Jeromy Johnson <[email protected]>
Date:   Mon Jul 18 06:20:49 2016 -0700

    Merge pull request #2975 from djdv/makefile-win-fix

    Build: Fix Makefile on Windows

commit 0c7ba070293a3e359d340c4be531780aeff63603
Author: Jeromy <[email protected]>
Date:   Sun Jul 17 09:18:20 2016 -0700

    add newer config options and reformat

    License: MIT
    Signed-off-by: Jeromy <[email protected]>

So confused right now.

whyrusleeping and others added 3 commits July 19, 2016 12:51
License: MIT
Signed-off-by: Jeromy <[email protected]>
License: MIT
Signed-off-by: Richard Littauer <[email protected]>
@Kubuxu
Copy link
Member

Kubuxu commented Jul 19, 2016

to fix:

git fetch
git checkout master
git pull
git checkout feat/config-docs
git rebase master

done it already

@RichardLitt
Copy link
Member

Thank you, @Kubuxu

@whyrusleeping
Copy link
Member Author

RFM?

@RichardLitt
Copy link
Member

RFM.

@Kubuxu Kubuxu added the RFM label Jul 19, 2016
@whyrusleeping whyrusleeping merged commit b5fbc01 into master Jul 19, 2016
@whyrusleeping whyrusleeping deleted the feat/config-docs branch July 19, 2016 15:35
@jbenet
Copy link
Member

jbenet commented Aug 28, 2016

  • This is a great to have 👍
  • It could use more examples
  • Or be written as a big json file with comments next to the keys/values (config_doc.js for syntax highlighting) similar to how various sys configs are written
  • reconsider using hson...

@jbenet jbenet mentioned this pull request Aug 28, 2016
58 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants