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

doc: Standardise JSON examples #9884

Merged
merged 2 commits into from
Jan 6, 2015
Merged

Conversation

lorenzleutgeb
Copy link
Contributor

This is mostly whitespace. Fixed:

Expressions for binary data streams (line 468 vs. 1474) remain inconsistent. Could fix that too, if you like.

I can also look at v1.16 if requested.

Fixed:
 * Invalid JSON
 * Inconsistent spacing at colon

Expression for binary data streams (line 468 vs. 1474) remain inconsistent.
Could fix that too, if you like.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
@lorenzleutgeb lorenzleutgeb changed the title Standardise JSON examples doc: Standardise JSON examples Jan 4, 2015
@SvenDowideit
Copy link
Contributor

@FlowLo nice! - can you see how far you get by applying the diff to all the other API docs (ie, make patch using git diff then apply to the other using patch -p1 ?

Docs LGTM @fredlf @jamtur01

@jamtur01
Copy link
Contributor

jamtur01 commented Jan 5, 2015

LGTM

This is:

    git format-patch -1 --stdout HEAD \
    | patch -p1 docs/sources/reference/api/docker_remote_api_v1.*.md

Applying the changes I initially made on the docs for v1.15 to all
other versions led to acceptable results.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
@lorenzleutgeb
Copy link
Contributor Author

@SvenDowideit I used my changes to patch the other files too. Some hunks could not be applied though. My guess would be that's because the docs evolved with the API over time and therefore do not match perfectly. Still the case of invalid JSON was fixed a few times over.

@jessfraz
Copy link
Contributor

jessfraz commented Jan 5, 2015

pretty!!

@jamtur01
Copy link
Contributor

jamtur01 commented Jan 6, 2015

Ping @fredlf

@SvenDowideit
Copy link
Contributor

@FlowLo awesome! merci-much

SvenDowideit added a commit that referenced this pull request Jan 6, 2015
doc: Standardise JSON examples
@SvenDowideit SvenDowideit merged commit ceedace into moby:master Jan 6, 2015
SvenDowideit added a commit to SvenDowideit/docker that referenced this pull request Jan 27, 2015
doc: Standardise JSON examples
(cherry picked from commit ceedace)

Conflicts:
	docs/sources/reference/api/docker_remote_api_v1.17.md

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@users.noreply.github.com> (github: SvenDowideit)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants