This wiki has been migrated to https://gitlab.com/wireshark/wireshark/-/wikis/home and is now deprecated. Please use that site instead.
Differences between revisions 248 and 249
Revision 248 as of 2016-01-05 07:39:43
Size: 300177
Editor: ryangalon
Comment:
Revision 249 as of 2016-01-05 07:40:19
Size: 618160
Editor: Trisha Baa
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
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

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:''' ----
Line 30: Line 35:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 38: Line 47:
---- /!\ '''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:''' ----
Line 50: Line 71:


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
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.

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
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.


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 65: Line 123:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 80: Line 139:
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.

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
Line 99: Line 172:

---- /!\ '''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 - 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''' ----
---- /!\ '''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:''' ----
=====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

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''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''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other 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)
Line 182: Line 184:


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''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.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
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''' ----

---- /!\ '''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:''' ----
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:''' ----
=====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

---- /!\ '''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 - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your 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:''' ----
---- /!\ '''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





---- /!\ '''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:''' ----
---- /!\ '''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 - 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''' ----
---- /!\ '''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:''' ----

---- /!\ '''Edit conflict - your 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''' ----
Line 236: Line 319:
---- /!\ '''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:''' ----
Line 249: Line 326:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----



---- /!\ '''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''' ----

---- /!\ '''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''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other 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:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Line 273: Line 398:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
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 - 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''' ----

---- /!\ '''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:''' ----
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.

---- /!\ '''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:''' ----
Line 303: Line 459:
---- /!\ '''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


---- /!\ '''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 - 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 - 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.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
(Earl Rudinas)


---- /!\ '''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 - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
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 - 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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''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 - 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:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 372: Line 517:
---- /!\ '''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:''' ----
---- /!\ '''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 - 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 - 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''' ----

---- /!\ '''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 - your version:''' ----


---- /!\ '''Edit conflict - other 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:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''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:''' ----

---- /!\ '''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 - 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:''' ----
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 - 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:''' ----
Line 445: Line 596:

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other 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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 452: Line 630:
---- /!\ '''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.
---- /!\ '''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 - 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

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
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''' ----

---- /!\ '''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 - your version:''' ----
Line 458: Line 677:

---- /!\ '''End of edit conflict''' ----
Line 463: Line 680:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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''' ----

---- /!\ '''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 - your version:''' ----
Line 489: Line 692:
---- /!\ '''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 - 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:''' ----
---- /!\ '''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 - 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 - your version:''' ----

---- /!\ '''Edit conflict - other 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''' ----
Line 573: Line 704:
---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other 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 - 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


---- /!\ '''End of edit conflict''' ----

---- /!\ '''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


---- /!\ '''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 - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other 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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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 - other version:''' ----

---- /!\ '''Edit conflict - other 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''' ----
Line 653: Line 797:

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 660: Line 798:

---- /!\ '''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:''' ----
Line 662: Line 814:
---- /!\ '''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 - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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:''' ----
Line 683: Line 858:
---- /!\ '''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''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''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 website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - your 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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - 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:''' ----


---- /!\ '''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:''' ----

---- /!\ '''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.

---- /!\ '''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:''' ----
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:''' ----

---- /!\ '''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 - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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''' ----

---- /!\ '''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

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your 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:''' ----

---- /!\ '''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

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''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 - your version:''' ----
---- /!\ '''Edit conflict - your 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:''' ----
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:''' ----

---- /!\ '''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''' ----


---- /!\ '''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:''' ----
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

---- /!\ '''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 - other version:''' ----
Line 705: Line 1237:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 713: Line 1239:


---- /!\ '''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 - 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


---- /!\ '''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:''' ----

---- /!\ '''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''' ----
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 - your version:''' ----

---- /!\ '''Edit conflict - your 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 - 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:''' ----
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''' ----

---- /!\ '''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 - 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 - other version:''' ----

---- /!\ '''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:''' ----


---- /!\ '''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 - your version:''' ----
---- /!\ '''Edit conflict - other 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:''' ----


---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====

Line 853: Line 1337:


---- /!\ '''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 - your 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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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 - your 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''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
Line 861: Line 1613:

