From 052c91b2aa46a65ab23f14f58a32db40adb377f0 Mon Sep 17 00:00:00 2001
From: Chris Hines <github@cs-guy.com>
Date: Sun, 13 Mar 2022 01:17:23 -0500
Subject: [PATCH] expr: improve clarity and consistency of help

Also fix some spelling errors.
---
 internal/pkgset/calc.go |  2 +-
 internal/pkgset/set.go  |  2 +-
 main.go                 | 36 ++++++++++++++++++++----------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/internal/pkgset/calc.go b/internal/pkgset/calc.go
index a04660a..20434a9 100644
--- a/internal/pkgset/calc.go
+++ b/internal/pkgset/calc.go
@@ -134,7 +134,7 @@ func Calc(parentContext context.Context, expr []string) (Set, error) {
 
 			case "transitive":
 				if len(e.Args) != 1 {
-					return nil, fmt.Errorf("reach requires one argument: %v", e)
+					return nil, fmt.Errorf("transitive requires one argument: %v", e)
 				}
 				args, err := evalArgs(ctx, e.Args)
 				return Transitive(args[0]), err
diff --git a/internal/pkgset/set.go b/internal/pkgset/set.go
index 225a9e4..605204f 100644
--- a/internal/pkgset/set.go
+++ b/internal/pkgset/set.go
@@ -28,7 +28,7 @@ func NewRoot(roots ...*packages.Package) Set {
 	return set
 }
 
-// NewAll reincludes all the dependencies from the graph.
+// NewAll includes all the dependencies from the graph.
 func NewAll(src Set) Set {
 	set := make(Set)
 	for _, p := range src {
diff --git a/main.go b/main.go
index 425fa28..4d8cd2b 100644
--- a/main.go
+++ b/main.go
@@ -48,39 +48,42 @@ func (*ExprHelp) Usage() string {
 The examples use X, Y and Z as placeholders for packages, packages paths or
 package expressions.
 
-# Basic operations
-	There are a few basic oprations specified for manipulating sets of packages.
+# Basic operations:
+
+	There are a few basic operations specified for manipulating sets of packages.
 
 	X Y Z;
 	X + Y + Z;  add(X, Y, Z);  or(X, Y, Z)
-		all packages that match X, Y and Z
+		all packages that match X, Y or Z
 
 	X - Y - Z;  subtract(X, Y, Z);  exclude(X, Y, Z)
-		packages that are used by X and not used by Y and Z
+		packages that match X but not Y or Z
 
 	shared(X, Y, Z);  intersect(X, Y, Z)
-		packages that exist in all of X, Y and Z
+		packages that match all of X, Y and Z
 
 	xor(X, Y);
-		packages that are different between X and Y
+		packages that match one of X or Y but not both
+
+# Selectors:
 
-# Selectors
-	Selectors allow selecting parts of the dependency tree
+	Selectors allow selecting parts of the dependency tree. They are
+	applied in left to right order.
 
 	X:all
 		select X and all of its direct and indirect dependencies
 	X:import, X:imp
-		select direct import of X
+		select direct imports of X
 	X:import:all, X:imp:all
 		select direct and indirect dependencies of X; X not included
 
 	X:source
-		packages that have no other package importing them
+		select packages not imported by any package in X
 	X:-source
 		shorthand for (X - X:source)
 
 	X:main
-		select packages named main
+		select packages in X named main
 
 	X:test
 		select test packages of X
@@ -107,16 +110,17 @@ package expressions.
 	purego=1(X):
 		add tag "purego" for resolving X
 
-# Example expressions
+# Example expressions:
 
 	github.com/loov/goda:import
-		all direct dependencies for "github.com/loov/goda" package
+		all direct dependencies for the "github.com/loov/goda" package
 
 	shared(github.com/loov/goda/pkgset:all, github.com/loov/goda/templates:all)
-		packages shared by "github.com/loov/goda/pkgset" and "github.com/loov/goda/templates"
+		packages directly or indirectly imported by both
+		"github.com/loov/goda/pkgset" and "github.com/loov/goda/templates"
 
-	github.com/loov/goda/... - golang.org/x/tools/...
-		all dependencies excluding golang.org/x/tools
+	github.com/loov/goda/...:all - golang.org/x/tools/...
+		all of goda's dependencies excluding golang.org/x/tools packages
 
 	reach(github.com/loov/goda/...:all, golang.org/x/tools/go/packages)
 		packages in github.com/loov/goda/ that use golang.org/x/tools/go/packages