Web 2.0 terminology
Wiki
A website, or the software used to create such a website, in which users can easily create, edit and modify the content of interlinked pages using a standard web browser with a simplified mark-up language.
Wikipedia
A large and well-known Wiki site used as an encyclopedia, operated by the non-profit Wikimedia Foundation.
Please don’t use these terms interchangeably, they have extremely distinct meanings, and it makes me cringe. Thank-you.
