summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-18 21:58:14 +0100
committerGitHub <noreply@github.com>2020-02-18 21:58:14 +0100
commitc58926e54b6ce69064f71bc58733ea903ed0e4c6 (patch)
tree8da04012297a191749b6610ef1d58c85b02db56c
parent3be1221aea406b38741598038532e43714619127 (diff)
parent9419807cefd415f81c9eb6f871169ba667fe3801 (diff)
downloadpodman-c58926e54b6ce69064f71bc58733ea903ed0e4c6.tar.gz
podman-c58926e54b6ce69064f71bc58733ea903ed0e4c6.tar.bz2
podman-c58926e54b6ce69064f71bc58733ea903ed0e4c6.zip
Merge pull request #5243 from Akasurde/misc_typo
Misc typo fixes
-rw-r--r--cmd/podman/logs.go2
-rw-r--r--docs/source/markdown/podman-logs.1.md2
-rw-r--r--libpod/container_log_linux.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/logs.go b/cmd/podman/logs.go
index a2594b5bf..ebc53ddf8 100644
--- a/cmd/podman/logs.go
+++ b/cmd/podman/logs.go
@@ -15,7 +15,7 @@ var (
logsCommand cliconfig.LogsValues
logsDescription = `Retrieves logs for one or more containers.
- This does not guarantee execution order when combined with podman run (i.e. your run may not have generated any logs at the time you execute podman logs.
+ This does not guarantee execution order when combined with podman run (i.e. your run may not have generated any logs at the time you execute podman logs).
`
_logsCommand = &cobra.Command{
Use: "logs [flags] CONTAINER [CONTAINER...]",
diff --git a/docs/source/markdown/podman-logs.1.md b/docs/source/markdown/podman-logs.1.md
index 5507ba13a..66308c2b5 100644
--- a/docs/source/markdown/podman-logs.1.md
+++ b/docs/source/markdown/podman-logs.1.md
@@ -11,7 +11,7 @@ podman\-logs - Display the logs of one or more containers
## DESCRIPTION
The podman logs command batch-retrieves whatever logs are present for one or more containers at the time of execution.
This does not guarantee execution order when combined with podman run (i.e. your run may not have generated
-any logs at the time you execute podman logs
+any logs at the time you execute podman logs).
## OPTIONS
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
index c4acc3d4f..748715ed3 100644
--- a/libpod/container_log_linux.go
+++ b/libpod/container_log_linux.go
@@ -40,7 +40,7 @@ func (c *Container) readFromJournal(options *logs.LogOptions, logChannel chan *l
defaultTime := time.Time{}
if options.Since != defaultTime {
// coreos/go-systemd/sdjournal doesn't correctly handle requests for data in the future
- // return nothing instead of fasely printing
+ // return nothing instead of falsely printing
if time.Now().Before(options.Since) {
return nil
}