Commit Graph

45431 Commits

Author SHA1 Message Date
Misty Stanley-Jones
faad8ff337 Merge pull request #2203 from lorenzo-pizzari/patch-1
Missing ssh tunnel option
2017-03-09 15:48:27 -08:00
Misty Stanley-Jones
a9bac844a5 Merge pull request #2160 from endlos/patch-2
Update rails.md
2017-03-09 15:45:09 -08:00
Misty Stanley-Jones
a010d2f69f Merge pull request #2156 from pkennedyr/patch-4
Remove reference to DSS only be enabled on Docker Cloud individual ac…
2017-03-09 15:34:20 -08:00
Misty Stanley-Jones
566110ba4e Merge pull request #2112 from delfuego/patch-1
Remove incorrect iptables-related information
2017-03-09 15:33:32 -08:00
Misty Stanley-Jones
fff68e259d Merge pull request #1945 from Artmann/add-glesys-driver-to-available-driver-plugins
Add GleSYS Driver to the list of available driver plugins
2017-03-09 15:32:20 -08:00
Misty Stanley-Jones
559e9afa81 Merge pull request #2001 from nicolaeusebi/master
Added Aruba Cloud to available drivers
2017-03-09 15:31:26 -08:00
Misty Stanley-Jones
5a18476eaf Merge pull request #2097 from kencochrane/d4aws-17.03-release-notes
Added missing release notes from D4AWS 17.03.0 release
2017-03-09 15:29:39 -08:00
Matt Bentley
0ab4e60a91 Fix broken link for devicemapper setup in 1.12 (#2229) 2017-03-09 14:53:46 -08:00
Wang Jie
de21a0de13 Update push-images.md (#2226) 2017-03-09 14:53:19 -08:00
Matt Bentley
53dd48b5c2 Fix broken anchors for docs for different distros (#2231) 2017-03-09 14:52:51 -08:00
Misty Stanley-Jones
0e5a7842e9 Merge pull request #2202 from mstanleyjones/master
Archives improvements
2017-03-09 11:34:48 -08:00
Nicola Eusebi
9ef421ae23 removed Aruba references 2017-03-09 10:17:34 +01:00
Nicola Eusebi
2ac8c2536c delete aruba.md 2017-03-09 10:16:33 +01:00
Victoria Bialas
e8db147df2 Merge pull request #2218 from londoncalling/engine-get-started
changed rm images example to rmi
2017-03-08 20:42:56 -08:00
Victoria Bialas
bf36662513 changed rm images example to rmi
updated to include both commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 20:31:24 -08:00
Victoria Bialas
8d7562d84a Merge pull request #2217 from londoncalling/redirects
added redirects to d4mac, d4win index pages
2017-03-08 19:53:37 -08:00
Victoria Bialas
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
Victoria Bialas
7f5d99a18a Merge pull request #2213 from londoncalling/d4mac-fix-FAQ-formatting
fixed formatting
2017-03-08 19:02:47 -08:00
Victoria Bialas
8c84bee670 fixed formatting
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 18:46:08 -08:00
Victoria Bialas
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
Victoria Bialas
a020b82489 fixed link to Compose v2 restart
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 18:26:52 -08:00
Victoria Bialas
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
Victoria Bialas
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
Victoria Bialas
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
Victoria Bialas
051fcffccb copy-edit, more explanation on command line savvy 2017-03-08 16:54:06 -08:00
Misty Stanley-Jones
0cc78dfce2 jsonify 2017-03-08 15:34:35 -08:00
Lorenzo Pizzari
4cdbda9d10 Added -f and -i
from @nathanleclaire suggestion, added the `-f` option and removed `&`
Added `-i <path-to-ssh-key>` just to be coherent with previous ssh command
2017-03-09 00:20:38 +01:00
Lorenzo Pizzari
6d6ba4725a Missing ssh tunnel option
I've tried to connect with ssh tunnel and i found that the port option is missing.
Added option to doc.
2017-03-08 23:41:39 +01:00
Misty Stanley-Jones
236f2f88b2 Typo 2017-03-08 14:38:15 -08:00
Misty Stanley-Jones
fcc4ea05c7 Archives improvements:
- Renamed docker-compose.yaml to archives.yaml since we are not using it
  as a docker-compose.yaml anymore
- Added current docs into that archive list, added a  key that can
  be set to  to indicate that the archive is the latest
- Output a new file  that can be used by non-current
  archives to build up a list of all archives including what's current,
  dynamically
- Single-sourced and liquefied the list that builds up the archives in
  the latest version
2017-03-08 14:32:52 -08:00
Hugo
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
Roman Vynar
504fdf9295 Fix the command for generating content trust delegation cert. (#2163) 2017-03-08 14:29:36 -08:00
Wang Jie
d7e01bd7bc Update test.md (#2162)
Is "as" missing?
2017-03-08 14:28:57 -08:00
Wang Jie
ac97886c72 Update index.md (#2188) 2017-03-08 14:27:42 -08:00
Jeff Anderson
e86e39d0ec yo->to (#2200)
fixed a small typo
2017-03-08 14:27:12 -08:00
Victoria Bialas
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
Victoria Bialas
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
Wang Jie
61373a171b Update index.md (#2187) 2017-03-08 12:07:00 -08:00
Wang Jie
792a0c9bd7 Update release-notes.md (#2190) 2017-03-08 12:04:54 -08:00
Ryan Zhang
b85962f3f6 Fix docker ps (#2196) 2017-03-08 12:04:02 -08:00
Misty Stanley-Jones
3fbdd218ba Merge pull request #2195 from mstanleyjones/sles_fix
Fix repo paths in SLES instructions
2017-03-08 10:32:01 -08:00
Misty Stanley-Jones
d8e65c68b5 Fix repo paths in SLES instructions 2017-03-08 10:20:00 -08:00
French Ben
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
Victoria Bialas
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
Victoria Bialas
4e0c5c2ccc Explained deploy key for services not in example 2017-03-07 19:18:26 -08:00
Victoria Bialas
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
Victoria Bialas
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
Misty Stanley-Jones
a1ed9bd5db Merge pull request #2074 from Djelibeybi/patch-1
Update upstream package names
2017-03-07 15:36:31 -08:00
Hugo
7b83cfebab Update rails.md 2017-03-06 20:01:57 -05:00
Victoria Bialas
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