improved (?) intra-node SSH FAQ item
.ssh/authorized_keys2 is deprecated since 2011
resolve conflicts after merge from master
add documentation on resource config changes, closes #421
fix #438
remove superfluous \n
update resources.rst
fixes #451
merge from master