Fix conflict

[factor.git] / extra / peg / search / search-docs.factor

diff --git a/extra/peg/search/search-docs.factor b/extra/peg/search/search-docs.factor
old mode 100644 (file)
new mode 100755 (executable)
index d6dc5e5..244dc7f
--- a/extra/peg/search/search-docs.factor
+++ b/extra/peg/search/search-docs.factor
@@ -3,41 +3,41 @@
 USING: help.syntax help.markup peg peg.search ;
 
 HELP: tree-write
-{ $values 
+{ $values
   { "object" "an object" } }
-{ $description 
+{ $description
     "Write the object to the standard output stream, unless "
     "it is an array, in which case recurse through the array "
     "writing each object to the stream." }
 { $example "{ 65 \"bc\" { 68 \"ef\" } } tree-write" "AbcDef" } ;
 
 HELP: search
-{ $values 
-  { "string" "a string" } 
-  { "parser" "a peg based parser" } 
-  { "seq"    "a sequence" } 
+{ $values
+  { "string" "a string" }
+  { "parser" "a peg based parser" }
+  { "seq"    "a sequence" }
 }
-{ $description 
+{ $description
     "Returns a sequence containing the parse results of all substrings "
     "from the input string that successfully parse using the "
     "parser."
 }
-    
+
 { $example "\"one 123 two 456\" 'integer' search" "V{ 123 456 }" }
 { $example "\"one 123 \\\"hello\\\" two 456\" 'integer' 'string' 2array choice search" "V{ 123 \"hello\" 456 }" }
 { $see-also replace } ;
-    
+
 HELP: replace
-{ $values 
-  { "string" "a string" } 
-  { "parser" "a peg based parser" } 
-  { "result"    "a string" } 
+{ $values
+  { "string" "a string" }
+  { "parser" "a peg based parser" }
+  { "result"    "a string" }
 }
-{ $description 
+{ $description
     "Returns a copy of the original string but with all substrings that "
     "successfully parse with the given parser replaced with "
     "the result of that parser."
-}   
+}
 { $example "\"one 123 two 456\" 'integer' [ 2 * number>string ] action replace" "\"one 246 two 912\"" }
 { $see-also search } ;