p.conf: update documentation

Signed-off-by: Andreas Beckmann <anbe@debian.org>
p-s: fix mismerge and drop superfluous comment

Signed-off-by: Andreas Beckmann <anbe@debian.org>
p.conf correctly disable lenny2squeeze rescheduling

Signed-off-by: Andreas Beckmann <anbe@debian.org>
add vim markers
Merge remote-tracking branch 'andreas/for-holger' into develop