- documentation cleanup in ORM including [ticket:2816]

Conflicts:
	lib/sqlalchemy/orm/mapper.py