4c74356b41
d24834fceb
fixing typo
2016-10-22 12:37:05 +03:00
LRubin
e9c423b332
Update orgs.md
...
Turns out, r/w does not give you description edit access.
2016-10-21 16:44:56 -07:00
John Mulhausen
dd97dfaa47
Fixes 'undefined' for /engine/extend/
2016-10-21 15:11:17 -07:00
Misty Stanley-Jones
ab159a17a2
Merge pull request #308 from mstanleyjones/template_tweaks
...
Shorten the templates a bit
2016-10-21 14:34:23 -07:00
John Mulhausen
d58ed7874e
Merge pull request #305 from konstruktoid/issue_237
...
Fix storage-driver-options 404
2016-10-21 14:31:41 -07:00
John Mulhausen
5435bfd362
Update device-mapper-driver.md
2016-10-21 14:31:30 -07:00
LRubin
3add12f17d
Update ISSUE_TEMPLATE.md
...
grammar rewords/simplifications and a typo
2016-10-21 13:51:36 -07:00
Misty Stanley-Jones
ec7a9e0e24
Shorten the templates a bit
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-21 10:42:46 -07:00
Thomas Sjögren
f2f8532ca9
fix storage-driver-options 404
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-21 15:50:11 +02:00
Misty Stanley-Jones
d56ab935d9
Merge pull request #256 from mstanleyjones/134_hyperv_virtualbox_confusion
...
Clarify Hyper-V and VirtualBox info for Docker for Windows
2016-10-20 16:31:51 -07:00
Misty Stanley-Jones
a2e8bd110c
Clarify Hyper-V and VirtualBox info for Docker for Windows
...
Fixes #134
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-20 16:30:54 -07:00
Misty Stanley-Jones
e4a2991808
Merge pull request #146 from mstanleyjones/faq_rhel_version
...
Update the FAQ for RHEL and Windows
2016-10-20 11:32:47 -07:00
Misty Stanley-Jones
e442a215b6
Update the FAQ for RHEL and Windows
...
RHEL 6.5 is not supported
Windows info was way out of date
2016-10-20 11:31:07 -07:00
Misty Stanley-Jones
d24399b7f6
Merge pull request #263 from mstanleyjones/252_add_managed_plugin_toc
...
Add plugin dev doc to TOC
2016-10-20 11:19:35 -07:00
Misty Stanley-Jones
48cb47c9e4
Add plugin dev doc to TOC
...
Fixes #252
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-20 11:13:11 -07:00
Misty Stanley-Jones
9540159265
Merge pull request #178 from mstanleyjones/swarm_scale_clarifications
...
Additional information about scaling a service
2016-10-20 11:05:46 -07:00
Misty Stanley-Jones
717d64348b
Additional information about scaling a service
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-20 11:03:36 -07:00
Joao Fernandes
67cca0c72e
Merge pull request #281 from konstruktoid/admin_ansible
...
add engine/admin/ansible/
2016-10-20 10:24:17 -07:00
LRubin
be4879b452
Merge pull request #291 from thomas-bauer/patch-1
...
Fixed typo in 1_introduction.md
2016-10-20 09:36:58 -07:00
thomas-bauer
4a8842ac58
Update 1_introduction.md
...
Fixed a typo
2016-10-20 15:04:11 +02:00
John Mulhausen
f26106b7af
Update index.md
2016-10-19 23:01:03 -07:00
John Mulhausen
bd630e9e3b
Update dockerlinks.md
2016-10-19 22:53:52 -07:00
John Mulhausen
60c9df35d9
Merge pull request #282 from mstanleyjones/add_macvlan_to_toc
...
Add get-started-macvlan.md to TOC
2016-10-19 22:51:38 -07:00
John Mulhausen
5c511ac085
Merge pull request #286 from char101/patch-1
...
Fix link: step2 -> part2
2016-10-19 22:51:13 -07:00
Charles
f5f181737e
Fix link: step2 -> part2
2016-10-20 10:50:57 +07:00
Joao Fernandes
a38600adc5
Merge pull request #284 from joaofnfernandes/bump-compose
...
Updates compose install to 1.8.1
2016-10-19 17:35:48 -07:00
Joao Fernandes
bce5d70ce6
Updates compose install to 1.8.1
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2016-10-19 15:57:43 -07:00
Misty Stanley-Jones
d92715537f
Merge pull request #230 from afrazkhan/master
...
Info about IP 50 needing to be open
2016-10-19 14:52:10 -07:00
Misty Stanley-Jones
cdaef772f8
Merge pull request #125 from sicwolf/patch-1
...
Wrong destination folder in container
2016-10-19 14:50:31 -07:00
Misty Stanley-Jones
9c1de966a7
Add get-started-macvlan.md to TOC
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-19 13:45:14 -07:00
Thomas Sjögren
5d9da643d6
add engine/admin/ansible/
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-19 22:02:26 +02:00
John Mulhausen
8effd0dd38
Merge pull request #279 from thaJeztah/use-example-domain
...
Use example.com for documentation
2016-10-19 12:10:57 -07:00
Joao Fernandes
e06bfbd9bf
Merge pull request #266 from anokun7/patch-1
...
Minor corrections to restore command arguments
2016-10-19 11:29:10 -07:00
Sebastiaan van Stijn
03cf2e9f80
Use example.com for documentation
...
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>
2016-10-19 11:18:39 -07:00
John Mulhausen
cd496a3e36
Merge pull request #271 from DavidRabel-b1/patch-1
...
Update django.md
2016-10-19 10:47:55 -07:00
John Mulhausen
bb793f22d0
Merge pull request #175 from dsheets/patch-1
...
Engine reference BUILD tarball contexts mangled
2016-10-19 10:43:46 -07:00
John Mulhausen
fdb632d304
Merge pull request #265 from liubin/liubin-patch-1
...
fix markdown syntax issue
2016-10-19 10:42:41 -07:00
John Mulhausen
8b0e8bd12f
Fix for issue #273
2016-10-19 10:41:34 -07:00
John Mulhausen
91605575af
Merge pull request #267 from therobinkim/fix/docker-for-mac
...
Fix buggy markdown
2016-10-19 10:40:09 -07:00
John Mulhausen
3532550607
Update index.md
2016-10-19 10:39:49 -07:00
John Mulhausen
3c5a664534
Merge pull request #270 from danix800/fix-codeblock-format
...
Fix codeblock format in swarm/swarm_at_scale/deploy-app.md.
2016-10-19 10:38:00 -07:00
John Mulhausen
41f871d884
Merge pull request #275 from dvoytik/patch-1
...
docs: add one missing blank and remove double blanks
2016-10-19 10:37:19 -07:00
John Mulhausen
2cc28f309f
Merge branch 'master' of https://www.github.com/docker/docker.github.io
2016-10-19 10:22:42 -07:00
John Mulhausen
8b79352c77
Fix for .md URLs
2016-10-19 10:22:32 -07:00
Misty Stanley-Jones
c5fbd4fb6d
Merge pull request #253 from troy0820/work-with-container-edit
...
Misleading steps in work with development container
2016-10-19 09:59:54 -07:00
Troy Connor
693e0a9681
[set-up-dev-env]Added command make BIN_DIR=. shell along with instructions to copy binaries
2016-10-19 12:52:09 -04:00
Misty Stanley-Jones
275c6e6785
Merge pull request #277 from mstanleyjones/fix_markdown_from_261
...
Fix markdown error introduced in #261
2016-10-19 09:35:39 -07:00
Misty Stanley-Jones
a8ab9ee8fb
Fix markdown error introduced in #261
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-19 09:29:24 -07:00
Dmitry Voytik
323259f2c4
add one missing blank and remove double blanks
...
add one missing blank and remove double blanks
2016-10-19 17:43:14 +02:00
DavidRabel-b1
673523ee9a
Update django.md
...
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .
See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
2016-10-19 17:07:49 +02:00