Could someone explain the difference between software design and software architecture? More specifically; if you tell someone to present you the 'design' - what would you expect them to present? Same goes for 'architecture'.
My current understanding is:
design: UML diagram/flow chart/simple wireframes (for UI) for a specific module/part of the system
architecture: component diagram (showing how the different modules of the system communicates with each other and other systems), what language is to be used, patterns...?
Correct me if I'm wrong. I see Wikipedia has articles on http://en.wikipedia.org/wiki/Software_design and http://en.wikipedia.org/wiki/Software_architecture, but I'm not sure if I have understood them correctly.