9c74e272ec
added redirects to d4mac, d4win index pages
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 19:32:00 -08:00
7f5d99a18a
Merge pull request #2213 from londoncalling/d4mac-fix-FAQ-formatting
...
fixed formatting
2017-03-08 19:02:47 -08:00
8c84bee670
fixed formatting
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 18:46:08 -08:00
1ace850d30
Merge pull request #2212 from londoncalling/fix-link-to-restart-in-compose
...
fixed link to Compose v2 restart
2017-03-08 18:40:20 -08:00
a020b82489
fixed link to Compose v2 restart
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 18:26:52 -08:00
5eb8434212
Merge pull request #2211 from londoncalling/voting-app-feedback-on-file-download
...
tip re: Windows encoding errors on file downloads
2017-03-08 18:07:33 -08:00
26f0144dc6
tip re: Windows encoding errors on file downloads
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 17:53:09 -08:00
e6ee1fdcf7
Merge pull request #2208 from docker/londoncalling-patch-2
...
copy-edit, more explanation on command line savvy
2017-03-08 17:35:30 -08:00
051fcffccb
copy-edit, more explanation on command line savvy
2017-03-08 16:54:06 -08:00
9c271e8761
Update hyper-v.md ( #2121 )
...
* Update hyper-v.md
* Update hyper-v.md
* Update hyper-v.md
2017-03-08 14:30:15 -08:00
504fdf9295
Fix the command for generating content trust delegation cert. ( #2163 )
2017-03-08 14:29:36 -08:00
d7e01bd7bc
Update test.md ( #2162 )
...
Is "as" missing?
2017-03-08 14:28:57 -08:00
ac97886c72
Update index.md ( #2188 )
2017-03-08 14:27:42 -08:00
e86e39d0ec
yo->to ( #2200 )
...
fixed a small typo
2017-03-08 14:27:12 -08:00
12d560bf57
Merge pull request #2201 from londoncalling/voting-app-updates
...
updates to intro, moved services descriptions under config file topic
2017-03-08 13:41:12 -08:00
a08459dd67
updates to voting app intro, moved services descriptions under config file topic
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 13:23:40 -08:00
61373a171b
Update index.md ( #2187 )
2017-03-08 12:07:00 -08:00
792a0c9bd7
Update release-notes.md ( #2190 )
2017-03-08 12:04:54 -08:00
b85962f3f6
Fix docker ps ( #2196 )
2017-03-08 12:04:02 -08:00
3fbdd218ba
Merge pull request #2195 from mstanleyjones/sles_fix
...
Fix repo paths in SLES instructions
2017-03-08 10:32:01 -08:00
d8e65c68b5
Fix repo paths in SLES instructions
2017-03-08 10:20:00 -08:00
84cff63189
Clear paragraphs ( #2183 )
...
* Clear paragraphs
Signed-off-by: French Ben <frenchben@docker.com>
* Moved css to temp
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-07 19:58:58 -08:00
a8d9900653
Merge pull request #2185 from docker/londoncalling-patch-1
...
Explained deploy key for services not in example
2017-03-07 19:43:46 -08:00
4e0c5c2ccc
Explained deploy key for services not in example
2017-03-07 19:18:26 -08:00
586f2222b6
Merge pull request #2184 from londoncalling/improve-voting-app
...
simplify, clarify, and improve intro to voting app
2017-03-07 18:30:21 -08:00
2b3bdf94d7
simplify, clarify, and improve intro to voting app
...
clarified details on which method we'll use to log into nodes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-07 18:21:14 -08:00
a1ed9bd5db
Merge pull request #2074 from Djelibeybi/patch-1
...
Update upstream package names
2017-03-07 15:36:31 -08:00
e975a49ccf
Merge pull request #2154 from londoncalling/d4mac-relnotes-1703-ce-mac2
...
17.03 CE mac2 hotfix release notes, improvements on notes and x-refs
2017-03-06 14:01:57 -08:00
3d8c0e220a
17.03 CE mac2 hotfix release notes, tweaks to notes
...
more beta to edge terminology updates
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-06 13:42:35 -08:00
b941d00c5b
Update install-offline.md ( #2150 )
2017-03-06 13:38:40 -08:00
ff815d98a7
Merge pull request #2152 from mstanleyjones/master
...
Change bottom 'Edit' link behavior to match right-side 'Edit' link
2017-03-06 12:56:31 -08:00
bc5c1ca0f0
Merge pull request #2148 from cpuguy83/cs-engine-1.12.6.cs10
...
Add release notes for cs-engine 1.12.6-cs10
2017-03-06 12:51:00 -08:00
ab0badfe0d
Change bottom 'Edit' link behavior to match right-side 'Edit' link behavior
2017-03-06 12:43:59 -08:00
b582d52d94
update v1.11.1 to v1.11.2 ( #2102 )
2017-03-06 12:06:06 -08:00
2b346a275a
Update next_steps.md ( #2119 )
...
Is "ID" the right one? It appears that "id", "ID", or "Id" is used here and there.
2017-03-06 12:05:32 -08:00
32c0f38479
Update find-an-issue.md ( #2120 )
...
Should the semicolon (;) be replaced with a colon (:)? Or, did I miss something?
2017-03-06 12:05:05 -08:00
69f4cb34ab
Update consistency of <manager-IP>:<port> ( #2117 )
...
This is the same issue as the page "Try it out and vote". I have updated the consistency of format to be the same through all pages. (and I hope I do not overdo these small things, but I just like the ease of proposing changes to the documentation and I hope that it is getting better this way)
2017-03-06 12:01:45 -08:00
c392e6736c
Add release notes for cs-engine 1.12.6-cs10
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-06 14:31:23 -05:00
5ee2ad9a8c
Update consistency of <manager-IP>:<port> ( #2111 )
...
On the "Sample app overview" page all blocks of IP address and port are shown as <manager-IP>:5000 or <manager-IP>:5001.
On this page "Try it out and vote" I see some inconsistency of these forms and fixed them, because I think the style format must be in the form "<manager-IP>:5000", e.g., colon after character ">".
2017-03-05 07:49:25 -08:00
751ffaa659
Fixing "Get Docker Toolbox for Windows" ( #2107 )
2017-03-04 15:06:55 -08:00
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
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
ca45058062
Merge pull request #2100 from londoncalling/docs-format-clean-up
...
clean up code and images
2017-03-03 17:06:18 -08:00
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
81de59357a
Update overview.md
2017-03-03 13:31:23 -08:00
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
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
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
828814ed7c
Update conduct-code.md ( #2079 )
...
Add a period (.) to the last sentence.
2017-03-02 21:21:22 -08:00
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
Victoria Bialas