Skip to content

Merge master into vnext-distribution #429

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

Merged
merged 630 commits into from
Nov 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
630 commits
Select commit Hold shift + click to select a range
3532550
Update index.md
johndmulhausen Oct 19, 2016
9160557
Merge pull request #267 from therobinkim/fix/docker-for-mac
johndmulhausen Oct 19, 2016
8b0e8bd
Fix for issue #273
johndmulhausen Oct 19, 2016
fdb632d
Merge pull request #265 from liubin/liubin-patch-1
johndmulhausen Oct 19, 2016
bb793f2
Merge pull request #175 from dsheets/patch-1
johndmulhausen Oct 19, 2016
cd496a3
Merge pull request #271 from DavidRabel-b1/patch-1
johndmulhausen Oct 19, 2016
03cf2e9
Use example.com for documentation
thaJeztah Oct 19, 2016
e06bfbd
Merge pull request #266 from anokun7/patch-1
joaofnfernandes Oct 19, 2016
8effd0d
Merge pull request #279 from thaJeztah/use-example-domain
johndmulhausen Oct 19, 2016
5d9da64
add engine/admin/ansible/
konstruktoid Oct 19, 2016
9c1de96
Add get-started-macvlan.md to TOC
Oct 19, 2016
7830d0c
sudo tee
konstruktoid Oct 19, 2016
cdaef77
Merge pull request #125 from sicwolf/patch-1
Oct 19, 2016
d927155
Merge pull request #230 from afrazkhan/master
Oct 19, 2016
bce5d70
Updates compose install to 1.8.1
Oct 19, 2016
a38600a
Merge pull request #284 from joaofnfernandes/bump-compose
joaofnfernandes Oct 20, 2016
f5f1817
Fix link: step2 -> part2
char101 Oct 20, 2016
5c511ac
Merge pull request #286 from char101/patch-1
johndmulhausen Oct 20, 2016
60c9df3
Merge pull request #282 from mstanleyjones/add_macvlan_to_toc
johndmulhausen Oct 20, 2016
bd630e9
Update dockerlinks.md
johndmulhausen Oct 20, 2016
f26106b
Update index.md
johndmulhausen Oct 20, 2016
4a8842a
Update 1_introduction.md
thomas-bauer Oct 20, 2016
be4879b
Merge pull request #291 from thomas-bauer/patch-1
Oct 20, 2016
67cca0c
Merge pull request #281 from konstruktoid/admin_ansible
joaofnfernandes Oct 20, 2016
717d643
Additional information about scaling a service
Oct 12, 2016
9540159
Merge pull request #178 from mstanleyjones/swarm_scale_clarifications
Oct 20, 2016
48cb47c
Add plugin dev doc to TOC
Oct 18, 2016
d24399b
Merge pull request #263 from mstanleyjones/252_add_managed_plugin_toc
Oct 20, 2016
e442a21
Update the FAQ for RHEL and Windows
Oct 10, 2016
e4a2991
Merge pull request #146 from mstanleyjones/faq_rhel_version
Oct 20, 2016
ca7cc3a
Fix typo in set-up-dev-env.md
rothrock Oct 20, 2016
a2e8bd1
Clarify Hyper-V and VirtualBox info for Docker for Windows
Oct 18, 2016
d56ab93
Merge pull request #256 from mstanleyjones/134_hyperv_virtualbox_conf…
Oct 20, 2016
5095f84
Remove duplicate `to` from glossary.md
donaldali Oct 20, 2016
13e5fa3
Update archlinux.md
krerkkiat Oct 21, 2016
a61c599
remove line numbers from caps link
konstruktoid Oct 21, 2016
f2f8532
fix storage-driver-options 404
konstruktoid Oct 21, 2016
ec7a9e0
Shorten the templates a bit
Oct 21, 2016
3add12f
Update ISSUE_TEMPLATE.md
Oct 21, 2016
8341768
fix: Moving sudo command after echo pipe
Oct 21, 2016
5435bfd
Update device-mapper-driver.md
johndmulhausen Oct 21, 2016
d58ed78
Merge pull request #305 from konstruktoid/issue_237
johndmulhausen Oct 21, 2016
ab159a1
Merge pull request #308 from mstanleyjones/template_tweaks
Oct 21, 2016
dd97dfa
Fixes 'undefined' for /engine/extend/
johndmulhausen Oct 21, 2016
e9c423b
Update orgs.md
Oct 21, 2016
cd0f5c4
fix anchor
friism Oct 22, 2016
2f0e83e
Mention limitation of Git LFS not being supported
delitescere Oct 22, 2016
d24834f
fixing typo
4c74356b41 Oct 22, 2016
8ca376c
Update step_three.md due to Docker Hub changes
robeerob Oct 22, 2016
cf1da79
Merge pull request #314 from 4c74356b41/patch-1
johndmulhausen Oct 22, 2016
5415c33
Merge pull request #311 from friism/patch-2
johndmulhausen Oct 22, 2016
bd27f18
Merge pull request #316 from robeerob/patch-1
johndmulhausen Oct 22, 2016
04c0220
Merge pull request #299 from donaldali/patch-1
johndmulhausen Oct 22, 2016
eca697c
Merge pull request #298 from rothrock/patch-1
johndmulhausen Oct 22, 2016
802121e
Merge pull request #309 from dgvigil/master
johndmulhausen Oct 22, 2016
2534200
Merge pull request #302 from krerkkiat/patch-1
johndmulhausen Oct 22, 2016
7b70ec3
Merge pull request #312 from delitescere/patch-1
johndmulhausen Oct 22, 2016
8ac3830
Add aliases to engine/reference/ subdirs for backwards compatible links
weslord Oct 22, 2016
076c060
Removed a space from Dockerfile Best Practices
weslord Oct 23, 2016
641a213
dockerimages.md: fix "gem2.0: command not found"
dusek Oct 23, 2016
550463c
fix formatting of command output
dgellow Oct 23, 2016
1849988
Update index.md
alexandair Oct 23, 2016
1de1d10
At paragraph "links", fixed anchor-link to "depends-on"
Oct 24, 2016
70a274e
Update osxfs.md
mozillalives Oct 24, 2016
f82d05c
Add doc for firewall auto-detection
Oct 21, 2016
3e158df
Update installing-cli.md
wluxion Oct 24, 2016
ae4c0ec
Merge pull request #331 from mozillalives/master
johndmulhausen Oct 25, 2016
97fd3d3
Merge pull request #322 from weslord/dbp-space-removal
johndmulhausen Oct 25, 2016
d17c203
Update install-w-machine.md
johndmulhausen Oct 25, 2016
54c7b2b
Merge pull request #326 from dgellow/patch-1
johndmulhausen Oct 25, 2016
03b2d5b
Merge pull request #318 from weslord/master
johndmulhausen Oct 25, 2016
3ec1386
Merge pull request #330 from SchulteMarkus/patch-1
johndmulhausen Oct 25, 2016
74c1b60
Merge pull request #323 from dusek/fix-gem2.0-not-found
johndmulhausen Oct 25, 2016
ee3d2e8
Merge pull request #283 from konstruktoid/issue_272
johndmulhausen Oct 25, 2016
10b9071
Fix #332
johndmulhausen Oct 25, 2016
0adcc13
Fix #327
johndmulhausen Oct 25, 2016
26f5527
Update toc.yaml
johndmulhausen Oct 25, 2016
e076074
Fix for #290
johndmulhausen Oct 25, 2016
1a9f1fd
Update who-written-for.md
johndmulhausen Oct 25, 2016
7158dab
docker-for-mac/osxfs: clarify the ownership behavior in Beta 29
dsheets Oct 25, 2016
c8544c0
Update installing-cli.md
wluxion Oct 25, 2016
bbefe98
Update README.md
johndmulhausen Oct 25, 2016
415dfd7
updated to incorporate Misty's comments
Oct 25, 2016
16b07b2
Rendering fixes
johndmulhausen Oct 25, 2016
38f84c6
Rendering fixes
johndmulhausen Oct 25, 2016
eac0838
fix formatting
Oct 25, 2016
6e95663
Update dtr/high-availability menu
joaofnfernandes Oct 25, 2016
355898a
Fix formatting
Oct 25, 2016
cba1c5f
Remove bash highlight from dtr/install
joaofnfernandes Oct 25, 2016
100a820
Update gettingstarted.md
londoncalling Oct 25, 2016
a1f68fd
Remove html comment from dtr/install/menu
joaofnfernandes Oct 25, 2016
00511c6
Formatting
Oct 25, 2016
74b93e3
Remove html comment from dtr/install/upgrade/menu
joaofnfernandes Oct 25, 2016
4919a56
Remove html comments from dtr/menu
joaofnfernandes Oct 25, 2016
50d7898
Update gettingstarted.md
londoncalling Oct 25, 2016
c7b0ef4
Remove html comments from dtr/monitor/menu
joaofnfernandes Oct 25, 2016
e65a98e
Update install.md
londoncalling Oct 25, 2016
24b03ff
Remove html comments from dtr/reference/menu
joaofnfernandes Oct 25, 2016
107ae58
Remove html comments from dtr/release-notes/menu
joaofnfernandes Oct 25, 2016
8308f5e
Formatting
Oct 25, 2016
30ad1a3
fix url formatting
Oct 25, 2016
09cd440
Fix code block rendering in dtr/release-notes
joaofnfernandes Oct 25, 2016
0025c41
Remove html comments in dtr/repos/menu
joaofnfernandes Oct 25, 2016
f4de5a7
Remove html comments from dtr/users/menu
joaofnfernandes Oct 25, 2016
434466f
Update FAQ.md
johndmulhausen Oct 25, 2016
458ab09
Formatting
Oct 25, 2016
7fd5e20
Update ps.md
londoncalling Oct 25, 2016
17e2798
Fix syntax highlighting for ucp/configuration
joaofnfernandes Oct 25, 2016
f39d909
Formatting
Oct 25, 2016
3469ca7
Fix syntax highlighting for ucp/configuration
joaofnfernandes Oct 25, 2016
ab90a1d
Fix syntax highlighting for ucp/high-availability
joaofnfernandes Oct 25, 2016
7cb549f
Formatting fixes
johndmulhausen Oct 25, 2016
1611b57
Fix syntax highlighting for ucp/high-availability
joaofnfernandes Oct 25, 2016
aa12830
Fix code formatting
Oct 25, 2016
ca6cc53
Fix syntax highlighting for ucp/installation
joaofnfernandes Oct 25, 2016
50ae057
Formatting fixes
johndmulhausen Oct 25, 2016
be32041
Fix syntax highlighting in ucp/installation
joaofnfernandes Oct 25, 2016
0604850
Fix syntax highlighting in ucp/installation
joaofnfernandes Oct 25, 2016
7df2556
Formatting fixes
johndmulhausen Oct 25, 2016
5d0e42e
Update release-notes.md
londoncalling Oct 25, 2016
25a9bcf
Formatting
Oct 25, 2016
8a32631
Re-fix indentation
Oct 25, 2016
87a5146
Fix syntax highlighting in ucp/installation
joaofnfernandes Oct 25, 2016
36a7eba
Formatting fixes
johndmulhausen Oct 25, 2016
7a0fbcf
Update breaking_changes.md
Oct 25, 2016
ded9bb3
Fix syntax highlighting /ucp/monitor
joaofnfernandes Oct 25, 2016
10026dd
Fix syntax highlighting in ucp/monitor
joaofnfernandes Oct 25, 2016
df6153d
set bash formatting to none to make more readable
Oct 25, 2016
2da3e4e
Fix syntax highlighting ucp/reference
joaofnfernandes Oct 25, 2016
8bd6719
Formatting
Oct 25, 2016
82fe40b
Formatting
Oct 25, 2016
9e5f9d7
Fix table formatting in ucp/reference
joaofnfernandes Oct 25, 2016
61b6244
Add missing dot
Oct 25, 2016
d136af2
Formatting fix
johndmulhausen Oct 25, 2016
ba85535
Update troubleshoot.md
londoncalling Oct 25, 2016
ca21999
Formatting
Oct 25, 2016
ca1ae3f
Fix formatting indentation
Oct 25, 2016
4afc53c
Update opensource.md
londoncalling Oct 25, 2016
26afe3d
Formatting
Oct 25, 2016
18e6fae
Formatting fixes
johndmulhausen Oct 25, 2016
ef0f845
Fix code fence
Oct 25, 2016
f48157d
Update swarm-mode.md
londoncalling Oct 25, 2016
a73288f
Fix list formatting
Oct 25, 2016
d8805c2
Formatting fix
johndmulhausen Oct 25, 2016
bb957c0
Formatting
Oct 25, 2016
454ad15
Three, not four spaces
Oct 25, 2016
dce7847
Formatting fixes
johndmulhausen Oct 25, 2016
4395245
Revert "Clarify Hyper-V and VirtualBox info for Docker for Windows"
londoncalling Oct 25, 2016
6976e59
troubleshooting kramdown issues in a real editor
Oct 25, 2016
a1a183a
Merge pull request #341 from docker/revert-256-134_hyperv_virtualbox_…
londoncalling Oct 25, 2016
c343c03
Merge pull request #342 from sanscontext/ocean-xmpl
Oct 25, 2016
5ea2251
Update code blocks in machine/reference
Oct 25, 2016
9482eca
Merge pull request #343 from joaofnfernandes/machine-reference
joaofnfernandes Oct 25, 2016
8cdd743
incorporated comments from David
Oct 25, 2016
3b75ffe
Merge pull request #338 from dsheets/docker-for-mac-osxfs-chown
londoncalling Oct 25, 2016
9e01974
Merge pull request #336 from wluxion/patch-1
johndmulhausen Oct 25, 2016
a4d2e09
Formatting
Oct 25, 2016
be3e860
Merge pull request #328 from alexandair/patch-1
johndmulhausen Oct 25, 2016
34e383c
Formatting
Oct 25, 2016
a2af398
Improve UCP logging configuration
Oct 25, 2016
0888a73
Merge pull request #239 from vsaraswat/patch-2
joaofnfernandes Oct 25, 2016
77031cb
Update docker/dtr image reference
Oct 25, 2016
ee30fb9
Merge pull request #345 from joaofnfernandes/dtr-reference
joaofnfernandes Oct 25, 2016
796ec3d
incorporated Misty's rewrite from pr#256 with additional info
Oct 25, 2016
c041f74
Merge pull request #340 from KevinTangy/patch-1
johndmulhausen Oct 25, 2016
6131cd6
Merge pull request #346 from londoncalling/clarify-hyperv-virtualbox-…
londoncalling Oct 25, 2016
943940c
added beta 29 release notes for mac and win
Oct 26, 2016
c79c339
Merge pull request #347 from londoncalling/d4mac-d4win-beta29
londoncalling Oct 26, 2016
fe361fb
Updated uninstall.md
ntwrkguru Oct 26, 2016
13e819b
Use the correct service name when linking
Oct 26, 2016
cdbebff
Merge pull request #307 from mstanleyjones/d4w_firewall_detection
Oct 26, 2016
d54bb2e
update tag mapping label, some typo fixes
Oct 26, 2016
25fd57e
update autotest descriptions
Oct 26, 2016
568cded
finishing touches on Wordpress example in Compose docs per pr#129
Oct 26, 2016
43e4f5a
Merge pull request #352 from sanscontext/autotest
Oct 26, 2016
962cc88
Merge pull request #359 from londoncalling/compose-wp-sample
londoncalling Oct 26, 2016
eb84a42
Merge pull request #354 from sanscontext/tag-mapping
Oct 26, 2016
50d5903
updates for multiple email address management
Oct 25, 2016
08d3541
Revert "Doc change to support custom userdata option for docker-machi…
londoncalling Oct 26, 2016
b4d5685
Merge pull request #361 from sanscontext/cloud-3400-multemails
Oct 26, 2016
277e83c
Merge pull request #362 from docker/revert-37-aws-userdata
londoncalling Oct 26, 2016
9c53192
Fixing note formatting
londoncalling Oct 26, 2016
7b04a91
Update index.md
londoncalling Oct 27, 2016
9e96e48
Create subdirectory-based docs archive
johndmulhausen Oct 27, 2016
0dd1cf2
Merge branch 'master' of https://github.com/docker/docker.github.io
johndmulhausen Oct 27, 2016
eec5357
Update index.md
londoncalling Oct 27, 2016
12389d3
Update index.md
londoncalling Oct 27, 2016
870abe5
added a filename above the custom script
michael-wise Oct 27, 2016
05e7b79
add L62-L77
konstruktoid Oct 27, 2016
110d94b
Add missing whitespace
lbausch Oct 27, 2016
db14c15
Add info about using native Docker on win10 and 2016
Oct 24, 2016
cbd51fd
moved windows server 16, windows 10 notes under what to know before y…
Oct 27, 2016
7f47adc
Minor wording & grammar fixes to deploy-infra.md.
rhencke Oct 27, 2016
397a734
Fixed admonitions
Oct 27, 2016
13e79b3
Merge pull request #335 from mstanleyjones/docker_native_win
londoncalling Oct 27, 2016
bda6bc6
Alphabetize daemon config file options
Oct 27, 2016
482007e
Creating robots.txt ahead of time
johndmulhausen Oct 27, 2016
4d6819a
Merge pull request #364 from lbausch/patch-1
johndmulhausen Oct 27, 2016
6cae98a
Merge pull request #350 from KevinTangy/patch-2
johndmulhausen Oct 27, 2016
e0de7a6
Merge pull request #365 from rhencke/patch-1
johndmulhausen Oct 27, 2016
bdd321a
Merge pull request #363 from michael-wise/patch-1
johndmulhausen Oct 27, 2016
0578516
Merge pull request #349 from ntwrkguru/patch-1
johndmulhausen Oct 27, 2016
9560151
Add release notes for 1.12.3-cs3
cpuguy83 Oct 27, 2016
7f620da
Merge pull request #370 from cpuguy83/1.12.3-cs3_notes
joaofnfernandes Oct 27, 2016
1ad261e
fix version typo
cpuguy83 Oct 27, 2016
29b8a26
Merge pull request #371 from cpuguy83/1.12.3-cs3_notes
joaofnfernandes Oct 27, 2016
14a611f
Merge pull request #304 from konstruktoid/issue_294
johndmulhausen Oct 28, 2016
2189da2
Fix quotes on webhook JSON example
joshdover Oct 28, 2016
d69c018
Fix spelling in Getting started, step two
rillig Oct 28, 2016
a553ea8
Merge pull request #377 from rillig/patch-1
johndmulhausen Oct 29, 2016
196a188
dirty COW security event
riyazdf Oct 27, 2016
109a25c
Merge pull request #366 from riyazdf/dirty-cow
thaJeztah Oct 29, 2016
852b8ca
Fix incorrect devicemapper thinpool device name
WeiZhang555 Oct 29, 2016
bf0ca90
Typo "note"
jenglamlow Oct 30, 2016
3701afc
Merge pull request #390 from jenglamlow/patch-1
thaJeztah Oct 30, 2016
345d1b6
Update centos.md
xcellardoor Oct 30, 2016
1257f50
Add another quote
joshdover Oct 31, 2016
e7ab7f7
removed menu.md files
aduermael Oct 31, 2016
321be53
Adding alias to Fix #391
johndmulhausen Oct 31, 2016
1a75a36
Add alias to fix #388
johndmulhausen Oct 31, 2016
d77acbf
update to include cancel button
Oct 31, 2016
3815164
Merge pull request #402 from docker/johndmulhausen-patch-2
johndmulhausen Oct 31, 2016
14037bd
Merge pull request #398 from docker/johndmulhausen-patch-1
johndmulhausen Oct 31, 2016
76a96a7
Merge pull request #386 from WeiZhang555/fix-doc
johndmulhausen Oct 31, 2016
66c3485
Fixes #393
johndmulhausen Oct 31, 2016
b8e2a53
Fixes #401
johndmulhausen Oct 31, 2016
9b052e4
Fix OSX entries to MacOS in TOC
Nov 1, 2016
f79632c
added explanation of performance issues on osxfs from @dsheets post
Oct 29, 2016
8935a4d
Merge pull request #405 from mstanleyjones/404_macos_menu
johndmulhausen Nov 1, 2016
aaf56dc
Move docs to docker-trusted-registry
Nov 1, 2016
3ada658
Merge pull request #374 from joshdover/patch-1
johndmulhausen Nov 1, 2016
3fc3458
Merge pull request #379 from londoncalling/osxfs-performance-issues
Nov 1, 2016
28a16a7
Merge pull request #392 from xcellardoor/patch-1
johndmulhausen Nov 1, 2016
f201f50
Merge pull request #399 from aduermael/master
johndmulhausen Nov 1, 2016
aec9cb3
Add DTR docs with history
Nov 1, 2016
2a696ed
Merge pull request #367 from cavemandaveman/dockerd
johndmulhausen Nov 1, 2016
ef393f2
fixed an on-page link
Nov 1, 2016
ab8bcb7
Merge pull request #413 from londoncalling/osxfs-fix-link
londoncalling Nov 1, 2016
8fa5f3a
absolute links to docs.docker.com are now relative links
aduermael Nov 2, 2016
27d00ce
Merge pull request #418 from aduermael/absolute-links
johndmulhausen Nov 2, 2016
47de0e2
Fix for hash links issue #413
johndmulhausen Nov 2, 2016
1f826f9
Fix regex capture groups syntax
aureliojargas Nov 2, 2016
ba9ea84
fix: Add line breaks before and after code blocks
gokaygurcan Nov 2, 2016
c92d0f3
clarify how to use Windows containers and Windows Server 2016
Nov 2, 2016
0855374
Merge pull request #420 from londoncalling/d4win-server-2016
londoncalling Nov 2, 2016
f4ba4c6
Merge pull request #421 from aureliojargas/patch-1
Nov 2, 2016
7fc3bac
Merge pull request #422 from gokaygurcan/patch-1
johndmulhausen Nov 2, 2016
4965b11
Merge pull request #411 from joaofnfernandes/dtr-2.0
joaofnfernandes Nov 2, 2016
936e228
Merge pull request #403 from sanscontext/cloud-3129-hubcancel
Nov 2, 2016
f64ed1c
Merge master into vnext-distribution
Nov 2, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
31 changes: 31 additions & 0 deletions .NOT_EDITED_HERE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Files and directories here are not edited in the docker.github.io repo.
# Instead, they are edited in the appropriate upstream repo and pulled
# into this repo periodically. The intent is that if you submit a PR
# with changes to these files or directories, a CI job will fail in the
# PR, indicating that it should not be merged.

