Commit Graph

13 Commits

Author SHA1 Message Date
21e5eefd8f Removed merge conflict artifacts.
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: e608312677d26f1f5b4f76852917d4f149ef88c1
Component: engine
2014-08-12 15:30:21 -07:00
d0c03fc901 Added fredlf's suggested changes.
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: af5ced62ca604846b5e9ab852c7d47c9c176c702
Component: engine
2014-08-12 15:21:55 -07:00
31a920688e Docs: Fix builds.md line-length + minor typo issues
This PR proposes to fix some already existing (i.e., older)
line-length & line-alignment issues and the ones recently
included/merged with the PR #7406
(https://github.com/docker/docker/pull/7406).

It also proposes to fix a couple minor typography mistakes
(i.e., spelling of GitHub and Service Hooks (headers))

This PR does *not* propose any content changes.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 8b3f2381d0a842bc39c34c39647722fc783d968c
Component: engine
2014-08-09 14:55:47 +03:00
44d7ee420c Made requested changes (capitalization)
Upstream-commit: 4d0527856ca4bd0037313f02a3487845af97330e
Component: engine
2014-08-05 19:06:52 -07:00
98b67bd13a Added "Github Submodules" section to Automated Builds doc.
Signed-off-by: Hollie Teal <hollie.teal@docker.com>
Upstream-commit: bafad8cdc444744069ef005f83bb328c6f8e3b16
Component: engine
2014-08-04 11:12:01 -07:00
62e2ad87d9 Edits based on feedback from docs team.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 358758e99fcfd40508b77b06bb8b53ecdde71a4c
Component: engine
2014-07-11 11:42:29 -07:00
cfffdb552d Added bitbucket hook info and warning re: validating accounts.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: e80d075633d3c642d6640bf2178fedb8891cb97e
Component: engine
2014-07-10 16:51:16 -07:00
8e5e1a569d New screenshots and revisions to builds.md
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: ce9d48e896060d05a78563dce30abfcd5a99c478
Component: engine
2014-07-09 16:43:39 -07:00
f3b4015ccd Initial copy edits to builds.md
Revised to match new UI, fixed links, copy edits and improvements.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

More revisions to builds.md

Corrections to automated build process, copy edits.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

Edits based on Sonat's feedback

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 27c34f3eb93ee58d585f8b792659dc2c0464bd0d
Component: engine
2014-07-08 17:01:41 -07:00
8c2e58dcde Docs: Fix merge issue on docker-hub/builds.md
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: c37b4828dd1062a2e031344a536bf54147481a95
Component: engine
2014-06-08 16:05:07 -07:00
757c6e1688 Initial links
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: ef364f7e1faedddab502cf91c0551154c6c48176
Component: engine
2014-06-08 14:54:32 -07:00
1492ef2c06 Revert "Initial links for Docker Hub rename"
This reverts commit 2819677c215bd409b4ce4da51f0ddfb303760796.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: fad14eda3af8b4ffa59f74dc5c6583d22bcc9471
Component: engine
2014-06-05 14:52:06 -07:00
a1eeb95682 Initial links for Docker Hub rename
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 2819677c215bd409b4ce4da51f0ddfb303760796
Component: engine
2014-06-04 16:48:49 -07:00