Merge branch 'master' of github.com:matplotlib/matplotlib

Author: mdboom

examples/api/fahrenheit_celcius_scales.py renamed to examples/api/fahrenheit_celsius_scales.py

@@ -1,12 +1,12 @@
 """
-Shoiw how to display two scales on the left and right y axis -- Fahrenheit and Celcius
+Show how to display two scales on the left and right y axis -- Fahrenheit and Celsius
 """
 
 import matplotlib.pyplot as plt
 
 fig = plt.figure()
 ax1 = fig.add_subplot(111)     # the Fahrenheit scale
-ax2 = ax1.twinx()              # the Celcius scale
+ax2 = ax1.twinx()              # the Celsius scale
 
 def Tc(Tf):
     return (5./9.)*(Tf-32)
@@ -21,8 +21,8 @@ def update_ax2(ax1):
 ax1.callbacks.connect("ylim_changed", update_ax2)
 ax1.plot([78, 79, 79, 77])
 
-ax1.set_title('Two scales: Fahrenheit and Celcius')
+ax1.set_title('Two scales: Fahrenheit and Celsius')
 ax1.set_ylabel('Fahrenheit')
-ax2.set_ylabel('Celcius')
+ax2.set_ylabel('Celsius')
 
 plt.show()