# If you need to edit these files or directories, submit a PR in one of the
# following repos. The file will probably be located within the docs/ subdirectory.

# docker-trusted-registry: n/a, file an issue
# engine: https://github.com/docker/docker
# compose: https://github.com/docker/compose
# notary: https://github.com/docker/notary
# registry: https://github.com/docker/distribution
# swarm: https://github.com/docker/swarm
# ucp: n/a, file an issue

# Make sure directories have the trailing slash, keep the list alphabetical

apidocs/
compose/reference/
docker-trusted-registry/reference/
engine/deprecated.md
engine/extend/
engine/reference/
machine/reference/
notary/reference/
registry/configuration.md
registry/spec/
swarm/reference/
ucp/reference/
3 changes: 0 additions & 3 deletions .arcconfig

This file was deleted.

6 changes: 0 additions & 6 deletions .babelrc

This file was deleted.

5 changes: 0 additions & 5 deletions .bumpversion.cfg

This file was deleted.

1 change: 0 additions & 1 deletion .dockercfg.template

This file was deleted.

21 changes: 0 additions & 21 deletions .drone.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .editorconfig

This file was deleted.

14 changes: 0 additions & 14 deletions .flowconfig

This file was deleted.

88 changes: 88 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
## Contributing

We value your documentation contributions, and we want to make it as easy
as possible to work in this repository. One of the first things to decide is
which branch to base your work on. If you get confused, just ask and we will
help. If a reviewer realizes you have based your work on the wrong branch, we'll
let you know so that you can rebase it.

