Fix conflict

diff --cc basis/math/functions/functions-docs.factor
index fb392191d45c87498aa076512d037514b3541e43,2735fa3903f8354895c767526844a6ab5b7ad211..11f209fb9c1445a7a45030f14413a2afd95568d4
--- 1/basis/math/functions/functions-docs.factor
--- 2/basis/math/functions/functions-docs.factor
+++ b/basis/math/functions/functions-docs.factor
@@@ -42,24 -47,25 +47,21 @@@ ARTICLE: "arithmetic-functions" "Arithm
  
  ARTICLE: "power-functions" "Powers and logarithms"
  "Squares:"
- { $subsection sq }
- { $subsection sqrt }
+ { $subsections sq sqrt }
  "Exponential and natural logarithm:"
- { $subsection exp }
- { $subsection cis }
- { $subsection log }
 -{ $subsections
 -    exp
 -    cis
 -    log
 -    log1+
 -    log10
 -}
++{ $subsections exp cis log }
 +"Other logarithms:"
- { $subsection log1+ }
- { $subsection log10 }
++{ $subsection log1+ log10 }
  "Raising a number to a power:"
- { $subsection ^ }
- { $subsection 10^ }
+ { $subsections ^ 10^ }
  "Converting between rectangular and polar form:"
- { $subsection abs }
- { $subsection absq }
- { $subsection arg }
- { $subsection >polar }
- { $subsection polar> } ;
+ { $subsections
+     abs
+     absq
+     arg
+     >polar
+     polar>
+ } ;
  
  ARTICLE: "trig-hyp-functions" "Trigonometric and hyperbolic functions"
  "Trigonometric functions:"

diff --cc basis/regexp/regexp-docs.factor
Simple merge

diff --cc core/combinators/combinators-docs.factor
index 5d778ba1e41ec165d9647bd8ae59d5506b8e56d6,b7827c7c2b64ecbf34b7654ffc67ed36a835f03f..c1f797ff2bc10471f6009110251bcc1a8b06f388
--- 1/core/combinators/combinators-docs.factor
--- 2/core/combinators/combinators-docs.factor
+++ b/core/combinators/combinators-docs.factor
@@@ -85,16 -81,14 +81,14 @@@ $n
  } ;
  
  ARTICLE: "spread-combinators" "Spread combinators"
 -"The spread combinators apply multiple quotations to multiple values. The " { $snippet "*" } " suffix signifies spreading."
 +"The spread combinators apply multiple quotations to multiple values. In this case, " { $snippet "*" } " suffix signify spreading."
  $nl
  "Two quotations:"
- { $subsection bi* }
- { $subsection 2bi* }
+ { $subsections bi* 2bi* }
  "Three quotations:"
- { $subsection tri* }
- { $subsection 2tri* }
+ { $subsections tri* 2tri* }
  "An array of quotations:"
- { $subsection spread }
+ { $subsections spread }
  "Technically, the spread combinators are redundant because they can be simulated using shuffle words and other combinators, and in addition, they do not reduce token counts by much, if at all. However, they can make code more readable by expressing intention and exploiting any inherent symmetry. For example, a piece of code which performs three operations on three related values can be written in one of two ways:"
  { $code
      "! First alternative; uses dip"

diff --cc core/math/parser/parser-docs.factor
Simple merge