What was the berlin chrisis? I cant find it in the back of my book. Please help.. Thank you!

http://en.wikipedia.org/wiki/Berlin_Crisis_of_1961

or

http://en.wikipedia.org/wiki/Berlin_Blockade

??