Merge "TIF: make the documentation consistent." into lmp-dev