What is theology?
Theology is all what the Bible teaches on any given topic.
What is theology proper?
Theology proper is all what the Bible teaches specifically about God.