merge help text and custom help text+solution

Both are linked from other places, the second is probably the better term, and the first is used as the tag in tickets. Test: