Merge branch 'ht/blank' into ht/namespaces
commit3d4d631fd5fcc4529714b229219d56c3c3471ed2
authorHenrik Tidefelt <tiddeweb@gmail.com>
Wed, 28 Jan 2015 23:18:23 +0000 (29 00:18 +0100)
committerHenrik Tidefelt <tiddeweb@gmail.com>
Wed, 28 Jan 2015 23:18:23 +0000 (29 00:18 +0100)
tree57a50143d67ec08e9c85099262d1d556431fbb7b
parentf1b81700fe7facece214cbef76ec16a825e03ec5
parent2ea9a3788156f96769b6849e1946731fdab61d01
Merge branch 'ht/blank' into ht/namespaces

* ht/blank:
  Rename 'graphics mode' -> 'shape mode'
  Allow command line forcing of blank mode or graphics mode
  Don't require output file to be determined in blank mode

Conflicts:
doc/parts/structure/chap-guidelines.sxml
doc/parts/man/index.sxml
doc/parts/structure/chap-guidelines.sxml