Talk:Discipline points/@comment-66.162.252.10-20120604214358/@comment-5151510-20120607112331

The former. You only get general XP, gold and/or Rift Crystals for completing quests, as well as items sometimes. The only way to gain DP is to fight stuff. I think.