A blog is a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

As a noun, wiki means “a website that allows anyone to add, delete or revise content by using a web browser.” The term wiki is also used as a verb; if you wiki, you are either researching a topic on a wiki or contributing to one.

Ryan James Pascual

=====================================================================================================================

"Wiki is a perfect site especially for students, it serves as the foundation or a means where participants can edit, gain additional information on a certain topic.It is a site were students can benefit by gaining an in site about networking, by means of open-source page where anybody can suggest, edit or improve someone's ideas." -Louie Cornell Babanto , BSCS 3

======================================================================================================================

A wiki is a collaborative Web site comprises the perpetual collective work of many authors. Similar to a blog in structure and logic, a wiki allows anyone to edit, delete or modify content that has been placed on the Web site using a browser interface, including the work of previous authors. In contrast, a blog, typically authored by an individual, does not allow visitors to change the original posted material, only add comments to the original content.

A blog is Short for Web log, a blog is a Web page that serves as a publicly accessible personal journal for an individual. Typically updated daily, blogs often reflect the personality of the author.

-Demilerm Trilles

============================================================ A blog - is a Web page that serves as a publicly accessible personal journal for an individual. Typically updated daily, blogs often reflect the personality of the author.

Wiki - is a piece of server software that allows users to freely create and edit Web page content using any Web browser. Wiki supports hyperlinks and has a simple text syntax for creating new pages and cross links between internal pages on the fly.

---RAY HORMILLDA---

============================================================

======Marconi Kelvin De Real - BSCS-3 ========

A wiki is run using wiki software, otherwise known as a wiki engine. There are dozens of different wiki engines in use, both standalone and part of other software, such as bug tracking systems. Some wiki engines are open source, whereas others are proprietary. Some permit control over different functions (levels of access); for example, editing rights may permit changing, adding or removing material. Others may permit access without enforcing access control. Other rules may also be imposed to organize content. A wiki engine is a type of content management system, but it differs from most other such systems, including blog software, in that the content is created without any defined owner or leader, and wikis have little implicit structure, allowing structure to emerge according to the needs of the users.. ==========================