---- /!\ '''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

---- /!\ '''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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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 - 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 - 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''' ----


---- /!\ '''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:''' ----
Line 946: Line 1664:
---- /!\ '''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 - 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:''' ----
---- /!\ '''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''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''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


---- /!\ '''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''' ----
---- /!\ '''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:''' ----

---- /!\ '''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''' ----
Line 1034: Line 1699:
---- /!\ '''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 - 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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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''' ----

---- /!\ '''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:''' ----
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:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 1153: Line 1705:
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other 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

---- /!\ '''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 - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other 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''' ----

---- /!\ '''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 - 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 - your 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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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 - your 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 - 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:''' ----
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 - 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 - 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 - your version:''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 1386: Line 1718:

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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 - 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 - 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''' ----
Line 1435: Line 1772:
---- /!\ '''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:''' ----
Line 1458: Line 1817:

---- /!\ '''End of edit conflict''' ----
Line 1465: Line 1826:
---- /!\ '''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''' ----

---- /!\ '''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''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit conflict - other version:''' ----


---- /!\ '''Edit conflict - o
ther version:''' ----
---- /!\ '''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 - your version:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 1513: Line 1904:
---- /!\ '''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 - 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:''' ----
---- /!\ '''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:''' ----
Line 1533: Line 1973:

---- /!\ '''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:''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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:''' ----
Line 1561: Line 2042:

---- /!\ '''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:''' ----
---- /!\ '''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 - 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:''' ----
Line 1597: Line 2077:

---- /!\ '''Edit conflict - your 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''' ----
---- /!\ '''Edit conflict - your 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:''' ----
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:''' ----
Line 1633: Line 2125:
---- /!\ '''Edit conflict - your 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:''' ----
---- /!\ '''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 - 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.

---- /!\ '''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:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 1685: Line 2133:
---- /!\ '''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:''' ----
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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
Line 1718: Line 2208:
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''' ----


---- /!\ '''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 - 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 - 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:''' ----
Line 1733: Line 2248:

---- /!\ '''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:''' ----
---- /!\ '''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


---- /!\ '''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 - 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 - 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.

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 - 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''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other 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 - 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:''' ----
Line 1932: Line 2322:
---- /!\ '''Edit conflict - your 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:''' ----
---- /!\ '''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 - 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''' ----
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:''' ----
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:''' ----
---- /!\ '''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''' ----


---- /!\ '''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:''' ----
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:''' ----
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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other 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 - 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''' ----

---- /!\ '''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:''' ----
Line 1951: Line 2596:
---- /!\ '''End of edit conflict''' ---- ---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 1953: Line 2603:

---- /!\ '''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:''' ----
Line 1968: Line 2605:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''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:''' ----
---- /!\ '''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''' ----
Line 1990: Line 2630:


---- /!\ '''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 - 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''' ----
---- /!\ '''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 - 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:''' ----
---- /!\ '''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:''' ----
Line 2030: Line 2747:
---- /!\ '''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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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:''' ----
---- /!\ '''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''' ----
---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
Line 2104: Line 2814:



---- /!\ '''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 - 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''' ----
---- /!\ '''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 - 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''' ----
Line 2184: Line 2866:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other 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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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 - your version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your 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''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''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 - 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:''' ----


---- /!\ '''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 - 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:''' ----

---- /!\ '''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 - 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:''' ----
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 - your version:''' ----
Lovella June D. Gonzaga

---- /!\ '''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 - 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:''' ----

---- /!\ '''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''' ----


---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
Line 2220: Line 3493:


---- /!\ '''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 - 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''' ----

---- /!\ '''Edit conflict - your 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:''' ----
---- /!\ '''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 - other version:''' ----


---- /!\ '''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 - 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 - 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:''' ----

---- /!\ '''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.
Line 2283: Line 3633:
---- /!\ '''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''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''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 - 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''' ----
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 - 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 - 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 - 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''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''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:''' ----


