Commit Graph

1555 Commits

Author SHA1 Message Date
Anne Henmi d96e5019e0
Merge pull request #7645 from sujaypillai/patch-1
Update ce-ee-node-activate.md
2018-12-26 09:57:00 -07:00
Sebastiaan van Stijn 31d830a534
Remove reference to pre-1.12 standalone swarm
Docker 1.12 and under has reached EOL a long time ago,
and should not be used (as they have unpatched vulnerabilities).

Standalone swarm is now in maintenance mode, so we can probably
remove this reference.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-23 11:26:40 +01:00
L-Hudson 9f800b9c43
Merge pull request #7869 from docker/multiple-logging-drivers-7650
Changed misleading statement on logging drivers
2018-12-21 11:53:18 -05:00
Anne Henmi aa63746990
Update release-notes.md 2018-12-19 15:10:16 -07:00
Anne Henmi f629a75157
Update release-notes.md
Fixed redirect_from: for jekyll so it'll stop complaining.
2018-12-19 15:05:46 -07:00
Anne Henmi 42a5608c16 Initial draft. 2018-12-18 15:18:39 -07:00
Anne Henmi 66d29c9ba6
Merge pull request #7372 from hestellez/patch-1
Propose an alternative ssh command
2018-12-17 14:07:03 -07:00
Anne Henmi 47f4b7d231 Changed misleading statement to "Added functionality for the docker logs command to include the output of multiple logging drivers." 2018-12-17 07:50:46 -07:00
Maria Bermudez be13b49abc
Merge pull request #7698 from thaim/patch-1
fix missing symbol to indicate start of command
2018-12-13 10:42:34 -08:00
Maria Bermudez 4bdcbf8ae9 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-10 12:41:24 -08:00
L-Hudson c886d6d593
Merge pull request #7801 from jonpspri/patch-1
Update https.cnf - Clarify extfile directions
2018-12-07 15:48:24 -05:00
L-Hudson 43a1cb05a4
Update https.md
editorial crx
2018-12-07 15:39:01 -05:00
Maria Bermudez a3589d02d9
Merge pull request #909 from docker/docs-public
Merge Docker Hub content into Master
2018-12-07 10:04:17 -08:00
WeJie 4d67e28b63
Fix wrong command
Should use ` docker service ps nginx` verify the nginx service is fully re-deployed, not `docker service ls nginx`.
2018-12-07 23:22:46 +08:00
Jonathan Springer 9f22f38fa7
Update https.cnf - Clarify extfile directions
Directions around `extfile.cnf` for client certificates was somewhat confusing.  Edited the document to clarify that a separate file was to be created, not append a line to the file that had just been created for the server.
2018-12-06 09:12:55 -05:00
Anne Henmi 71f0dc086c Fixed merge conflict in engine/release-notes.md.
Merge branch 'master' of github.com:docker/docker.github.io
2018-12-05 16:15:41 -07:00
Jeffrey Morgan 5cdb36d5a1 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-03 15:14:51 -05:00
WeJie d63986a46f
Get some miss content back from commit history 2018-12-02 16:19:42 +08:00
Eli Uriegas f65288b5fe Update moby/moby to docker/cli
The cli repository is its own thing now

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-11-30 19:06:31 +00:00
Jeffrey Morgan dacad06fbd Merge branch 'master' into consolidation-changes 2018-11-19 15:41:14 -05:00
thaim 1a2521cbc1 fix missing symbol to indicate start of command 2018-11-16 04:34:04 +09:00
Jasmin Young 78577e776f
Update release-notes.md
Requesting changes to release notes to add 17.06.2-ee-17 per: https://github.com/docker/docker-ee/releases/tag/v17.06.2-ee-17. Addtl reference: 7c0fb4a3e3
2018-11-15 11:03:28 -05:00
Jeffrey Morgan ca4ffb1ee2 Merge branch 'master' into consolidation-changes 2018-11-14 18:30:02 -05:00
Jeffrey Morgan d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
Sujay Pillai 277697e3cb
Update ce-ee-node-activate.md
Updated `docker version` info before and after activation. The engine server has the label "Community" [while using CE] and "Enterprise" after activation.
2018-11-09 14:26:29 +08:00
Darwin Traver e1390a2c53
Typo
Minor typo (bracket needed)
2018-11-08 12:03:10 -05:00
Justin I. Nevill a28d9d8eda
fixed enterpirse 2018-11-07 20:48:53 -05:00
Justin I. Nevill 87a18d5a4c
fixed redirects 2018-11-07 20:44:51 -05:00
Justin I. Nevill 420a1ef836
Update release-notes.md 2018-11-07 20:41:42 -05:00
Maria Bermudez 720b2e8680
Spelling fix 2018-11-07 16:36:48 -08:00
Justin I. Nevill 758952785a
HTML -> MD table w/ fixes 2018-11-07 19:31:39 -05:00
Maria Bermudez 4da484fbe8
Update content_trust.md
Converted table to markdown
2018-11-07 15:56:20 -08:00
Anne Henmi 1755ede5d9
Update content_trust.md
Fixed closing </table> tag.
2018-11-07 15:34:46 -08:00
Justin I. Nevill 2fab90359b
Merge pull request #868 from docker/fix-md-fips
Escaped {{ }} in command output in FIPS.
2018-11-07 15:35:07 -05:00
Maria Bermudez c158840bac Final Go template fixes 2018-11-07 12:30:47 -08:00
Anne Henmi a7e7f2e89a
Update content_trust.md 2018-11-07 10:17:27 -08:00
Anne Henmi ff81152728
Update content_trust.md 2018-11-07 10:16:52 -08:00
Anne Henmi 2791870005
Update content_trust.md 2018-11-07 10:16:11 -08:00
Anne Henmi e87a26decc
Update content_trust.md 2018-11-07 10:11:23 -08:00
Anne Henmi d32723440e
Update content_trust.md 2018-11-07 10:09:17 -08:00
Anne Henmi 902c115d4d
Update content_trust.md 2018-11-07 10:04:44 -08:00
Anne Henmi 36fd87206c
Update content_trust.md 2018-11-07 10:01:22 -08:00
Anne Henmi 2a449f3886 Fixed table, hopefully. 2018-11-07 09:58:57 -08:00
Justin I. Nevill 002c72e75c
Merge pull request #862 from docker/fix-header-grc
Fix merge conflicts in engine relnotes
2018-11-07 12:15:23 -05:00
Justin I. Nevill f70b3589ad
Merge pull request #860 from docker/dtr-ee-upgrade
Dtr ee upgrade
2018-11-06 19:36:48 -05:00
Anne Henmi 03fc305663 Removed merge conflict droppings and cleaned up a bit of formatting. 2018-11-06 14:09:04 -08:00
Maria Bermudez 1cdb109de0 Add new directories for Engine API versions 2018-11-06 13:02:43 -08:00
Maria Bermudez a2c83bf5cd Add best practices info for DTR upgrade, fix spelling issue on Engine release notes 2018-11-06 10:23:23 -08:00
Anne Henmi 9d5dbc0f86 Merge branch 'master' into combine-eng-relnotes-737 2018-11-05 07:27:47 -07:00
Justin I. Nevill d393a90309
Merge pull request #844 from docker/beta-cleanup
Removed Beta disclaimer tags
2018-11-04 13:32:21 -05:00