1. A wiki (Listeni/'w?ki/ wik-ee) is a website which allows collaborative modification of its content and structure directly from the web browser. In a typical wiki, text is written using a simplified markup language (known as "wiki markup"), and often edited with the help of a rich-text editor. 2. A blog is a frequently updated online personal journal or diary. It is a place to express yourself to the world. A place to share your thoughts and your passions. Really, it’s anything you want it to be. For our purposes we’ll say that a blog is your own website that you are going to update on an ongoing basis. Blog is a short form for the word weblog and the two words are used interchangeably.

-Mark Gambito

==========================

Bayabas the one clickman

======================= A wiki is a website that allows many users to create, edit, and organize content in a collaborative manner. Wikipedia and Wikia are classified as wikis.

A blog (short for weblog) is a Web site that maintains an ongoing chronicle of information. A blog us frequently updated by usually a single user, and can feature diary-type commentary and links to other articles and webpages. Sites running on Blogger and WordPress are classified as blogs.

MICHAEL JODEM C. GATUS =======================

Emelgar Paasa VI:

What is a wiki? It is collaborative Web site comprised of the perpetual collective work of many authors. Similar to a blog in structure and logic, a wiki allows anyone to edit, delete or modify content that has been placed on the Web site using a browser interface, including the work of previous authors. In contrast, a blog, typically authored by an individual, does not allow visitors to change the original posted material, only add comments to the original content. The term wiki refers to either the Web site or the software used to create the site. The first wiki was created by Ward Cunnigham in 1995.

What is a blog? The definition of a blog is an online, chronological commentary.


Jason Rey N. Peniero

Wiki is a Web site that allows visitors to make changes , contributions, or corrections while Blog is a Web site on which someone writes about personal opinions , activities, and experiences.

Jason Rey N. Peniero

KEVIN MABUL [

Blogs are discussion or informational websites publised on the World Wide Web consisting of discrete entries, called "posts," typically displayed in reverse chronological order.

Wikis are websites which allow collaborative modification of their content and structure directly from the web browser. In a typical wiki, text is written using a simplified markup language and often edited with the help of a rich text editor.

KEVIN MABUL ]

A blog (a truncation of the expression weblog)[1] is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (the most recent post appears first). Until 2009, blogs were usually the work of a single individual[citation needed], occasionally of a small group, and often covered a single subject. More recently "multi-author blogs" (MABs) have developed, with posts written by large numbers of authors and professionally edited. - Ildefonso Esguerra

A wiki is run using wiki software, otherwise known as a wiki engine. There are dozens of different wiki engines in use, both standalone and part of other software, such as bug tracking systems. Some wiki engines are open source, whereas others are proprietary. Some permit control over different functions (levels of access); for example, editing rights may permit changing, adding or removing material. Others may permit access without enforcing access control. Other rules may also be imposed to organize content. A wiki engine is a type of content management system, but it differs from most other such systems, including blog software, in that the content is created without any defined owner or leader, and wikis have little implicit structure, allowing structure to emerge according to the needs of the users - Ildefonso Esguerra

Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. In a typical wiki, text is written using a simplified markup language (known as "wiki markup"), and often edited with the help of a rich-text editor.A wiki is run using wiki software, otherwise known as a wiki engine. There are dozens of different wiki engines in use, both standalone and part of other software, such as bug tracking systems. Some wiki engines are open source, whereas others are proprietary. Some permit control over different functions (levels of access); for example, editing rights may permit changing, adding or removing material. Others may permit access without enforcing access control. Other rules may also be imposed to organize content. A wiki engine is a type of content management system, but it differs from most other such systems, including blog software, in that the content is created without any defined owner or leader, and wikis have little implicit structure, allowing structure to emerge according to the needs of the users. - Ryan Galon

Blog - A blog (a truncation of the expression weblog)[1] is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (the most recent post appears first). Until 2009, blogs were usually the work of a single individual[citation needed], occasionally of a small group, and often covered a single subject. More recently "multi-author blogs" (MABs) have developed, with posts written by large numbers of authors and professionally edited. MABs from newspapers, other media outlets, universities, think tanks, advocacy groups, and similar institutions account for an increasing quantity of blog traffic. The rise of Twitter and other "microblogging" systems helps integrate MABs and single-author blogs into societal newstreams. Blog can also be used as a verb, meaning to maintain or add content to a blog. – Ryan Galon

WIKI: a website that allows anyone to add, delete, or revise content by using a web browser. BLOG: a website that maintains frequently updated and ongoing entries or posts. CLINT SABUERO

wiki - a website that allows visitors to make changes, contributions, or corrections.

blog - a website on which someone writes about personal opinions and experiences

Juliefer D. Mansueto

Wiki - A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server.

Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa

BLOG (a truncation of the expression weblog) is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (the most recent post appears first). - RAJ GECOSALA

WIKI (Listeni/ˈwɪki/ wik-ee) is a website which allows collaborative modification of its content and structure directly from the web browser. In a typical wiki, text is written using a simplified markup language (known as "wiki markup"), and often edited with the help of a rich-text editor. - RAJ GECOSALA

Art Gerald Ranque Blog: a shared online journal where people can post diary entries about their personal experiences and hobbies. Wiki: a collaborative website which can be directly edited merely using a web browser, often by anyone with access to it.

Wiki is a website which allows collaborative modification of its content and structure directly from the web browser. Definition of wiki is a discussion or informational site published on the World Wide Web consisting of discrete entries ("posts") typically displayed in reverse chronological order (John Edgar Otom) Definition of blog

Wiki-A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server. Wikis end up being created mainly by a collaborative effort of the site visitors. A great example of a large wiki is the Wikipedia, a free encyclopedia in many languages that anyone can edit.

Blog - Short for "Web Log," this term refers to a list of journal entries posted on a Web page. Anybody who knows how to create and publish a Web page can publish their own blog. Some Web hosts have made it even easier by creating an interface where users can simply type a text entry and hit "publish" to publish their blog. Bayaras, Christian Loisse G.

Definition of wiki A website that allows collaborative editing of its content and structure by its users.Term comes from the Hawaiian term "wikiwiki" which means "fast. Definition of blog -A regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. (Laurence Guevarra)

====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog

Blog - a Web site on which someone writes about personal opinions, activities, and experiences Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong

A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.

Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser. Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience. -Angelo Karlo B. Tan

Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA

Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga

Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)

Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Art Gerald Ranque Wiki A collaborative website which can be directly edited merely using a web browser, often by anyone with access to it. Blog A shared online journal where people can post diary entries about their personal experiences and hobbies.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


