Definitions


 * Blog** - online journal, comes from "web log." Can also be an audioblog (podcast) or videoblog or photoblog, etc.

Wiki - website where almost anyone can add or edit content, also can be audio, video, or photo based, or can contain various types of documents and pages. Great for collaboration on a shared project or document. Has discussion component built-in, so acts like a blog within the Wiki.