6 files changed, 11 insertions, 23 deletions
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index 8fe035209..9318bba12 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -63,7 +63,7 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error {
 		dfSummaries       []*dfSummary
 		active            int
 		size, reclaimable int64
-		format            string    = "{{.Type}}\t{{.Total}}\t{{.Active}}\t{{.Size}}\t{{.Reclaimable}}\n"
+		format                      = "{{.Type}}\t{{.Total}}\t{{.Active}}\t{{.Size}}\t{{.Reclaimable}}\n"
 		w                 io.Writer = os.Stdout
 	)
 
@@ -74,7 +74,7 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error {
 
 	for _, i := range reports.Images {
 		if i.Containers > 0 {
-			active += 1
+			active++
 		}
 		size += i.Size
 		if i.Containers < 1 {
@@ -99,7 +99,7 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error {
 	)
 	for _, c := range reports.Containers {
 		if c.Status == "running" {
-			conActive += 1
+			conActive++
 		} else {
 			conReclaimable += c.RWSize
 		}
diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go
index 27e80138e..c401c5a92 100644
--- a/cmd/podman/system/events.go
+++ b/cmd/podman/system/events.go
@@ -17,8 +17,10 @@ import (
 )
 
 var (
-	eventsDescription = "Monitor podman events"
-	eventsCommand     = &cobra.Command{
+	eventsDescription = `Monitor podman events.
+
+  By default, streaming mode is used, printing new events as they occur.  Previous events can be listed via --since and --until.`
+	eventsCommand = &cobra.Command{
 		Use:   "events",
 		Args:  validate.NoArgs,
 		Short: "Show podman events",
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 1b07ee301..ecd17c251 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -64,7 +64,7 @@ func aliasTimeoutFlag(_ *pflag.FlagSet, name string) pflag.NormalizedName {
 }
 
 func service(cmd *cobra.Command, args []string) error {
-	apiURI, err := resolveApiURI(args)
+	apiURI, err := resolveAPIURI(args)
 	if err != nil {
 		return err
 	}
@@ -103,7 +103,7 @@ func service(cmd *cobra.Command, args []string) error {
 	return restService(opts, cmd.Flags(), registry.PodmanConfig())
 }
 
-func resolveApiURI(_url []string) (string, error) {
+func resolveAPIURI(_url []string) (string, error) {
 	// When determining _*THE*_ listening endpoint --
 	// 1) User input wins always
 	// 2) systemd socket activation
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go
index 501650839..f5386c4f1 100644
--- a/cmd/podman/system/service_abi.go
+++ b/cmd/podman/system/service_abi.go
@@ -1,4 +1,4 @@
-// +build ABISupport,!remote
+// +build linux,!remote
 
 package system
 
diff --git a/cmd/podman/system/service_unsupported.go b/cmd/podman/system/service_unsupported.go
deleted file mode 100644
index 82272c882..000000000
--- a/cmd/podman/system/service_unsupported.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !ABISupport,!remote
-
-package system
-
-import (
-	"errors"
-
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/spf13/pflag"
-)
-
-func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entities.PodmanConfig) error {
-	return errors.New("not supported")
-}
diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go
index d9691ad2a..acf41a32d 100644
--- a/cmd/podman/system/system.go
+++ b/cmd/podman/system/system.go
@@ -9,7 +9,7 @@ import (
 
 var (
 	// Pull in configured json library
-	json = registry.JsonLibrary()
+	json = registry.JSONLibrary()
 
 	// Command: podman _system_
 	systemCmd = &cobra.Command{