newline and fix changelog conflict [docs only]
newline and fix changelog conflict [docs only]

astropy/astropy,mhvk/astropy,lpsinger/astropy,pllim/astropy,aleksandr-bakanov/astropy,StuartLittlefair/astropy,saimn/astropy,larrybradley/astropy,larrybradley/astropy,saimn/astropy,aleksandr-bakanov/astropy,larrybradley/astropy,lpsinger/astropy,mhvk/astropy,pllim/astropy,dhomeier/astropy,dhomeier/astropy,lpsinger/astropy,larrybradley/astropy,aleksandr-bakanov/astropy,StuartLittlefair/astropy,astropy/astropy,dhomeier/astropy,larrybradley/astropy,mhvk/astropy,mhvk/astropy,StuartLittlefair/astropy,mhvk/astropy,saimn/astropy,StuartLittlefair/astropy,lpsinger/astropy,aleksandr-bakanov/astropy,pllim/astropy,saimn/astropy,pllim/astropy,dhomeier/astropy,lpsinger/astropy,dhomeier/astropy,astropy/astropy,astropy/astropy,astropy/astropy,pllim/astropy,saimn/astropy,StuartLittlefair/astropy