Skip to content

Commit 7366167

Browse files
author
OpenShift Bot
authored
Merge pull request #11604 from YuPengZTE/devIE
Merged by openshift-bot
2 parents 125ed10 + f3e368d commit 7366167

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

docs/man/man1/oc-cluster-up.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ oc cluster up \- Start OpenShift on Docker with reasonable defaults
1616
Starts an OpenShift cluster using Docker containers, provisioning a registry, router, initial templates, and a default project.
1717

1818
.PP
19-
This command will attempt to use an existing connection to a Docker daemon. Before running the command, ensure that you can execure docker commands successfully (ie. 'docker ps').
19+
This command will attempt to use an existing connection to a Docker daemon. Before running the command, ensure that you can execure docker commands successfully (i.e. 'docker ps').
2020

2121
.PP
2222
Optionally, the command can create a new Docker machine for OpenShift using the VirtualBox driver when the \-\-create\-machine argument is specified. The machine will be named 'openshift' by default. To name the machine differently, use the \-\-docker\-machine=NAME argument. If the \-\-docker\-machine=NAME argument is specified, but \-\-create\-machine is not, the command will attempt to find an existing docker machine with that name and start it if it's not running.

docs/man/man1/openshift-cli-cluster-up.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ openshift cli cluster up \- Start OpenShift on Docker with reasonable defaults
1616
Starts an OpenShift cluster using Docker containers, provisioning a registry, router, initial templates, and a default project.
1717

1818
.PP
19-
This command will attempt to use an existing connection to a Docker daemon. Before running the command, ensure that you can execure docker commands successfully (ie. 'docker ps').
19+
This command will attempt to use an existing connection to a Docker daemon. Before running the command, ensure that you can execure docker commands successfully (i.e. 'docker ps').
2020

2121
.PP
2222
Optionally, the command can create a new Docker machine for OpenShift using the VirtualBox driver when the \-\-create\-machine argument is specified. The machine will be named 'openshift' by default. To name the machine differently, use the \-\-docker\-machine=NAME argument. If the \-\-docker\-machine=NAME argument is specified, but \-\-create\-machine is not, the command will attempt to find an existing docker machine with that name and start it if it's not running.

hack/lib/start.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ readonly -f os::start::internal::patch_master_config
216216
# - KUBELET_HOST
217217
# - KUBELET_PORT
218218
# Arguments:
219-
# 1 - API server version (ie. "v1.2.0")
220-
# 2 - Controllers version (ie. "v1.2.0")
219+
# 1 - API server version (i.e. "v1.2.0")
220+
# 2 - Controllers version (i.e. "v1.2.0")
221221
# 3 - Skip node start ("1" to skip node start)
222222
# Returns:
223223
# - export OS_PID

pkg/bootstrap/docker/up.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var (
5858
initial templates, and a default project.
5959
6060
This command will attempt to use an existing connection to a Docker daemon. Before running
61-
the command, ensure that you can execure docker commands successfully (ie. 'docker ps').
61+
the command, ensure that you can execure docker commands successfully (i.e. 'docker ps').
6262
6363
Optionally, the command can create a new Docker machine for OpenShift using the VirtualBox
6464
driver when the --create-machine argument is specified. The machine will be named 'openshift'

0 commit comments

Comments
 (0)