soulshake 5d850a0bb6 Resolve merge conflict, attempt 3 ...

Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net> (github: soulshake)
Upstream-commit: 319a8a241e0b9182ea309b886e2d23e2f4d73c6c
Component: engine

2014-07-21 12:18:59 -07:00

..

ambassador_pattern_linking.md

Adding User Guide

2014-06-01 17:34:07 -04:00

baseimages.md

Replaced selected docs references to ADD with COPY

2014-07-09 17:13:26 -04:00

basics.md

Initial links

2014-06-08 14:54:32 -07:00

certificates.md

Add support for client certificates for registries

2014-06-13 11:13:18 +02:00

cfengine_process_management.md

blindly make all uses of e\.?g\.? into e.g.,

2014-07-01 09:55:19 +10:00

chef.md

Adding User Guide

2014-06-01 17:34:07 -04:00

dsc.md

add DSC article

2014-07-01 17:32:55 -04:00

host_integration.md

Adding User Guide

2014-06-01 17:34:07 -04:00

https.md

Resolve merge conflict, attempt 3

2014-07-21 12:18:59 -07:00

networking.md

Fix typo in networking.md

2014-06-20 07:14:56 -04:00

puppet.md

Adding User Guide

2014-06-01 17:34:07 -04:00

runmetrics.md

Update runmetrics.md

2014-07-18 16:16:19 -05:00

security.md

I'm going to wish I didn't do this

2014-07-03 10:31:56 +10:00

using_supervisord.md

Replaced selected docs references to ADD with COPY

2014-07-09 17:13:26 -04:00