---- /!\ '''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 - 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:''' ----
---- /!\ '''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 - your version:''' ----

---- /!\ '''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''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----

---- /!\ '''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''' ----
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 - 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




---- /!\ '''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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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


---- /!\ '''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''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - 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''' ----

---- /!\ '''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:''' ----

---- /!\ '''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 - 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''' ----


---- /!\ '''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)


---- /!\ '''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 - 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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----


---- /!\ '''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 - 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:''' ----
---- /!\ '''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:''' ----


---- /!\ '''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 - 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''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 2343: Line 5058:
---- /!\ '''Edit conflict - other version:''' ----
Line 2360: Line 5077:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 2365: Line 5086:

---- /!\ '''End of edit conflict''' ----
Line 2393: Line 5116:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 2400: Line 5127:
---- /!\ '''End of edit conflict''' ----
Line 2460: Line 5189:
---- /!\ '''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''' ----
Line 2618: Line 5353:
---- /!\ '''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 - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict -
other version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit 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:''' ----
Line 2636: Line 5381:

---- /!\ '''End of edit conflict''' ----
Line 2712: Line 5459:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 2793: Line 5546:
---- /!\ '''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:''' ----
---- /!\ '''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''' ----
Line 2916: Line 5681:
---- /!\ '''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 - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 3037: Line 5808:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 3044: Line 5819:

---- /!\ '''End of edit conflict''' ----
Line 3091: Line 5868:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 3100: Line 5881:

---- /!\ '''End of edit conflict''' ----
Line 3130: Line 5913:
---- /!\ '''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
''' ----

---- /!\ '''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:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''E
dit conflict - other 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 - 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''' ----
Line 3196: Line 5991:
---- /!\ '''Edit conflict - other 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:''' ----
Line 3209: Line 6014:

---- /!\ '''End of edit conflict''' ----
Line 3237: Line 6044:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''End of edit conflict''' ----
Line 3282: Line 6095:
---- /!\ '''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 - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 3337: Line 6156:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 3353: Line 6176:
---- /!\ '''End of edit conflict''' ----
Line 3379: Line 6204:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 3454: Line 6285:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 3463: Line 6298:

---- /!\ '''End of edit conflict''' ----
Line 3528: Line 6365:
---- /!\ '''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 - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 3557: Line 6400:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----
Line 3567: Line 6414:

---- /!\ '''End of edit conflict''' ----
Line 3645: Line 6494:
---- /!\ '''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:''' ----
---- /!\ '''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''' ----
---- /!\ '''E
nd 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''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 3690: Line 6551:
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 3728: Line 6595:
---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''E
nd 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:''' ----
Line 3759: Line 6636:

---- /!\ '''End of edit conflict''' ----
Line 3841: Line 6720:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 3920: Line 6805:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 3931: Line 6820:

---- /!\ '''End of edit conflict''' ----
Line 4144: Line 7035:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 4204: Line 7101:
---- /!\ '''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 - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 4295: Line 7198:
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 4412: Line 7321:
---- /!\ '''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:''' ----

---- /!\ '''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''' ----


---- /!\ '''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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''E
dit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 4640: Line 7561:

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 4672: Line 7599:
---- /!\ '''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 - your version:''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit 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 - 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''' ----
Line 4763: Line 7702:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 4768: Line 7711:

---- /!\ '''End of edit conflict''' ----
Line 4783: Line 7728:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 4903: Line 7854:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 4940: Line 7897:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 4944: Line 7905:

---- /!\ '''End of edit conflict''' ----
Line 4972: Line 7935:
---- /!\ '''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 - 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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----


---- /!\ '''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 - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5005: Line 7990:

---- /!\ '''End of edit conflict''' ----
Line 5075: Line 8062:

---- /!\ '''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 - 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:''' ----
---- /!\ '''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''' ----
Line 5172: Line 8177:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5179: Line 8188:

---- /!\ '''End of edit conflict''' ----
Line 5273: Line 8284:

---- /!\ '''End of edit conflict''' ----
---- /!\ '''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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 5369: Line 8392:
---- /!\ '''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 - 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:''' ----

