Update ups.rst, cleaned and merged