Commit Graph

45356 Commits

Author SHA1 Message Date
Ivan Ivanov 3b57a7ca71 FIX Duplicate "are" (#2110)
"on Mac and Windows are are as follows"
Removed the duplicated "are".
2017-03-04 15:06:23 -08:00
Chris Nguyen 5eac979882 Update docker-machine create command (#2099)
The example `docker-machine create` commands show `--create` as an option instead of a command.  If `docker-machine --create` is invoked, the user will receive an error: "Incorrect Usage."
2017-03-03 17:52:55 -08:00
Victoria Bialas ca45058062 Merge pull request #2100 from londoncalling/docs-format-clean-up
clean up code and images
2017-03-03 17:06:18 -08:00
Victoria Bialas 2910fd413e clean up code and images
simplified stack file sample and instructions

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-03 16:51:22 -08:00
John Mulhausen 81de59357a Update overview.md 2017-03-03 13:31:23 -08:00
Ivan Ivanov 4e09a4ab2b 2 small changes (#2091)
"(indicated by the stretch suffix on the version, in this example)"
The example uses jessie, not stretch.

"change the word stable in the > URL to edge"
I do not know why this character ">" appeared, maybe it is a mistake and I have removed it?
2017-03-03 12:15:05 -08:00
travisjs 0647b485c5 Update step_six.md (#2095)
* Update step_six.md

I need to add the -f option to remove image, otherwise: Error response from daemon: conflict: unable to delete e867bc17a0bb (must be forced) - image is referenced in multiple repositories

* Fix for image remove command
2017-03-03 12:12:46 -08:00
Ivan Ivanov 02f2717eed 3 typo changes (#2093)
```bash
    sudo nano /etc/docker/daemon.json
    ```
Here a $ sign is missing and the command in the web site appears as "bash sudo nano /etc/docker/daemon.json", which is not correct. It shoud look like: "$ sudo nano /etc/docker/daemon.json".

"which is 2375 if you do not use TLS, and 2376 if you do."
On all other lines the ports are in backquotes, so I have added backquotes here also.

"In this case, steps 3 and 4."
Missing verb like "repeat", I have added it.
2017-03-03 12:09:25 -08:00
Wang Jie 828814ed7c Update conduct-code.md (#2079)
Add a period (.) to the last sentence.
2017-03-02 21:21:22 -08:00
Wang Jie ba1e0da513 Update find-an-issue.md (#2078)
Change "upstream/master" in step 10 to code style; delete extra spaces after some sentences.
2017-03-02 21:21:08 -08:00
Misty Stanley-Jones dc68f51323 Merge pull request #2076 from mstanleyjones/button_fixes
Lots of formatting fixes to do with buttons
2017-03-02 20:33:01 -08:00
Misty Stanley-Jones bf319251fd Fixed HTML error 2017-03-02 17:02:11 -08:00
Misty Stanley-Jones 8d9e90a6cd Lots of formatting fixes to do with buttons 2017-03-02 15:51:17 -08:00
Victoria Bialas 00d60e3054 Merge pull request #1979 from flemzord/patch-1
Change version for docker-compose
2017-03-02 15:34:02 -08:00
Victoria Bialas 621f92bae6 Merge pull request #2016 from xolotl/patch-1
move system auth description
2017-03-02 15:25:06 -08:00
John Mulhausen a772594b38 Removing span for related glossary topics 2017-03-02 14:15:45 -08:00
John Mulhausen c25ac3e63a Merge pull request #1905 from docker/yamlgloss
Convert Glossary to be procedurally generated from YAML
2017-03-02 14:15:01 -08:00
John Mulhausen 5140d84c50 Syncing w/master 2017-03-02 14:13:43 -08:00
John Mulhausen ae4df25f0c Use new favicon 2017-03-02 14:10:28 -08:00
John Mulhausen 28d269bc37 Merge pull request #2070 from mstanleyjones/move-css
Put temp styles in the right place
2017-03-02 14:08:44 -08:00
John Mulhausen 68a969626e Publish v1.13 archive 2017-03-02 13:48:57 -08:00
John Mulhausen 00337ae26d Update reference.md 2017-03-02 13:32:03 -08:00
Misty Stanley-Jones f55c28d2d0 Put temp styles in the right place 2017-03-02 13:19:17 -08:00
John Mulhausen c98f274423 Revert line-wrap override due to pre/code tag combo 2017-03-02 13:01:48 -08:00
John Mulhausen e571acab56 Merge pull request #2066 from canzanos/patch-1
Update step_four.md
2017-03-02 12:56:37 -08:00
Misty Stanley-Jones ef93f3ecd2 Merge pull request #2068 from mstanleyjones/fix_matrix
Fix platform matrix table
2017-03-02 12:53:19 -08:00
John Mulhausen 3e180370d0 Fix line wrapping for long code samples 2017-03-02 12:52:39 -08:00
Misty Stanley-Jones 1d222c0022 Fix parenthesis 2017-03-02 12:52:09 -08:00
John Mulhausen e601584fa7 Reinstating DDC survey 2017-03-02 12:48:58 -08:00
Misty Stanley-Jones aef34f101c Fix platform matrix table 2017-03-02 12:22:31 -08:00
Victoria Bialas 45627e6ee9 Merge pull request #2063 from londoncalling/cloud-home-page-tweaks
clarified what's standard v. beta mode on cloud docs home page
2017-03-02 11:56:37 -08:00
Paul V. Novarese 668629441f s/Ubuntu/CentOS/ (#2057) 2017-03-02 11:54:56 -08:00
Victoria Bialas 4e7dfb7c85 clarified what's standard v. beta mode on cloud docs home page
added heading and description of Swarm mode below table, tweaked headings

added Swarms screen snap

added a standard mode indicator to infrastructure overview title

re-organized order of topics in table and below

re-wording to swarm topic, added x-refs from d4mac, d4win to cloud topics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-02 11:46:48 -08:00
John Mulhausen 0d24ad1b1b Prevent inline code blocks from line-wrapping 2017-03-02 11:13:32 -08:00
John Mulhausen d01373c6cc Merge pull request #2043 from scjane/patch-37
Update next_steps.md
2017-03-02 11:08:36 -08:00
John Mulhausen a3c926a9f4 Merge pull request #2044 from scjane/patch-38
Update work_issue.md
2017-03-02 11:08:07 -08:00
John Mulhausen 775f11a5a4 Merge pull request #2051 from avsm/d4macwinspace
Fix spacing of summary bar links for Docker for Mac/Windows
2017-03-02 11:07:42 -08:00
John Mulhausen 7f5915dcdd Merge pull request #2047 from ansmirnov/patch-1
Fixed error in link
2017-03-02 11:07:05 -08:00
John Mulhausen a54a0cce8d Merge pull request #2064 from davidxia/patch1
Fix typo in networking docs
2017-03-02 11:06:28 -08:00
John Mulhausen 9c63a00279 Fix for global header 2017-03-02 10:38:52 -08:00
John Mulhausen 56940587a8 Fix for anchor links 2017-03-02 10:35:12 -08:00
Stephen Canzano 74395f9c69 Update step_four.md 2017-03-02 13:31:58 -05:00
David Xia 142e4a95bb
Fix typo in networking docs
should be "nameserver" instead of "server."
2017-03-02 13:23:27 -05:00
Misty Stanley-Jones 774581c998 Merge pull request #2061 from mstanleyjones/fix_d4a
Fix alignment with buttons and headings
2017-03-02 09:36:06 -08:00
Victoria Bialas bfc2883be6 Merge pull request #2060 from londoncalling/d4mac-win-version-output-updates
update output of version and info commands
2017-03-02 09:31:06 -08:00
Victoria Bialas 04b52f9234 update output of version and info commands
added Windows command outputs for version and info

format updates to Windows commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-02 09:12:09 -08:00
Misty Stanley-Jones a840485162 Fix alignment with buttons and headings 2017-03-02 09:03:12 -08:00
Misty Stanley-Jones 987429b217 Merge pull request #2059 from mstanleyjones/fix_yum
Fix yum variables again
2017-03-02 08:38:01 -08:00
Misty Stanley-Jones cc4d70cf78 Fix yum variables again 2017-03-02 08:36:46 -08:00
Victoria Bialas fd9266e536 Merge pull request #2056 from londoncalling/d4mac-win-1703-relnotes
updated, fleshed out 17.03 stable and edge relnotes per actual release
2017-03-02 07:57:36 -08:00