---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 5423: Line 8458:
---- /!\ '''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:''' ----
Line 5430: Line 8475:

---- /!\ '''End of edit conflict''' ----
Line 5602: Line 8649:
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''E
dit 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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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''' ----
Line 5638: Line 8709:
---- /!\ '''End of edit conflict''' ----

---- /!\ '''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 - 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''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''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 - 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''' ----
Line 5762: Line 8845:


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 5783: Line 8872:
---- /!\ '''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''' ----
Line 5870: Line 8965:
---- /!\ '''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''' ----
---- /!\ '''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 - other version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''End of edit conflict''' ----
Line 5920: Line 9027:
---- /!\ '''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''' ----
Line 5943: Line 9056:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 5957: Line 9074:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 6004: Line 9129:


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 6090: Line 9221:
---- /!\ '''End of edit conflict''' ----
---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----



---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----
Line 6123: Line 9260:
---- /!\ '''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 - your 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 - 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 - your 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:''' ----
Line 6146: Line 9293:

---- /!\ '''End of edit conflict''' ----
Line 6208: Line 9357:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 6231: Line 9386:
---- /!\ '''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''' ----

---- /!\ '''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:''' ----


---- /!\ '''End of edit conflict''' ----
Line 6273: Line 9440:
---- /!\ '''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''' ----
Line 6358: Line 9537:
---- /!\ '''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 - 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''' ----

---- /!\ '''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''' ----
Line 6437: Line 9628:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 6488: Line 9685:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 6495: Line 9696:
---- /!\ '''End of edit conflict''' ----
Line 6591: Line 9794:
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
Line 6609: Line 9818:
---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
Line 6632: Line 9851:
---- /!\ '''End of edit conflict''' ----
Line 6746: Line 9967:
---- /!\ '''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''' ----
Line 6838: Line 10065:
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 6863: Line 10106:
---- /!\ '''End of edit conflict''' ----
Line 6877: Line 10122:
---- /!\ '''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''' ----
Line 6936: Line 10187:

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
Line 6953: Line 10208:
---- /!\ '''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:''' ----
Line 8596: Line 11857:

---- /!\ '''End of edit conflict''' ----
Line 8613: Line 11876:

---- /!\ '''Edit conflict - your 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:''' ----
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


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
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 - other version:''' ----

---- /!\ '''Edit conflict - other 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''' ----



---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
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:''' ----

---- /!\ '''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 - 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''' ----
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 - 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''' ----

---- /!\ '''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 - 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 - 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 - 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:''' ----
=====Jeremie S. Escalera - Lab 6 in CS 27-A =====



---- /!\ '''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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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 - 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:''' ----
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:''' ----
---- /!\ '''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 - 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''' ----

---- /!\ '''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:''' ----

---- /!\ '''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''' ----
=====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:''' ----
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''' ----


---- /!\ '''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''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''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''' ----




---- /!\ '''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''' ----
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''' ----

---- /!\ '''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 - 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''' ----


---- /!\ '''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 - 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 - 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 - 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''' ----
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''' ----

---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----

---- /!\ '''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."

---- /!\ '''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:''' ----
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''' ----


---- /!\ '''End of edit conflict''' ----


---- /!\ '''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 - 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''' ----


---- /!\ '''Edit conflict - your 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.

---- /!\ '''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 - 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 - 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 - your 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

---- /!\ '''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:''' ----
---- /!\ '''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''' ----

---- /!\ '''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 - 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




---- /!\ '''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 - 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:''' ----
---- /!\ '''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''' ----

---- /!\ '''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 - 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 - 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''' ----

---- /!\ '''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 - 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:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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 - 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 - other version:''' ----
---- /!\ '''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''' ----

---- /!\ '''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''' ----


