Commit Graph

44603 Commits

Author SHA1 Message Date
Victoria Bialas
3f06af3e6e Merge pull request #1399 from londoncalling/voting-app-more-updates
app tutorial improvements re: getting docker-stack.yml during deploy step
2017-01-26 14:23:22 -08:00
Juan Eugenio Abadie
91cc808b23 Fix link (#1392) 2017-01-26 14:12:28 -08:00
Jay Linski
01f332f45c Fix missing closing tags (#1401) 2017-01-26 14:12:02 -08:00
Victoria Bialas
ef6740f1f4 added links to docker-stack.yml source code file and reference back to intro topic
added instructions on how to directly download .yml file from GitHub

added more detail on how to get to a raw file in GitHub

further clarified how to get to and download the .yml file on GitHub

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-26 12:27:32 -08:00
Misty Stanley-Jones
1f7516c140 Merge pull request #1395 from aduermael/remove-apidocs-layouts-after-build
remove apidocs/layout after jekyll build
2017-01-26 12:14:38 -08:00
Adrien Duermael
edf388efc9 remove apidocs/layout after jekyll build
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-26 12:02:33 -08:00
Misty Stanley-Jones
e2ec727c90 Merge pull request #1397 from mstanleyjones/broken_links
Fix more broken links and images
2017-01-26 11:46:30 -08:00
Misty Stanley-Jones
9e29d0e03d Fix more broken links and images 2017-01-26 11:36:27 -08:00
Misty Stanley-Jones
e4a1a9d93d Merge pull request #1396 from aduermael/make-abs-links-relative
make links to https://docs.docker.com relative
2017-01-26 11:24:38 -08:00
Adrien Duermael
900cd57a1c make links to https://docs.docker.com relative
All of them, not just the ones in /engine/extend & /engine/reference

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-26 10:47:24 -08:00
LRubin
5bb4e32296 Merge pull request #1393 from KickingTheTV/patch-2
Fix info message to be more clear
2017-01-26 10:40:00 -08:00
Bryan Lee
beedb1af39 Fix info message to be more clear
Current description mentions making the swarm "unavailable" in Docker Cloud, but can be confusing because we have a swarm state "unavailable"
2017-01-26 10:01:15 -08:00
Michael Friis
2fb946b8f0 fix anchors (#1381)
signed-off by Michael Friis <friism@gmail.com>
2017-01-26 02:58:54 -08:00
Victoria Bialas
8294aa51cb Merge pull request #1380 from docker/londoncalling-patch-1
Copy edits
2017-01-25 16:50:00 -08:00
LRubin
df773d76e0 Merge pull request #1377 from Thoma5/patch-1
Fixed a typo
2017-01-25 16:43:52 -08:00
Victoria Bialas
fe51bbff25 Copy edits
Removed duplicate text
2017-01-25 16:31:08 -08:00
Victoria Bialas
5332f4eef4 Merge pull request #1369 from londoncalling/voting-app-updates
getting started button format update, voting app services topic intro
2017-01-25 15:28:30 -08:00
Victoria Bialas
9adbe01bda getting started button format update, voting app services topic intro
added more concept definitions to intro topics

copy edit to clarify something

changed topic title

updated topic title in TOC as well

text formatting, re-push for new Jenkins

fixed installer download buttons in Getting Startd to specify a button type

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-25 15:10:01 -08:00
Victoria Bialas
8e89b43af3 Merge pull request #1378 from londoncalling/compose-file-fixes
added missing descriptions for update_config options
2017-01-25 14:47:34 -08:00
Victoria Bialas
bfbfbeeec5 added missing descriptions for update_config options
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-25 14:31:07 -08:00
Thomas Mörbauer
a29cfddbce Fixed a typo
Dcoker instead of Docker
2017-01-25 22:39:24 +01:00
Misty Stanley-Jones
c13ddff38c Merge pull request #1309 from alexvdev/patch-1
'yum-config-manager' change flag to '--enable'
2017-01-25 13:28:32 -08:00
Alexey Voytenko
994f3fb9ee 'yum-config-manager' change flag to '--enable'
--set-enabled and --set-disabled changed to actual --enable and --disable. (--set-enabled may come from Fedora).
2017-01-25 13:10:03 -08:00
Misty Stanley-Jones
cb9a698c3e Merge pull request #1373 from mstanleyjones/broken_links
Change cloud.docker.com/login to id.docker.com/login in site template
2017-01-25 13:01:12 -08:00
Misty Stanley-Jones
f7fdad880d Change cloud.docker.com/login to id.docker.com/login in site template 2017-01-25 12:34:37 -08:00
Misty Stanley-Jones
7d5a0f1011 Merge pull request #1337 from trapier/macvlan_intro
Remove experimental intro from macvlan (#1335)
2017-01-25 12:19:30 -08:00
Misty Stanley-Jones
5ff7b81590 Merge pull request #1368 from RonWilliams/patch-1
Fix language within devicemapper thinpool setup
2017-01-25 12:06:06 -08:00
Misty Stanley-Jones
332c438df5 Merge pull request #1363 from mstanleyjones/broken_links
Fixing broken links
2017-01-25 12:04:09 -08:00
LRubin
a97f28d794 Merge pull request #1331 from sanscontext/swarm-cloud
Cloud: clarify registration runs on all manager nodes
2017-01-25 11:53:27 -08:00
Misty Stanley-Jones
ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
LRubin
74e52a5f16 Merge pull request #1181 from sardjv/patch-2
redeploying should not use existing volume
2017-01-25 11:41:57 -08:00
LRubin
b0bae9c581 clarify registration runs on all manager nodes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-25 11:41:44 -08:00
C.X. Ling
49a333885d Fix rendering of code block for swarm tutorial (#1370)
Indentations are added to fix rendering failure.
2017-01-25 11:01:00 -08:00
John Mulhausen
3ff3b7cf42 Update dockerd.yaml 2017-01-25 10:57:38 -08:00
John Mulhausen
3bbdef8094 Import Daemon Metrics from docker/docker for dockerd 2017-01-25 10:54:39 -08:00
Brian Goff
cc5a1416b3 Add release notes for 1.11.2-cs7 (#1365)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-25 10:04:22 -08:00
LRubin
fe0695338e Merge pull request #1367 from ManoMarks/patch-1
fixing a typo
2017-01-25 09:40:04 -08:00
Ron Williams
5bc72ac2ce Fix language within devicemapper thinpool setup
Previous language indicated that a user would be "creating a thin pool". This language is confusing as it indicates that the logical volume created is of the thin pool type; instead, the volume being created is a linear volume group which is then converted to a thin pool in step 6. This is an important nuance when implementing setup through configuration management tools such as Salt or Ansible. When initially provisioning the two logical volumes as thin pool, the error "Pool metadata LV docker/thinpoolmeta is of an unsupported type".
2017-01-24 21:22:10 -07:00
Mano Marks
f0e6abbdfc fixing a typo 2017-01-24 19:21:55 -08:00
John Mulhausen
1a214fc716 Fixed MD source rendering 2017-01-24 17:30:13 -08:00
John Mulhausen
0f62e1ea3d Fixing infinite loop 2017-01-24 17:27:37 -08:00
John Mulhausen
0884ef36a5 Fixing some formatting snafus 2017-01-24 16:35:31 -08:00
Juan Eugenio Abadie
2f472446a1 Add udp ports example (#1098) 2017-01-24 15:49:44 -08:00
John Mulhausen
77a908db5c Update zfs-driver.md 2017-01-24 15:47:02 -08:00
John Mulhausen
af9e4ae9ef Update zfs-driver.md 2017-01-24 15:46:37 -08:00
Andreas Steinel
781a582fff Adding Quota option for ZFS (#1135)
* Adding Quota option

Try to explain how you can use quota on ZFS as it was implemented/discussed in #3804.

* Requested changes from @johndmulhausen
2017-01-24 15:41:52 -08:00
Nick van der Meij
bb81ccb937 Update envvars.md (#1008)
* Update envvars.md

Update envvars.md to reflect the supported values of COMPOSE_CONVERT_WINDOWS_PATHS

* Update envvars.md
2017-01-24 15:37:06 -08:00
Thomas Auffredou
59034f94f0 Update log_tags.md (#1325)
Update reference url to logging context
2017-01-24 15:32:07 -08:00
James Hu
f4ce265398 Update docker stack command (#1306)
There is no such thing as `docker-stack`
2017-01-24 15:31:07 -08:00
LRubin
aaa2ad2951 add crosslink to advanced topic (#1338)
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-24 15:24:53 -08:00