Commit Graph

42329 Commits

Author SHA1 Message Date
John Mulhausen 6725383ede Merge pull request #29 from sanscontext/cloud-fixes
fix bugs/html in cloud docs, remove two draft store docs
2016-10-03 15:36:42 -07:00
LRubin 1928e2d80f fix bugs/html in cloud docs, remove two draft store docs
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-03 15:29:12 -07:00
John Mulhausen d3141e1381 /getting-started/ is a WIP at the moment 2016-10-03 15:17:20 -07:00
Victoria Bialas 27d8cd8193 Merge pull request #28 from londoncalling/d4mac-fixhtmltables
fixes to HTML tables, links, and markdown for proper rendering on git…
2016-10-03 12:39:02 -07:00
Victoria Bialas ece826a0cd fixes to HTML tables, links, and markdown for proper rendering on github.io
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-03 12:37:42 -07:00
John Mulhausen 0a846b57f4 Delete Gemfile 2016-10-03 11:08:52 -07:00
John Mulhausen 72e7523256 Update README.md 2016-10-02 13:56:28 -07:00
John Mulhausen 798359abf8 Update README.md 2016-10-02 13:54:35 -07:00
John Mulhausen a0ee6c6004 Rendering fixes, part 1 (up through cs-engine) 2016-09-30 19:38:30 -07:00
John Mulhausen 39055aeab4 Fix for out-of-sync TOC 2016-09-30 19:00:09 -07:00
John Mulhausen 69ddac1efc Fix for broken link and too-close Feedback box 2016-09-30 18:59:14 -07:00
John Mulhausen b244267e7f Create Gemfile.lock 2016-09-30 18:47:12 -07:00
John Mulhausen f4fd119842 Move of cloud-api-docs 2016-09-30 18:44:57 -07:00
John Mulhausen 9c299f5238 Pic fix 2016-09-30 18:13:45 -07:00
John Mulhausen c35362633c Fixes for snippets in lists 2016-09-30 16:41:43 -07:00
John Mulhausen 79fb2534f2 Fix for snippet-within-list 2016-09-30 16:22:45 -07:00
John Mulhausen 37c8021e42 Fix for nested Docker Engine TOC 2016-09-30 14:30:40 -07:00
John Mulhausen 7c615e83a3 All page links 2016-09-30 14:13:15 -07:00
John Mulhausen 0133cb646d Merge pull request #21 from pborreli/typos
Fixed typos
2016-09-30 11:51:42 -07:00
John Mulhausen 7e8b6603d6 Merge pull request #20 from mstanleyjones/add_migration_readme
Add migration details
2016-09-30 11:30:35 -07:00
Misty Stanley-Jones 6c71c030ab Add migration details 2016-09-30 10:20:01 -07:00
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
John Mulhausen 82d33c504a Delete LICENSE 2016-09-30 00:33:31 -07:00
John Mulhausen 0ad083ff1f Delete Makefile 2016-09-29 23:40:58 -07:00
John Mulhausen d8b7717467 Delete Dockerfile 2016-09-29 23:40:48 -07:00
John Mulhausen 99bab305bd Removing merge detritus 2016-09-29 23:38:12 -07:00
John Mulhausen 843b052401 Fix for in-page anchor links 2016-09-29 22:56:42 -07:00
John Mulhausen 42964d8b7d Removing empty front-matter 2016-09-29 22:39:30 -07:00
John Mulhausen 69b61e1fb9 http only for AWS 2016-09-29 19:43:26 -07:00
John Mulhausen b58c93bb40 Fixes for forwarding, custom 404 2016-09-29 19:39:14 -07:00
John Mulhausen 1465790db0 Custom 404, Docs Archive, Archive Forwarding 2016-09-29 18:55:02 -07:00
Pascal Borreli 6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 9f31bb790d Put back inadvertently deleted compose directory 2016-09-29 12:13:47 -07:00
Misty Stanley-Jones 5f5eb93dfa Moved pinata imported docs to top level subdirectory 2016-09-29 12:11:53 -07:00
Misty Stanley-Jones 3165f14c78 Initial import of https://github.com/docker/pinata 2016-09-29 12:11:03 -07:00
Misty Stanley-Jones 978130dcf4 Moved docs to docker-cloud 2016-09-29 11:35:02 -07:00
Misty Stanley-Jones 15efc2d851 Initial import of https://github.com/docker/cloud-docs 2016-09-29 11:31:42 -07:00
Misty Stanley-Jones 9d5e59d503 Moved engine imported docs to the engine subdirectory 2016-09-29 11:19:31 -07:00
Misty Stanley-Jones 6a54b082a8 Initial import of https://github.com/docker/docker 2016-09-29 11:17:56 -07:00
Misty Stanley-Jones 3134c23b55 Merge pull request #27040 from mstanleyjones/fix_labels_nav_pick
Merge pull request #27036 from mstanleyjones/fix_labels_nav
2016-09-29 11:12:42 -07:00
Misty Stanley-Jones a114655b56 Merge pull request #27036 from mstanleyjones/fix_labels_nav
Fix menu position of the labels-custom-metadata.md topic
(cherry picked from commit a3286783bcfbfd6e58d16e1b189138580b08facc)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-29 11:05:34 -07:00
Misty Stanley-Jones 701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones 4d1a62276e Imitial import of https://github.com/docker/hub2-demo 2016-09-29 10:35:53 -07:00
Sebastiaan van Stijn 88ce3d60b9 Merge pull request #27032 from mstanleyjones/fix_image_link_pick
Merge pull request #27031 from mstanleyjones/fix_broken_image_link
2016-09-29 19:27:49 +02:00
Sebastiaan van Stijn ed69445474 Merge pull request #27031 from mstanleyjones/fix_broken_image_link
Revert "Add direct link to event chart image"
(cherry picked from commit 6f07a4a69b17d6a1bf902a5ec30ad046645e9c23)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-29 10:23:10 -07:00
Sebastiaan van Stijn cd15b2b300 Merge pull request #27022 from thaJeztah/docs-cherry-picks-1.12.2
Docs cherry picks 1.12.2
2016-09-29 17:58:12 +02:00
Misty Stanley-Jones 68aca71637
Fix link to non-existent file
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ca04f02d7655e7306c7c0cde6fa1895a14f0a673)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:29:07 +02:00
Victoria Bialas 735622fdf4
added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:29:00 +02:00
Sebastiaan van Stijn ca474f7808
Fix incorrect aux-address examples and test
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fd7161bb3061e2e2f56faed1a4ba1f7a887627bf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:28:52 +02:00