nn and k parameter docs
Merge commit '7c9339aad0b916201e5f0c60d1fba5ecbc88c9d5'

Conflicts:
	doc/CFdoc.tex