A wiki (Listeni/ˈwɪki/ wik-ee) is a website which allows collaborative modification of its content and structure directly from the web browser. In a typical wiki, text is written using a simplified markup language (known as "wiki markup"), and often edited with the help of a rich-text editor.

A wiki is run using wiki software, otherwise known as a wiki engine. There are dozens of different wiki engines in use, both standalone and part of other software, such as bug tracking systems. Some wiki engines are open source, whereas others are proprietary. Some permit control over different functions (levels of access); for example, editing rights may permit changing, adding or removing material. Others may permit access without enforcing access control. Other rules may also be imposed to organize content. A wiki engine is a type of content management system, but it differs from most other such systems, including blog software, in that the content is created without any defined owner or leader, and wikis have little implicit structure, allowing structure to emerge according to the needs of the users.

- Farrah Mae P. Galgo


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ End of edit conflict


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Seems editing this page is not peeing in the pool, so I try to ask here because I did't find the right place to ask questions:

Is there a repository/collection/library of Lua scripts beyond Lua/Examples to learn from ? Specifically, it seems os.clock() has only timer tick resolution (15 ms on windows and 10 ms on linux), but I need sub-millisecond precision.

Background: I'm willing to write a Lua script to accumulate the timestamps of tens of thousands of sniffed packets and to account wall clock time to my client application once a packet is received on the client pc and to account wall clock time to the network or the other end of the socket (the server) once a packet is sent and do it vice versa on the server pc to get an exact measure of client, network and server times for a performance analysis, but don't know where to start from.

Perhaps someone can point me to the right place to search or to the right method to use ? Thanks, Juergen.

It's not peeing in the pool, but it's also not the best place to ask, as not everybody will see it, and, if somebody sees it and replies, you won't necessarily get notified of it.

The End(well, not quite ;-) ) (cue the song from Apocalypse Now)

You could ask that question on, for example, http://ask.wireshark.org/ or on the wireshark-dev mailing list, but as it's really a Lua question, it might be better to ask on the lua-l mailing list or on http://stackoverflow.com (I don't know of any Lua-specific Q&A site).

However, the Lua 5.1 manual item on os.clock() seems to indicate that it's not what you want - it says it "returns an approximation of the amount in seconds of CPU time used by the program", but it sounds as if you want real time, not CPU time. I don't know whether os.time() returns a value with a fractional part, or what the resolution is, but, if the OS call atop which os.time() is implemented - probably gettimeofday() or something such as that on most if not all UN*Xes - returns a higher-precision time value, that might give you what you want.

This is just a simple text edit, as practice. Thanks.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Wiki - A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server.

Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


1. Wiki (sometimes spelled "Wiki") is a server program that allows users to collaborate in forming the content of a Web site. The term comes from the word "wikiwiki," which means "fast" in the Hawaiian language. 2. A blog is a frequently updated online personal journal or diary. It is a place to express yourself to the world. A place to share your thoughts and your passions. Really, it’s anything you want it to be. For our purposes we’ll say that a blog is your own website that you are going to update on an ongoing basis. Blog is a short form for the word weblog and the two words are used interchangeably. -Mark Gambito


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



Wiki - Wikis are web pages that groups of people can edit and view together. Whereas a blog is more of an individual, personal journal, a wiki is a group creation. Like blogs, wikis can be created in stages, and by anyone, without the sponsorship of a major commercial enterprise. Private organizations and individuals can also build their own wikis to capture collected knowledge on a particular subject. Many businesses use wikis as their internal collaboration tool. With the global Internet, people of all walks of life can participate in wikis and add their own perspectives and knowledge to a shared resource.

Blog - Weblogs (Blogs) are web pages that are easy to update and edit. Unlike commercial websites, which are created by professional communications experts, blogs give anyone a means to communicate their thoughts to a global audience without technical knowledge of web design. There are blogs on nearly every topic one can think of, and communities of people often form around popular blog authors.