---- /!\ '''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 - 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:''' ----
---- /!\ '''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 - 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 - 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''' ----
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 - 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:''' ----

---- /!\ '''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''' ----
---- /!\ '''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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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''' ----
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 - other version:''' ----
---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''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''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''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''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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

---- /!\ '''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''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''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 - 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''' ----

---- /!\ '''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''' ----
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''' ----


---- /!\ '''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:''' ----

---- /!\ '''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''' ----


---- /!\ '''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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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''' ----
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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
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:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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 - 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:''' ----


---- /!\ '''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 - 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:''' ----

---- /!\ '''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 - other version:''' ----


---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other 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)

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
Lovella June D. Gonzaga


---- /!\ '''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:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----
---- /!\ '''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:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other 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:''' ----

---- /!\ '''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 - 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''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - other 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:''' ----

---- /!\ '''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''' ----


---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''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
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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----

---- /!\ '''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''' ----
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:''' ----
---- /!\ '''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''' ----

---- /!\ '''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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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 - 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:''' ----
---- /!\ '''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

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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."
Definition of blog

---- /!\ '''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:''' ----
---- /!\ '''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 - 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''' ----

---- /!\ '''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 - 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''' ----

---- /!\ '''Edit conflict - other 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 - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''Edit conflict - other 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''' ----

---- /!\ '''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 - 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 - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----


---- /!\ '''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''' ----


---- /!\ '''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."

---- /!\ '''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''' ----
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''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your 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''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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


---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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.

---- /!\ '''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 - other version:''' ----

---- /!\ '''Edit conflict - your 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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''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 - 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''' ----

---- /!\ '''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 - your 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 - your version:''' ----

---- /!\ '''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 - 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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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''' ----


---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your 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

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
(Earl Rudinas)

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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 - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''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

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your 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.

---- /!\ '''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 - your version:''' ----
---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other 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''' ----
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:''' ----


---- /!\ '''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 - 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:''' ----
Lovella June D. Gonzaga


---- /!\ '''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



---- /!\ '''End of edit conflict''' ----
---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - other 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:''' ----
---- /!\ '''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 - 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



---- /!\ '''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:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----


---- /!\ '''Edit conflict - your 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

---- /!\ '''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''' ----

---- /!\ '''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:''' ----
-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:''' ----
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''' ----

---- /!\ '''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 - your version:''' ----

---- /!\ '''Edit conflict - your 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''' ----
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:''' ----
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 - 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''' ----


---- /!\ '''Edit conflict - other 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:''' ----
=====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 - 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''' ----


---- /!\ '''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)



---- /!\ '''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 - 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 - other version:''' ----

---- /!\ '''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.

Lovella June D. Gonzaga


---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
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''' ----

---- /!\ '''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''' ----

---- /!\ '''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 - 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)


---- /!\ '''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 - 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:''' ----

---- /!\ '''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 website that allows collaborative editing of its content and structure by its users.

---- /!\ '''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)



---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - other 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:''' ----
---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''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''' ----


---- /!\ '''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:''' ----
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 - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
(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 - 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 - 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''' ----
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:''' ----
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 - 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''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''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 - other version:''' ----

---- /!\ '''Edit conflict - other 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:''' ----
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:''' ----

---- /!\ '''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''' ----

---- /!\ '''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:''' ----

---- /!\ '''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.

Lovella June D. Gonzaga



---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----
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 - 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:''' ----
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 - 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:''' ----
---- /!\ '''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 - 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 - 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''' ----
---- /!\ '''Edit conflict - other 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)


---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
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''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----
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:''' ----

---- /!\ '''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 - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----


---- /!\ '''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 - 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''' ----

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 - other 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 - 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:''' ----
---- /!\ '''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:''' ----
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''' ----


---- /!\ '''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:''' ----
---- /!\ '''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''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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 - other 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 - other version:''' ----
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your 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 - 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:''' ----

---- /!\ '''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 - 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 - 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 - 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:''' ----

---- /!\ '''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 - other version:''' ----


---- /!\ '''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 - your version:''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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:''' ----

