add functional test to create non default document category (#11665)
Merged r10216 from trunk
add missing fixtures to test/functional/documents_controller_test.rb
Merged r10213 from trunk
add missing fixtures to test/unit/document_test.rb
Updated macro documentation.
Validate macro name and options.
Let macros optionally accept a block of text (#3061).