Sebastiaan van Stijn cfd105cd5b Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker ...

Remove git conflict markers in docs/reference/commandline/swarm_join.md
(cherry picked from commit 49819165460f12606cb96fc0e579cb4019e407da)

Signed-off-by: Tibor Vass <tibor@docker.com>

2016-08-11 16:32:22 -07:00

..

attach.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

build.md

docs: add code-hints to builder page

2016-07-25 23:15:52 -07:00

cli.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

commit.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

cp.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

create.md

Improve flag help consistency, and update docs

2016-07-25 23:15:24 -07:00

deploy.md

Append --registry-auth with with

2016-07-25 23:17:01 -07:00

diff.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

docker_images.gif

…

dockerd.md

add doc for live-restore setting and daemonless containers, fix admin guide menu

2016-07-27 20:39:57 +10:00

events.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

exec.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

export.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

history.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

images.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

import.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

index.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

info.md

Replace secrets with join tokens

2016-07-25 23:16:59 -07:00

inspect.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

kill.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

load.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

login.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

logout.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

logs.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

menu.md

add menu.md, make index.md command line reference, update typos/minor errors in cli docs

2016-07-08 15:31:22 -07:00

network_connect.md

Rename --net to --network

2016-07-12 15:50:38 -07:00

network_create.md

better command docker network create -h output

2016-07-25 23:15:24 -07:00

network_disconnect.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

network_inspect.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

network_ls.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

network_rm.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

node_demote.md

Replace secrets with join tokens

2016-07-25 23:16:59 -07:00

node_inspect.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

node_ls.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

node_promote.md

Replace secrets with join tokens

2016-07-25 23:16:59 -07:00

node_ps.md

Merge pull request #25241 from jhorwit2/jah/ps-doc-fix

2016-08-11 16:32:16 -07:00

node_rm.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

node_update.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

pause.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

plugin_disable.md

docs: update reference docs for plugins

2016-07-25 23:15:46 -07:00

plugin_enable.md

docs: update reference docs for plugins

2016-07-25 23:15:46 -07:00

plugin_inspect.md

docs: update reference docs for plugins

2016-07-25 23:15:46 -07:00

plugin_install.md

docs: update reference docs for plugins

2016-07-25 23:15:46 -07:00

plugin_ls.md

docs: update reference docs for plugins

2016-07-25 23:15:46 -07:00

plugin_rm.md

docs: fix copy/pasta error

2016-07-25 23:16:15 -07:00

port.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

ps.md

docs: improve formatting and highlighting of docker ps reference

2016-07-25 23:16:16 -07:00

pull.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

push.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

rename.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

restart.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

rm.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

rmi.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

run.md

Improve flag help consistency, and update docs

2016-07-25 23:15:24 -07:00

save.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

search.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

service_create.md

Merge pull request #25140 from stevvooe/service-ps-over-tasks-bump_v1.12.0

2016-07-27 14:38:08 -07:00

service_inspect.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

service_ls.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

service_ps.md

Merge pull request #25241 from jhorwit2/jah/ps-doc-fix

2016-08-11 16:32:16 -07:00

service_rm.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

service_scale.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

service_update.md

cli: docker service|node|stack ps instead of tasks

2016-07-27 11:20:25 -07:00

stack_config.md

docs: add initial reference for "stack services"

2016-07-25 23:15:44 -07:00

stack_deploy.md

docs: add initial reference for "stack services"

2016-07-25 23:15:44 -07:00

stack_rm.md

docs: add initial reference for "stack services"

2016-07-25 23:15:44 -07:00

stack_services.md

docs: add initial reference for "stack services"

2016-07-25 23:15:44 -07:00

stack_tasks.md

docs: add initial reference for "stack services"

2016-07-25 23:15:44 -07:00

start.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

stats.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

stop.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

swarm_init.md

Require listen address and advertise address to be an IP address or an interface name

2016-07-25 23:18:12 -07:00

swarm_join_token.md

Merge pull request #25182 from sfsmithcha/clarify_join_token

2016-08-11 16:32:14 -07:00

swarm_join.md

Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker

2016-08-11 16:32:22 -07:00

swarm_leave.md

Replace secrets with join tokens

2016-07-25 23:16:59 -07:00

swarm_update.md

Update swarm init task-history-limit docs

2016-07-25 23:17:34 -07:00

tag.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

top.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

unpause.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

update.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

version.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

volume_create.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

volume_inspect.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

volume_ls.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

volume_rm.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00

wait.md

Updates on cli reference documentation

2016-07-08 15:33:27 -07:00