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 238 and 239
Revision 238 as of 2016-01-05 07:33:01
Size: 21179
Comment:
Revision 239 as of 2016-01-05 07:33:26
Size: 39632
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
--------------------------------
'''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
--------------------------------
Line 11: Line 19:
---- /!\ '''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:''' ----
Line 23: Line 35:



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

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

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


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

---- /!\ '''Edit conflict - other version:''' ----
Line 82: Line 130:

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

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


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

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

---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----
A wiki is a website where a large number of users can collaborate and edit a web document together. A blog is a website which is usually edited and run by an individual person or a small group of people. A blog is more informal than a wiki. - DELA SERNA




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

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

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


---- /!\ '''Edit conflict - other version:''' ----
Line 96: Line 182:
---- /!\ '''Edit conflict - other version:''' ----
---- /!\ '''Edit conflict - your version:''' ----
---- /!\ '''End of edit conflict''' ----


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

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


---- /!\ '''Edit conflict - other version:''' ----
Line 110: Line 204:

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

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

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


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

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


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

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

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


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

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


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


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

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



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

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

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



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

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

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

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

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

---- /!\ '''Edit conflict - your version:''' ----
Line 300: Line 450:
---- /!\ '''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''' ----
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''' ----
Line 302: Line 475:
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:''' ----

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

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


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

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

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

---- /!\ '''Edit conflict - your version:''' ----
Line 357: Line 506:
---- /!\ '''Edit conflict - your version:''' ----


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

---- /!\ '''Edit conflict - othe
r version:''' ----


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

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


---- /!\ '''E
dit conflict - other version:''' ----
---- /!\ '''End of edit conflict''' ----
Line 366: Line 520:
---- /!\ '''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''' ----
Lovella June D. Gonzaga



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


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

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

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

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


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


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



/!\ Edit conflict - your version:



/!\ End of edit conflict



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



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



/!\ End of edit conflict



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



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



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


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


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


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



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



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



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


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:


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


/!\ End of edit conflict



/!\ End of edit conflict



/!\ Edit conflict - other version:



/!\ Edit conflict - other version:



/!\ Edit conflict - your version:


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:


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


/!\ Edit conflict - your version:



/!\ Edit conflict - your version:


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


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:


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



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



/!\ Edit conflict - other version:



/!\ End of edit conflict



/!\ Edit conflict - other version:


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

Lovella June D. Gonzaga


/!\ End of edit conflict



/!\ End of edit conflict



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


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


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



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



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


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



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



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


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



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



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

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

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

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

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

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

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

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

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

WikiSandBox (last edited 2020-08-14 16:23:22 by 2601:200:c001:d44:81f6:197c:58b:2580)