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

Merge master into vnext-distribution #429

Merged
merged 630 commits into from Nov 4, 2016
Merged

Merge master into vnext-distribution #429

merged 630 commits into from Nov 4, 2016

Conversation

mdlinville
Copy link

Describe the proposed changes

Merge master into vnext-distribution to get recent fixes

Project version

distribution-next

Related issue

n/a

Related issue or PR in another project

n/a

Please take a look

@johndmulhausen

johndmulhausen and others added 30 commits October 19, 2016 10:39
Engine reference BUILD tarball contexts mangled
The myenterprise.com domain is actually
a registered domain name (and is hosting
a website), so changing to example.com.
The example.com domain is reserved for documentation
purposes (https://tools.ietf.org/html/rfc2606),
so is safe to use.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Minor corrections to restore command arguments
Use example.com for documentation
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Wrong destination folder in container
Info about IP 50 needing to be open
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
Fixed typo in 1_introduction.md
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Additional information about scaling a service
Fixes #252

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
RHEL 6.5 is not supported
Windows info was way out of date
Update the FAQ for RHEL and Windows
johndmulhausen and others added 25 commits October 31, 2016 16:13
updates per @dsheets comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

copyedits per @dsheets

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Fix quotes on webhook JSON example
added explanation of performance issues on osxfs from @dsheets post
Alphabetize daemon config file options
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Signed-off-by: Adrien Duermael <adrien@duermael.com>
absolute links to docs.docker.com are now relative links
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
clarify how to use Windows containers and Windows Server 2016
Fix regex capture groups syntax
fix: Add line breaks before and after code blocks
Migrates DTR 2.0 docs with history
CLOUD-3129 Docker Hub: update hub docs to include cancel button
@johndmulhausen johndmulhausen merged commit fee22eb into docker:vnext-distribution Nov 4, 2016
@johndmulhausen johndmulhausen self-assigned this Nov 4, 2016
joaofnfernandes pushed a commit to joaofnfernandes/docker.github.io that referenced this pull request Nov 11, 2016
- Close docker#194 and fix
- Fix and close docker#425
- Fix and close docker#417
- Fix and close docker#420
- Fix and close docker#422
- Adding in documentation build scripts
- Fix and close docker#431
- Fix and close docker#438, and Fix and close docker#429
- Work on 441
- Adding in commands reference
- Updating all the options to tables
- Updating per Vivek docker#498
- Adding vivek's last suggestions

Signed-off-by: Mary Anthony <mary@docker.com>
joaofnfernandes added a commit to joaofnfernandes/docker.github.io that referenced this pull request Apr 16, 2018
JimGalasyn pushed a commit that referenced this pull request Apr 16, 2018
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