Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language."

mk2rbc/cmd/mk2rbc.go

@@ -60,7 +60,7 @@ var (
 )
 
 func init() {
-	// Poor man's flag aliasing: works, but the usage string is ugly and
+	// Simplistic flag aliasing: works, but the usage string is ugly and
 	// both flag and its alias can be present on the command line
 	flagAlias := func(target string, alias string) {
 		if f := flag.Lookup(target); f != nil {

mk2rbc/types.go

@@ -53,7 +53,7 @@ type variableRegistrar interface {
 	NewVariable(name string, varClass varClass, valueType starlarkType)
 }
 
-// ScopeBase is a dummy implementation of the mkparser.Scope.
+// ScopeBase is a placeholder implementation of the mkparser.Scope.
 // All our scopes are read-only and resolve only simple variables.
 type ScopeBase struct{}