Final answer:
Federal jurisdiction based upon a 'federal question' includes cases based on the United States Constitution, a federal statute, and a federal treaty, but not cases based on diversity.
Step-by-step explanation:
Federal jurisdiction based upon a 'federal question' includes cases based on the United States Constitution, a federal statute, and a federal treaty. However, it does not include cases based on diversity. Diversity jurisdiction refers to cases where the parties are from different states and the amount in controversy exceeds a certain threshold. In these cases, the federal court has jurisdiction over the matter.