Commit Graph

51566 Commits

Author SHA1 Message Date
Usha Mandya e37e5baa00
Merge pull request #1057 from usha-mandya/desktop-ent-review
bumped headings and other minor updates
2019-04-29 18:11:29 +01:00
usha-mandya fd14806b2f bumped headings by one level + minor updates 2019-04-29 17:56:56 +01:00
Usha Mandya c7a3d608f0
Merge pull request #1055 from usha-mandya/desktop-ent-review
Fix broken cross-refs
2019-04-26 15:35:47 +01:00
usha-mandya 7e17e8011d fix the navigation 2019-04-26 15:22:46 +01:00
usha-mandya 530912e542 Fix broken cross-refs 2019-04-26 15:00:54 +01:00
Usha Mandya a6a174ddc2
Merge pull request #1052 from nigelpoulton/nigel-app-betadocs
Adding APP CLI guide for customer beta2
2019-04-24 11:57:49 +01:00
Nigel Poulton bcb31abfa8 Adding APP CLI guide for customer beta2
Signed-off-by: Nigel Poulton <nigelpoulton@hotmail.com>
2019-04-23 20:20:56 +00:00
Usha Mandya 8718ff5acb
Merge pull request #1046 from usha-mandya/desktop-ent-review
Remove version pack install section
2019-04-18 18:56:39 +01:00
usha-mandya b9a3045976 Remove version pack install section 2019-04-18 18:44:02 +01:00
Usha Mandya f4169b6cac
Merge pull request #1045 from usha-mandya/assemble-docs-1003
Add Assemble docs
2019-04-18 17:44:29 +01:00
usha-mandya 9de0206df5 Update ToC to include Assemble topics 2019-04-18 14:19:12 +01:00
usha-mandya 4a86a4523f Add Assemble docs 2019-04-18 14:05:29 +01:00
Usha Mandya d43f035233
Merge pull request #1041 from usha-mandya/desktop-ent-review
Add OS support statement and fix pending review comments
2019-04-16 14:14:02 +02:00
usha-mandya 0a488035cb Add OS support statement 2019-04-16 13:01:38 +01:00
usha-mandya 9cf1f2d1a5 fix pending review comments 2019-04-15 17:06:38 +01:00
Usha Mandya 46728d9f51
Merge pull request #1036 from usha-mandya/desktop-ent-review
Address review comments on Desktop Enterprise docs
2019-04-11 18:45:53 +02:00
Usha Mandya 696f587fe5
Merge branch 'amberjack' into desktop-ent-review 2019-04-11 18:44:36 +02:00
usha-mandya 316d8fb63b Fix review comments from Mathieu and Guillaume 2019-04-11 18:37:26 +02:00
Ally Smith af03464749
fix image path 2019-04-09 09:11:39 -05:00
usha-mandya 8ad7723c88 Address review comments from Ben and GuillaumeT 2019-04-08 18:41:20 +02:00
Ally Smith 178c8a4d3b
make Jenkinsfile serve private and public docs
After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.
2019-04-03 13:55:44 -05:00
Ally Smith df4abbfc66
Merge pull request #1035 from usha-mandya/desktop-ent-docs
Fix the DDE Overview ToC
2019-04-02 12:11:20 -05:00
usha-mandya 91626c752f Fix the DDE Overview ToC 2019-04-02 17:52:36 +01:00
Alastair Smith 493b5e1e9e update Jenkinsfile 2019-04-02 11:43:18 -05:00
Usha Mandya 6476d5963a
Merge pull request #1033 from usha-mandya/desktop-ent-docs
1010, 1011 - Update user instructions, add new screenshot
2019-04-01 16:44:36 +01:00
usha-mandya 30aa5078c1 1010, 1011 - Update user instructions, add new screenshot 2019-04-01 16:26:12 +01:00
Usha Mandya 40915b94e5
Merge pull request #1032 from usha-mandya/desktop-ent-docs
1013 - Fix ToC indentation, missing images
2019-04-01 11:42:29 +01:00
usha-mandya 3047e6ea89 1013 - Fix ToC indentation, missing images 2019-04-01 11:28:37 +01:00
Alastair Smith 3eac7ba387 fix yaml spacing error 2019-03-29 13:58:55 -05:00
Maria Bermudez 1a6bbf3046
Merge pull request #1031 from usha-mandya/desktop-ent-docs
1013: Move desktop ent content to docs-private
2019-03-29 14:18:19 -04:00
usha-mandya 5fc14e85e5 1013: Move desktop ent content to docs-private 2019-03-29 18:11:40 +00:00
Maria Bermudez 1b6c264762
Fix indentation issue 2019-03-18 10:00:04 -07:00
Maria Bermudez cc4643bf75
Merge pull request #992 from docker/interlock-update
Interlock update
2019-03-18 09:20:13 -07:00
Maria Bermudez d18703bf7c
Incorporate Euan's changes
Add examples for sticky_session_cookie and redirects
2019-03-18 09:18:07 -07:00
paigehargrave 03621d8f89
Moved to interlock-vip info 2019-03-11 16:51:50 -04:00
paigehargrave 1566c5488d
Merge default-backend info here 2019-03-11 16:50:51 -04:00
paigehargrave 4fac6fff57 Raw content addition 2019-03-08 10:17:36 -08:00
Alastair Smith 6590678af0 Merge branch 'published' 2019-03-05 17:26:01 -06:00
Alastair Smith a7f5b34e65 update Jenkinsfile
- echo shell commands removed
- file's now complete for our current needs
2019-03-05 17:24:53 -06:00
Alastair Smith e31204c841 update Jenkinsfile 2019-03-05 17:13:05 -06:00
Alastair Smith 4d3fe4e346 update Jenkinsfile 2019-03-05 17:12:41 -06:00
Alastair Smith 5c4b11a636 update Jenkinsfile 2019-03-05 16:53:30 -06:00
Alastair Smith e95d016a01 Merge branch 'master' of https://github.com/docker/docs-private 2019-03-05 14:29:27 -06:00
Alastair Smith 8e153c0b53 add temporary Jenkinsfile
- Jenkinsfile only contains branch logic and comments
- docker commands will be activated once beta-stage service has been added to docs swarm stack
2019-03-05 14:27:46 -06:00
Alastair Smith 7c55e0b685 update Jenkinsfile 2019-03-04 12:03:18 -06:00
Alastair Smith 5054af7c53 update Jenkinsfile 2019-03-04 12:02:43 -06:00
Alastair Smith c69a30ac0a update Jenkinsfile 2019-03-04 12:01:30 -06:00
Alastair Smith 3064785bea update Jenkinsfile 2019-03-04 11:58:48 -06:00
Alastair Smith 9630e72df9 update Jenkinsfile 2019-03-04 11:56:53 -06:00
Alastair Smith aee0abf88c update Jenkinsfile 2019-03-04 11:24:47 -06:00