>**Note**: To contribute code to Docker projects, see the
[Contribution guidelines](opensource/project/who-written-for).

### Quickstart

If you spot a problem while reading the documentation and want to try to fix it
yourself, click the **Edit this page** link at the bottom of that page. The
page will open in the Github editor, which means you don't need to know a lot
about Git, or even about Markdown.

When you save, you will be prompted to create a fork if you don't already have
one, and to create a branch in your fork and submit the pull request. We hope
you give it a try!

### Overall doc improvements

Most commits will be made against the `master` branch. This include:

- Conceptual and task-based information not specific to new features
- Restructuring / rewriting
- Doc bug fixing
- Typos and grammar errors

One quirk of this project is that the `master` branch is where the live docs are
published from, so upcoming features can't be documented there. See
[Specific new features for a project](#specific-new-features-for-a-project)
for how to document upcoming features. These feature branches will be periodically
merged with `master`, so don't worry about fixing typos and documentation bugs
there.

>Do you enjoy creating graphics? Good graphics are key to great documentation,
and we especially value contributions in this area.

### Specific new features for a project

Our docs cover many projects which release at different times. **If, and only if,
your pull request relates to a currently unreleased feature of a project, base
your work on that project's `vnext` branch.** These branches were created by
cloning `master` and then importing a project's `master` branch's docs into it
(at the time of the migration), in a way that preserved the commit history. When
a project has a release, its `vnext` branch will be merged into `master` and your
work will be visible on docs.docker.com.

The following `vnext` branches currently exist:

- **[vnext-engine](https://github.com/docker/docker.github.io/tree/vnext-engine):**
docs for upcoming features in the [docker/docker](https://github.com/docker/docker/)
project

- **[vnext-compose](https://github.com/docker/docker.github.io/tree/vnext-compose):**
docs for upcoming features in the [docker/compose](https://github.com/docker/compose/)
project

- **[vnext-distribution](https://github.com/docker/docker.github.io/tree/vnext-distribution):**
docs for upcoming features in the [docker/distribution](https://github.com/docker/distribution/)
project

- **[vnext-opensource](https://github.com/docker/docker.github.io/tree/vnext-opensource):**
docs for upcoming features in the [docker/opensource](https://github.com/docker/opensource/)
project

- **[vnext-swarm](https://github.com/docker/docker.github.io/tree/vnext-swarm):**
docs for upcoming features in the [docker/swarm](https://github.com/docker/swarm/)
project

- **[vnext-toolbox](https://github.com/docker/docker.github.io/tree/vnext-toolbox):**
docs for upcoming features in the [docker/toolbox](https://github.com/docker/toolbox/)
project

- **[vnext-kitematic](https://github.com/docker/docker.github.io/tree/vnext-kitematic):**
docs for upcoming features in the [docker/kitematic](https://github.com/docker/kitematic/)
project

## Style guide

If you have questions about how to write for Docker's documentation, please see
the [style guide](https://docs.docker.com/opensource/doc-style/). The style guide provides
guidance about grammar, syntax, formatting, styling, language, or tone. If
something isn't clear in the guide, please submit an issue to let us know or
submit a pull request to help us improve it.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
### Problem description

<!-- Briefly describe the problem that you found. Only documentation issues should be filed here.
For general questions, go to https://forums.docker.com/. -->

### Problem location

<!-- Help us find the problem quickly by choosing one of these. -->

- I saw a problem on the following URL: <URL>

- I couldn't find the information I wanted. I expected to find it near the following URL: <URL>

- Other: <DETAILS>

### Project version(s) affected

<!-- If this problem only affects specific versions of a project (like Docker
Engine 1.13), tell us here. The fix may need to take that into account. -->

### Suggestions for a fix

<!--If you have specific ideas about how we can fix this, let us know. -->


<!-- To improve this template, edit the .github/ISSUE_TEMPLATE.md file -->
33 changes: 33 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
for this project's contribution guidelines. -->

<!--DO NOT edit files and directories listed in .NOT_EDITED_HERE.txt.
These are maintained in upstream repos and changes here will be lost.-->

### Describe the proposed changes

<!-- Tell us what you did and why. You can leave this off if the PR title
is descriptive. The commit message will be added to the end of this form.-->

### Project version

<!-- If this change only applies to a future version of a project (like
Docker Engine 1.13), note that here and base your work on the `vnext-`
branch for your project. -->

### Related issue

<!-- If this relates to an issue or PR in this repo, refer to it like
#1234, or 'Fixes #1234' or 'Closes #1234'. -->

### Related issue or PR in another project

<!-- Links to issues or pull requests in other repositories if applicable. -->

### Please take a look

<!-- At-mention specific individuals or groups who should take a
look at this PR. For instance, @exampleuser123 -->


<!-- To improve this template, edit .github/PULL_REQUEST_TEMPLATE.md. -->
8 changes: 0 additions & 8 deletions .htmllintrc

This file was deleted.

3 changes: 0 additions & 3 deletions .lfsconfig

This file was deleted.

Loading