Fix conflict

[factor.git] / core / classes / classes-docs.factor

diff --git a/core/classes/classes-docs.factor b/core/classes/classes-docs.factor
old mode 100644 (file)
new mode 100755 (executable)
index 1477146..859b6a9
--- a/core/classes/classes-docs.factor
+++ b/core/classes/classes-docs.factor
@@ -122,7 +122,7 @@ HELP: predicate-word
 HELP: define-predicate
 { $values { "class" class } { "predicate" "a predicate word" } { "quot" "a quotation" } }
 { $description
-    "Defines a predicate word. This is identical to a compound definition associating " { $snippet "quot" } " with " { $snippet "predicate" } " with the added perk that three word properties are set:"
+    "Defines a predicate word. This is identical to a word definition associating " { $snippet "quot" } " with " { $snippet "predicate" } " with the added perk that three word properties are set:"
     { $list
         { "the class word's " { $snippet "\"predicate\"" } " property is set to a quotation that calls the predicate" }
         { "the predicate word's " { $snippet "\"predicating\"" } " property is set to the class word" }