Commit Graph

39 Commits

Author SHA1 Message Date
Gwendolynne Barr 1c752a8c0b
Repair links (#6505) 2018-04-20 14:54:39 -07:00
Joao Fernandes a2c59bd6df Fix wrong anchor 2018-04-20 13:24:48 -07:00
Akim Demaille b419d141e1 Desktop: networking (#6258) 2018-03-23 05:46:43 -07:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Akim Demaille 218e1cbb23 Mac updates (#5762)
* Mac: fix name of the vm directory

Actually the directory name changed from vm to vms/0 (there has been
no release with vm, we may remove references to it).  This is for the
forthcoming 18.01 Edge release, but since it's already published we
should probably update now.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Toolbox: formatting changes

No user visible changes here, just making future diffs easier to read.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Toolbox: do not invite to remove ~/.docker

Docker for Mac uses that directory too.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-01-18 09:37:00 -08:00
Akim Demaille 757c140877 Mac: the disk image has moved (#5603)
* Mac: the disk image has moved

In the forthcoming release of Docker for Mac, the disk image is in
another directory (was needed for future changes).

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Mac: FAQ: Promote "Disk Usage" questions

One level upper.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-01-02 17:13:00 -08:00
Sebastiaan van Stijn e8f875296a Fix physical/logical typo in D4M FAQ (#5547)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-20 14:57:11 -08:00
Akim Demaille acfc69ecc3 Mac: give some structure to the FAQ (#5503)
This commit reorders this

    ### Stable and Edge channels
    ### What is Docker.app?
    ### What kind of feedback are we looking for?
    ### What if I have problems or questions?
    ### How can I opt out of sending my usage data?
    ### Can I use Docker for Mac with new swarm mode?
    ### How do I connect to the remote Docker Engine API?
    ### How do I connect from a container to a service on the host?
    ### How do I connect to a container from the Mac?
    ### How do I add custom CA certificates?
    ### How do I add client certificates?
    ### How do I reduce the size of Docker.qcow2?
    ### What are system requirements for Docker for Mac?
    ### Do I need to reinstall Docker for Mac if I change the name of my macOS account?
    ### Do I need to uninstall Docker Toolbox to use Docker for Mac?
    ### How do I uninstall Docker Toolbox?
    ### What is HyperKit?
    ### What is the benefit of HyperKit?
    ### Why is com.docker.vmnetd running after I quit the app?
    ### Can I pass through a USB device to a container?

into this

    ## Questions about Docker.app
    ### Stable and Edge channels
    ### What is Docker.app?
    ### What are system requirements for Docker for Mac?
    ### Do I need to reinstall Docker for Mac if I change the name of my macOS account?
    ### Do I need to uninstall Docker Toolbox to use Docker for Mac?
    ### How do I uninstall Docker Toolbox?
    ## Questions about feedback and help
    ### What kind of feedback are we looking for?
    ### What if I have problems or questions?
    ### How can I opt out of sending my usage data?
    ## How can I...?
    ### Can I use Docker for Mac with swarm mode?
    ### How do I connect to the remote Docker Engine API?
    ### How do I connect from a container to a service on the host?
    ### How do I connect to a container from the Mac?
    ### How do I add custom CA certificates?
    ### How do I add client certificates?
    ### How do I reduce the size of Docker.qcow2?
    ### Can I pass through a USB device to a container?
    ## Components of Docker for Mac
    ### What is HyperKit?
    ### What is the benefit of HyperKit?
    ### Why is com.docker.vmnetd running after I quit the app?

Also, change "new swarm mode" into "swarm mode".

Signed-off-by: Akim Demaille <akim.demaille@gmail.com>
2017-12-15 16:34:27 -08:00
Akim Demaille e6a23925ef Mac: FAQ: Disk usage in raw format (#5504)
* Mac: FAQ: Disk usage in raw format

This is a new feature of Docker for Mac.  Questions and PRs have
already been made about this, and we expect more of them.

Signed-off-by: Akim Demaille <akim.demaille@gmail.com>
2017-12-15 16:14:02 -08:00
Victoria Bialas a3bbadb7ed Add d4mac client side FAQ (#3671)
* add d4mac client side FAQ

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added link to FAQs from Getting Started

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added FAQs re: installing client certificates

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added more detail on client and server side certs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed Mac and Windows specific topics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed formatting so that content renders properly

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* incorporated review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* updated Windows FAQ to clarify directories copy, remove refs to db

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* change ref from Mac to Windows on Win side

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added certificate topic to Win getting started

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* review comments, remove 'entities' clarify meaning

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-23 11:48:03 -07:00
Wang Jie 58434c1e4a Update faqs.md (#3262) 2017-05-19 15:25:27 -07:00
Victoria Bialas 006aed530f misc updates to d4mac and win, kitematic (#2663)
copyedits on Kitematic, fix Mac install page

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-06 19:49:52 -07:00
Victoria Bialas f1461e897a d4mac-win 17.04.0-ce release notes, Windows server installer download (#2657)
fixed links and table formats

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-06 16:04:48 -07:00
Victoria Bialas 8c84bee670 fixed formatting
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 18:46:08 -08:00
Misty Stanley-Jones 3108d86b6d Docker 17.03 release (#2050)
* First pass of tabs-based organization

* Improvements

* Second pass at tabs org

* Move tab highlighting to Liquid instead of JS

* Adding forwarding links for in-product TOCs

* Move to pre-rendered left-navs instead of post-load JS for TOC sync

* Optimizations and nosync-ing the Reference section

* Optimizations, fix Cloud YAML

* Make a "Sample applications" node

* Update index.md

* Tabs CSS fixes and 12-factor reposition

* Theme Start (#1709)

* Hooking up nav to real TOC data, formatting fixes

* Fixing JS error

* Layout updates, dark themes, tons o stuff (#1971)

* Add cookie saving for day/night mode

* Newsite tabs (#2004)

* Layout updates, dark themes, tons o stuff

* Update themes

Theme updates + scaffolding

* Update style.css

* Update style-alt.css

* Missing font fixes

* Import Open Sans from Google

* Font fix, archive removal in TOC, favicon, Feedback img fix

* Oops, returning -webkit-font-smoothing: antialiased;

* Add old favicon.ico

* Make archives a non-tiered link

* Reorder docs archive to newest-first, add local instructions

* Commenting out day/night switch for now

* Fix 'rate this page'

* Rate this page fixes

* Autocomplete and Docker Cloud fixes

* Open tree to current page

* Adding indentation for nav collapse in

* Ensure left nav visibly displays the current topic

* Update flex layout

- adjust rescale
- code block styles

* add focus to search

- force code block color (for now)
- increase section max-width

* increase content padding

- add padding to toc for wrapping long strings.

* grid adjustment

- grid
- content and wrapper adjustments for mobile

* left/right sidebar adjustments

- refine position on scroll for toc on landing

- add default height to compensate for upcoming position absolute
onScroll

* side bar overflow

- hidden on X-scroll

* fix version button

- override bstrap defaults

* tabs + buttons

* update landing svgs

* fix sidebar height

set to 100% on landing pre-affix

* Update blurb about engine/editions on front page

* add side menu to mobile collapse menu

* update classnames

* overall mobile tweaks

* Right-nav highlighting and auto-scroll

* Slightly slower right-nav highlighting, correct version

* add toggle menus for small devices

* Fixing JS error/Docker 1.13>17.03

* header updates

* re-add fan to header

* update transition time

* Add first 20 words to Twitter card

* fixed width of components

- lockdown elements on rescale (wil need more TLC)

* set max-width of content

* Left and right nav resizing w/footer scroll and window resize

* update links on landing page

* Fix for overzealous resizing, JS redundancies

* Fix for JS error on homepage

* JS error fixes

* toggle adjustments

- wrap toggle button

* add tab width

* version button type

* version button both headers

* tabs - fix typo

* landing page grid

* components

* Share images, JS fixes, Marketo removal

* Anchor links fix

* Fix for black space on mobile

* Restore hamburger (partial)

* Update run.md

Minor grammar cleanup.

* Update apparmor.md

I'm a little confused about which one is better to be used here, a period (.) or a colon (:),  as a command is given below. Or both are OK, and we only have to keep consistency in a single page.

* Update apparmor.md

Fixed the indentation for the codeblock (indented by 4 spaces). Thank you for your careful review.

* Replacing service with secret

* Update networking.md

fix typo with triple "m" for command word

* Update run.md

Address PR feedback.

* Update install instructions to latest version

* Added "related topics" section

* Add documentation for mem_swappiness

* Update to new Docker version scheme (#1926)

* mem_swappiness for current version and v1

* merge other changes, fix typo

* There is no OpenSuSE and there never was

though we had SuSE and S.u.S.E.

* Add release notes for 1.12.6-cs9 (#2028)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

* need sudo to access key cache (#1931)

* need sudo to access key cache

* List other keyservers to try for cs-engine install (#2033)

* List other keyservers to try for cs-engine install

Sometimes ha.pool.sks-keyservers.net goes down, so let's provide some
other keyservers to try in such cases.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

* Update work_issue.md (#2030)

Change "re-start" to "restart". Though not included in "Prefered usages" in the documentation guide, but I think "restart" is better and used more frequently. Besides, some other docs here, such as "Keep containers alive during daemon downtime" of "Admin Guide", also use "restart".

* Update create_pr.md (#2015)

* Update work_issue.md (#2013)

Change "id" to "ID" except for those in code.

* Update set_up_dev.md (#2011)

Add periods (.) in some steps.

* Update set_up_dev.md (#2010)

Apply Oxford Comma as described in the documentation guide.

* Update create_pr.md (#2014)

Delete an extra space.

* Update trust_key_mng.md (#1883)

* Update trust_key_mng.md

* Update trust_key_mng.md

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.

* Update 

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.

* Update content_trust.md (#1912)

* Update content_trust.md

* update deprecation policy

Signed-off-by: Victor Vieux <victorvieux@gmail.com>

* Update info about how to check whether Docker is running

* Updated docs to reflect edge channel

Signed-off-by: French Ben <frenchben@docker.com>

* Updated wording for SP creation

Signed-off-by: French Ben <frenchben@docker.com>

* beta to edge, cloud features first draft

added cloud images

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Distinguish between cloud stack file and stack file

* Added EE links

Signed-off-by: French Ben <frenchben@docker.com>

* Use variables

Signed-off-by: French Ben <frenchben@docker.com>

* Replace deprecated MAINTAINER with LABEL (#1445)

Replace MAINTAINER instruction with LABEL as MAINTAINER was deprecated in https://github.com/docker/docker/pull/25466

* Updates for Docker CE and Docker EE

* Updated DDC launch button

Signed-off-by: French Ben <frenchben@docker.com>

* added Docker Cloud topics for Mac and Windows

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* d4mac, d4win stable and beta release notes for 17.03.0

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-02 05:54:49 -08:00
John Mulhausen b513ecde18 Tabs-based organization (#1420)
* First pass of tabs-based organization

* Improvements

* Second pass at tabs org

* Move tab highlighting to Liquid instead of JS

* Adding forwarding links for in-product TOCs

* Move to pre-rendered left-navs instead of post-load JS for TOC sync

* Optimizations and nosync-ing the Reference section

* Optimizations, fix Cloud YAML

* Make a "Sample applications" node

* Tabs CSS fixes and 12-factor reposition

* Fix auto-complete left-padding

* Fix auto-complete right-padding (for symmetry)

* Fix for no left-nav on Compose file

* Fix weird wrapping on smaller screens for tabs

* reorganized d4mac, d4win per tabs structure, split out install guides

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Update reference urls to latest DDC version

* Reintroduces changes ebe778b..9abc9e to TOC

* Update allpagelinks.md

* hid the on-page TOC's for d4mac d4win topics as needed

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Add a Hopscotch tour of the new navigation
2017-02-15 17:23:45 -08:00
Misty Stanley-Jones ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
Ben Firshman 2f3218c2c4 Rename Remote API to Engine API
See https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2017-01-19 10:43:43 -08:00
Victoria Bialas 4038b1ae6c added beta 36 relnotes, and minor wording updates to Docker.qcow2 question in Mac FAQs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 19:18:10 -08:00
Victoria Bialas 486278c4e8 linked to related GitHub issue, slight re-ordering of topics
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 18:33:14 -08:00
David Scott b9df8fd204 docker-for-mac: add a FAQ about reducing the qcow2 size
In Docker for Mac 1.12 the only way to free space on the host is to
delete the qcow2 which means all containers and images have to be
rebuilt.

In Docker for Mac 1.13 there is preliminary support for shrinking the
qcow2 file non-destructively using "TRIM" (as also used on SSDs).
Unfortunately this isn't (yet) fully automatic -- it runs in the
background and requires the app to be occasionally restarted.

Related to [docker/for-mac#371]

Signed-off-by: David Scott <dave.scott@docker.com>
2017-01-12 10:21:20 +00:00
Victoria Bialas 552b1a1cea added info on usage data options for beta vs. stable
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-16 18:25:50 -08:00
Victoria Bialas 444c798433 d4mac, d4win Beta 31 updates plus FAQ clarification on certs, registries
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-01 17:31:12 -08:00
David Sheets b20a308fee Docked for Mac: Custom host CA certs in stable
Since 1.12.3, custom CA certificates are sourced from the OS X keychain.

/cc @djs55
2016-11-16 11:28:18 +00:00
Gaetan 3544131970 fix type of keywords entry in frontmatter (in /docker-for-mac/ dir) (#496)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-09 16:38:09 -08:00
Misty Stanley-Jones eb5c8670bc Change instances of alias: to redirect_from:
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 17:07:02 -07:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-18 09:21:09 -07:00
Victoria Bialas 8002e755b7 corrected docs around custom CA support beta v. stable
fixed link and format

copyedit per review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-14 14:50:32 -07:00
Victoria Bialas 063003dadf PRs on shared drives and CAs, HTML fixes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-04 18:01:54 -07:00
John Mulhausen 0133cb646d Merge pull request #21 from pborreli/typos
Fixed typos
2016-09-30 11:51:42 -07:00
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -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 5f5eb93dfa Moved pinata imported docs to top level subdirectory 2016-09-29 12:11:53 -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 52a1ad7609 Initial import of https://github.com/docker/pinata 2016-09-28 20:40:01 -07:00