San Francisco has settled a two-year legal fight with its neighbour across the bay that will allow the city of Oakland to include "San Francisco" in its airport's name — as long as it doesn't highlight the two words in any way.