-JD Belderol



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki A website that allows collaborative editing of its content and structure by its users.Term comes from the Hawaiian term "wikiwiki" which means "fast. Definition of blog -A regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. (Laurence Guevarra)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Wiki - collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. by Torralba, Eriko S from Google


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Definition of wiki A website that allows collaborative editing of its content and structure by its users.Term comes from the Hawaiian term "wikiwiki" which means "fast. Definition of blog -A regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. (Laurence Guevarra)


/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a Web site on which someone writes about personal opinions, activities, and experiences Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


-A regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. (Laurence Guevarra)


/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Blog - a Web site on which someone writes about personal opinions, activities, and experiences


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong


/!\ Edit conflict - your version:


Wiki - A wiki is a Web site that allows users to add and update content on the site using their own Web browser. This is made possible by Wiki software that runs on the Web server.

Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Blog - A blog (short for weblog) is a personal online journal that is frequently updated and intended for general public consumption.

Trisha Louise O. Baa


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:


Wikipedia - is a sexist site full gender bias definition. Most of the information should not be trusted and should only be taken as is; not factual. Always check for reference and sources. example: this is a dog ()() () < i am a dog ) c(")(") Blog - a Web site on which someone writes about personal opinions, activities, and experiences #Michael #Neri


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - a Web site on which someone writes about personal opinions, activities, and experiences Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:


Wikipedia - is a sexist site full gender bias definition. Most of the information should not be trusted and should only be taken as is; not factual. Always check for reference and sources. example: this is a dog ()() () < i am a dog ) c(")(") Blog - a Web site on which someone writes about personal opinions, activities, and experiences #Michael #Neri


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser. Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience. -Angelo Karlo B. Tan


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Blog - a Web site on which someone writes about personal opinions, activities, and experiences Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


-FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.


/!\ End of edit conflict


(Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser. Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience. -Angelo Karlo B. Tan


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


1. A wiki is a website that allows collaborative editing of its content and structure by its users. 2. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website that allows anyone to add, delete, or revise content by using a web browser. On the other hand, a blog is a website containing a writer's or group of writers' own experiences, observations, opinions, etc., and often having images and links to other websites.

-Rodrigo G. Lomoya Jr.


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Blog - a Web site on which someone writes about personal opinions, activities, and experiences Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Blog - a Web site on which someone writes about personal opinions, activities, and experiences Wiki - a Web site that allows visitors to make changes, contributions, or corrections ~Ciedelle Kaye Liong


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Wiki, coined by Ward Cunningham which originated from the Hawaiian word “wiki-wiki” which means “quick,” is a collaborative website in which anyone visiting the website is able to add, delete, or revise the contents through the use of a web browser. Blog, shortened from the term “weblog or web log”, is a regularly updated website run by an individual or a small group consisting of entries called posts through which someone writes about personal opinions, activities, and experience. -Angelo Karlo B. Tan


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:


Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor.


/!\ End of edit conflict


Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero

A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ Edit conflict - your version:


-a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:


Definition of wiki -a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast."


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary.


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


(Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====


/!\ End of edit conflict


1. A wiki is a website that allows collaborative editing of its content and structure by its users. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

1. A wiki is a website that allows collaborative editing of its content and structure by its users. A blog regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - blog


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Definition of wiki


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


-a server program that allows the users to collaborate in forming the content of a Web site. Term comes from the Hawaiian term "wikiwiki" which means "fast." Definition of blog -a website, similar to an online journal, that includes chronological entries made by individuals. Term define from both "web" and "log." Mostly focuses on a specific subject and provide users with forums to talk about each postings. Blogs are used such like a diary. (Earl Rudinas)


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict


A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


Wiki - a website that allows collaborative editing of its content and structure by its users


/!\ End of edit conflict


Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict


Wiki - A wiki is a website which allows collaborative modification of its content and structure directly from the web browser. A wiki involves text that is written using a simplified markup language, and often edited with the help of a rich-text editor. Blog - Blog" is an abbreviated version of "weblog," which is a term used to describe websites that maintain an ongoing chronicle of information. A blog features diary-type commentary and links to articles on other websites -FC Balatero


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict


Wiki - a website that allows collaborative editing of its content and structure by its users Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style.

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


Wiki - a website that allows collaborative editing of its content and structure by its users. Blog - a regularly updated website or web page, typically one run by an individual or small group, that is written in an informal or conversational style. - Ryan Galon


/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict