Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func ValidateServerId(serverId string) error {
reservedIds := []string{"delete", "use", "show", "clear"}
for _, reservedId := range reservedIds {
if serverId == reservedId {
return fmt.Errorf("server can't have one of the following ID's: %s\n%s", strings.Join(reservedIds, ", "), cliutils.GetDocumentationMessage())
return fmt.Errorf("server can't have one of the following IDs: %s\n%s", strings.Join(reservedIds, ", "), cliutils.GetDocumentationMessage())
}
}
return nil
Expand Down Expand Up @@ -300,7 +300,7 @@ func validatePathsExist(paths ...string) error {
return err
}
if !exists {
return errorutils.CheckErrorf("file does not exit at %s", path)
return errorutils.CheckErrorf("File doesn't exist at %s", path)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/artifactory/accesstokencreate/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package accesstokencreate
var Usage = []string{"rt atc", "rt atc <username>"}

func GetDescription() string {
return "Creates an Artifactory access token. By default an user-scoped token will be created, unless the --groups and/or --grant-admin options are specified."
return "Creates an Artifactory access token. By default, a user-scoped token is created, unless the --groups and/or --grant-admin options are specified."
}

func GetArguments() string {
Expand Down
4 changes: 2 additions & 2 deletions docs/buildtools/docker/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package docker
var Usage = []string{"docker <docker arguments> [command options]"}

func GetDescription() string {
return `Run any docker command, including ‘jf docker scan’ for scanning a local image with Xray.`
return `Run any docker command, including ‘jf docker scan’ for scanning a local image with JFrog Xray.`
}

func GetArguments() string {
return ` login Login to a artifactory Docker registry.
return ` login Log in to an Artifactory Docker registry.
build Run docker build.
push Run docker push.
pull Run docker pull.
Expand Down
6 changes: 3 additions & 3 deletions docs/buildtools/dockerlogin/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ var Usage = []string{"docker login [registry] [command options]",
"docker login my-docker-registry.jfrog.io --username my-username --password my-password"}

func GetDescription() string {
return `Login to a artifactory Docker registry`
return `Log in to an Artifactory Docker registry`
}

func GetArguments() string {
return ` Command accepts optional registry for login. If not provided, the registry from the jfrog config server-id will be used.
This argument is mandatory when logging in using username and password.`
return ` You can optionally specify a registry. If not provided, the registry from the JFrog config server-id is used.
This argument is mandatory when logging in with a username and password.`
}
2 changes: 1 addition & 1 deletion docs/general/stats/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ func GetArguments() string {
The output format in which you want statistics to be shown. Currently, Json, Table and Text (default) are supported.

--access-token(optional)
The access token using which you want statistics will be fetched from jfrog instance. By default, logged user access token is used. For some products, like JPDs, projects, user needs to provide admin token.
The access token using which you want statistics will be fetched from jfrog instance. By default, logged user access token is used. For some products, like JFrog Platform Deployments and projects, you need to provide an admin token.
`
}
2 changes: 1 addition & 1 deletion docs/general/token/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package token
var Usage = []string{"atc", "atc <username>"}

func GetDescription() string {
return `Creates an access token. By default, an user-scoped token will be created. Administrator may provide the scope explicitly with '--scope', or implicitly with '--groups', '--grant-admin'.`
return `Creates an access token. By default, a user-scoped token is created. Administrator may provide the scope explicitly with '--scope', or implicitly with '--groups', '--grant-admin'.`
}

func GetArguments() string {
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func execMain() error {

app := cli.NewApp()
app.Name = jfrogAppName
app.Usage = "See https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli for full documentation."
app.Usage = "For full documentation, visit https://docs.jfrog.com/"
app.Version = cliutils.GetVersion()
args := os.Args
cliutils.SetCliExecutableName(args[0])
Expand Down
Loading