Skip to content

Commit

Permalink
Merge pull request #16991 from linzhaoming/fix-docs
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

fix doc links, avoid 404
  • Loading branch information
openshift-merge-robot authored Oct 22, 2017
2 parents e73109b + 4bdd4b4 commit c0ea123
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/builds.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The OpenShift build system provides extensible support for build strategies base

### Docker Builds

OpenShift supports Docker builds. Using this strategy, users may supply a URL to a Docker context which is used as the basis for a [Docker build](https://docs.docker.com/reference/commandline/cli/#build).
OpenShift supports Docker builds. Using this strategy, users may supply a URL to a Docker context which is used as the basis for a [Docker build](https://docs.docker.com/engine/reference/commandline/build/).

#### How It Works

Expand Down
6 changes: 3 additions & 3 deletions docs/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ Other options:
| Name | Description |
|:-----------|:---------------------------------------------------------------------------------------------------------|
|`--env`, *(-e)* FOO=bar | Explicitly set or override environment variable for the current build. Does not change the BuildConfig. |
|`--build-loglevel` | Set or override the build log level output [0-5] during the build. |
|`--build-loglevel` | Set or override the build log level output [0-10] during the build. |
|`--commit` | Specify the source code commit identifier the build should use; requires a build based on a Git repository. |
|`--follow` | Start a build and watch its logs until it completes or fails. |
| `--wait` | Wait for a build to complete and exit with a non-zero return code if the build fails. |
Expand Down Expand Up @@ -737,8 +737,8 @@ $ oc config use-context my-context

This displays information about the current session.
If invoked without arguments, `oc whoami` displays the currently authenticated username.
Flag `-t` (or `--token`) means to instead display the session token.
Flag `-c` (or `--context`) means to instead display the user context name.
Flag `-t` (or `--show-token`) means to instead display the session token.
Flag `-c` (or `--show-context`) means to instead display the user context name.

```bash
$ oc whoami -t
Expand Down

0 comments on commit c0ea123

Please sign in to comment.