---- /!\ '''Edit conflict - other 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:''' ----

---- /!\ '''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

---- /!\ '''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.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your 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''' ----


---- /!\ '''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 - 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''' ----

---- /!\ '''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 - 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:''' ----
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 - 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:''' ----
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''' ----

---- /!\ '''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 - other version:''' ----

---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''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 - your version:''' ----

---- /!\ '''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''' ----

---- /!\ '''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''' ----
---- /!\ '''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''' ----

---- /!\ '''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''' ----

---- /!\ '''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:''' ----
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 - 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''' ----
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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''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:''' ----
---- /!\ '''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 - 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''' ----
Wiki - a website that allows collaborative editing of its content and structure by its users.

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''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


---- /!\ '''End of edit conflict''' ----


---- /!\ '''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 - 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 - 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''' ----

---- /!\ '''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 - 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 - other version:''' ----


---- /!\ '''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 - 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 - 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 - 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 - your version:''' ----


---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''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




---- /!\ '''Edit conflict - other 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 - 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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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 - 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.

Lovella June D. Gonzaga


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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.

Lovella June D. Gonzaga



---- /!\ '''Edit conflict - your 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:''' ----

---- /!\ '''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 - 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 - 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:''' ----


---- /!\ '''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:''' ----

---- /!\ '''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 - 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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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 - 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 - 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 - 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:''' ----


---- /!\ '''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''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----


---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
Created an account for this wiki sandbox
Practice...

Done with main edit, want to do links within ProtocolReferencePage, so I'll link to the end of [[https://wiki.wireshark.org/WikiSandBox#TheEnd|WikiSandBox#TheEnd]] [[#TheEnd|The End]]

The above is disposable practice after Today, Saturday, 2015-03-15, as is the anchor and the line it is on. I hope you like the results on [[ProtocolReferencePage]].

---- /!\ '''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 - other version:''' ----
---- /!\ '''End of edit conflict''' ----

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:

---- /!\ '''Edit conflict - your 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 - 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''' ----

---- /!\ '''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''' ----


---- /!\ '''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:''' ----

---- /!\ '''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''' ----


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:

---- /!\ '''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''' ----
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:''' ----
---- /!\ '''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:''' ----
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 - 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:''' ----
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:''' ----

---- /!\ '''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:''' ----

---- /!\ '''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 - 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 - 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 - other 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:''' ----
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:''' ----

---- /!\ '''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''' ----


---- /!\ '''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:''' ----
---- /!\ '''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:''' ----


---- /!\ '''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:''' ----

---- /!\ '''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 - 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:''' ----
---- /!\ '''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:''' ----
---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''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 - 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 - 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 - 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:''' ----


---- /!\ '''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''' ----

---- /!\ '''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:''' ----

---- /!\ '''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:''' ----
---- /!\ '''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:''' ----


---- /!\ '''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:''' ----

---- /!\ '''End of edit conflict''' ----
---- /!\ '''End of edit conflict''' ----
Created an account for this wiki sandbox
Practice...

Done with main edit, want to do links within ProtocolReferencePage, so I'll link to the end of [[https://wiki.wireshark.org/WikiSandBox#TheEnd|WikiSandBox#TheEnd]] [[#TheEnd|The End]]

The above is disposable practice after Today, Saturday, 2015-03-15, as is the anchor and the line it is on. I hope you like the results on [[ProtocolReferencePage]].

---- /!\ '''End of edit conflict''' ----

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:

---- /!\ '''Edit conflict - your 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 - 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''' ----

---- /!\ '''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''' ----


---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----

---- /!\ '''Edit conflict - other version:''' ----

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


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:

---- /!\ '''End of edit conflict''' ----


---- /!\ '''Edit conflict - your version:''' ----

---- /!\ '''End of edit conflict''' ----
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<<Anchor(TheEnd)>>(well, not quite ;-) ) (cue the song from Apocalypse Now)

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

However, [[http://www.lua.org/manual/5.1/manual.html#pdf-os.clock|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 [[http://www.lua.org/manual/5.1/manual.html#pdf-os.time|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 [[http://pubs.opengroup.org/onlinepubs/009604599/functions/gettimeofday.html|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''' ----

