Merge branch 'testdoc'

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	Documentation/user-manual.txt
This commit is contained in:
Dirk Hohndel 2014-12-16 07:13:46 -08:00
commit ad4389aacb
8 changed files with 214 additions and 80 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 524 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB