Merge

Docs/manual.texi:
  merged
  big deletion by yfaktoro@nslinuxw2.bedford.progress.com undone
  (I have to make a decision durion merge)
  He should re-delete, if it's what he really wanted to do.