---- /!\ '''End of edit conflict''' ----

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:


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


/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


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.


/!\ 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:


  • 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


/!\ 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



/!\ Edit conflict - your version:



/!\ End of edit conflict


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.


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:


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.


/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other 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)


/!\ 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 - your version:



/!\ End of edit conflict


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.


/!\ Edit conflict - other 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. 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.


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ 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)

~Ciedelle Kaye Liong


/!\ 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. 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:


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)

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 - 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


/!\ 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 - other version:



/!\ End of edit conflict



/!\ Edit conflict - your 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:



/!\ 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


/!\ 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:



/!\ 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 - 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



/!\ 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:



/!\ Edit conflict - your 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:


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:



/!\ 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 - 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



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ 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



/!\ Edit conflict - other version:



/!\ Edit conflict - other 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:



/!\ 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:


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 - 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 - 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



/!\ 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:


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.


/!\ 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:



/!\ 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


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


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 - 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:



/!\ End of edit conflict



/!\ 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 - 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:



/!\ Edit conflict - your version:



/!\ 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.


/!\ 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:


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



/!\ 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 - your 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:



/!\ End of edit conflict



/!\ 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 - other version:



/!\ Edit conflict - your version:



/!\ Edit conflict - other 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 - your version:



/!\ Edit conflict - your version:



/!\ 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



/!\ Edit conflict - your version:



/!\ Edit conflict - other 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:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ 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



/!\ 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 - 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


/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ Edit conflict - other version:


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



/!\ 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 - 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:



/!\ Edit conflict - other version:



/!\ 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



/!\ 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 - 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:



/!\ 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:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other 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:



/!\ 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:



/!\ 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 - other version:



/!\ Edit conflict - other 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 - 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.


/!\ 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:


(Earl Rudinas)


/!\ 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 - 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:



/!\ 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:


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



/!\ 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 - 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



/!\ End of edit conflict



/!\ 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



/!\ 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:



/!\ 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 - your 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:



/!\ 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:



/!\ 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 - 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:



/!\ 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:



/!\ 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.


/!\ 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:


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:



/!\ 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 - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:



/!\ 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



/!\ 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


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:



/!\ Edit conflict - your 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:



/!\ 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


/!\ Edit conflict - your version:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ 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:



/!\ 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:



/!\ 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:



/!\ End of edit conflict



/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ 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 - your version:



/!\ Edit conflict - your 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:


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:



/!\ 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



/!\ 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:


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


/!\ 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 - 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 - 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:



/!\ 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 - your version:



/!\ Edit conflict - other 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:



/!\ 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:



/!\ 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:



/!\ 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:


=====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 - 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 - your 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:



/!\ 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:



/!\ 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:



/!\ 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 - your 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



/!\ 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:



/!\ 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:



/!\ 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:



/!\ 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:


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 - other version:



/!\ 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 - 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:



/!\ 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 - 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 - 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:



/!\ 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 - 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:



/!\ 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 - 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:



/!\ End of edit conflict



/!\ Edit conflict - your version:



/!\ 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:



/!\ 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 - your version:



/!\ 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 - your version:



/!\ Edit conflict - other version:



/!\ Edit conflict - other 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 - 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 - 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 - 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


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:


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:



/!\ 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



/!\ 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:


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:


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:



/!\ End of edit conflict



/!\ Edit conflict - other 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 - 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



/!\ 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 - 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:



/!\ 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 - 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 - 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:



/!\ 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:



/!\ 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 - your version:



/!\ End of edit conflict



/!\ Edit conflict - your 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



/!\ End of edit conflict



/!\ 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 - 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:



/!\ 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 - 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:



/!\ 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 - 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:


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 - your version:


Lovella June D. Gonzaga


/!\ 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 - 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:



/!\ 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



/!\ 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: