What is the difference between a zeppelin or an airship?

There are two common types of Airship:

• The ridged airship that the Zeppelin of the 1930s was
• The blimp.