edited general.tex