Convergence - Revision history

AC14: Defenition, background, uses, also, references

2017-02-07T20:38:14Z

Defenition, background, uses, also, references

← Older revision	Revision as of 20:38, 7 February 2017
Line 1:	Line 1:
		The term "convergence" is defined as the act of converging and especially moving toward a union or uniformity. There are many forms of convergences today like technological or network. Seeing that the class is about media, it is an importnat term to undestand how these technologies and media outlets somehow play on one another to set a sort of unity.

		==Background==
		The term itself is broad in itself but given a type of convergence, one sees its meaning. For example, a technological convergence is the combination of two or more different technologies into one. This is shown by our cell phones, not only can you make phone calls now, but also take pictures and surf the web. This is an example of combining different technologies (phone, camera, computer) into one technology (cell phone).

		==Uses in other disciplines==
		The term "convergence" can be used to describe many type of unities or things coming together. So it is no surprise to see the term used in many fashions like technological, network, even internet.

		==See also==
		http://jfbelisle.com/2009/05/three-types-of-convergence-is-the-future-friendly/
		The link above is a link to a online article of technological, network, and internet convergence. It gives a nice example of each type in a clear and understandable manner.

		==References==
		Merriam-Webster. Merriam-Webster, n.d. Web. 07 Feb. 2017.
		Belisle, Jean-Francois. "Three Types of Convergence – Is the Future Friendly?" JF Belisle. N.p., n.d. Web. 07 Feb. 2017.


		[[Category:Critical Theory]]

AC14: Mistakes were made

2017-02-03T00:16:31Z

Mistakes were made

← Older revision		Revision as of 00:16, 3 February 2017
Line 1:		Line 1:
	~~It's very easy to edit the contents of a wiki:~~

	~~# Click the "'''Edit'''" page tab at the top of the page.~~
	~~# Make changes to the text.~~
	~~# Click the "Save page" button.~~

	~~Voila! You've edited a wiki page!~~

	~~== Editing rules, editing conventions, and formatting ==~~

	The number one rule of wiki editing is to '''be bold'''. Go ahead - make changes. Other people can correct any mistakes you make, so have confidence, and give it a try! There are all kinds of editing conventions, rules, and philosophies for the editing of wiki pages, but the "be bold" rule is the most important of these!

	An edit can contribute whole new paragraphs or pages of information, or it can be as simple as fixing a typo or a spelling mistake. In general, try to add or edit text so that it is clear and concise. Most importantly, make sure you are always aiming to do something which'' improves ''the contents of the wiki.

	When you need to use some type of formatting, such as for new headings or bolding of text, you do this using wiki syntax or the buttons in the Edit Toolbar above the editing zone. See [Help:Formatting] for some of the common types of formatting used.


	~~== Edit summary ==~~
	Before you save a change, you can enter a short note in the "'''Summary'''" box describing your changes. Don't worry too much about this, or spend too much time thinking about it: just put in a short description of what you just changed. For example, you might say "''fixed typo''" or "''added more information about sunflowers''".

	~~This summary gets stored alongside your edit, and allows people to track changes in the wiki more effectively.~~

	~~== Preview ==~~
	It's a good idea to use the "'''Show preview'''" button to see what your change will look like, before you save it. This is also related to tracking changes because every time you save, this is displayed to others as a separate change. This isn't something to worry about too much, but it's good to get into the habit of eliminating mistakes in your own work, by using a preview before saving, rather than saving, then having to do ''another'' edit just to make one or more minor corrections.

	~~==Show changes==~~

	~~Another option is the '''Show Changes''' button which allows you to see the differences between the current version and the edited version.~~

	~~== Other types of editing ==~~
	~~Sometimes the page you want to edit doesn't yet exist. In that case you can start a new page!~~

	* [https://www.mediawiki.org/wiki/Help:Starting_a_new_page Help:Starting a new page]

	~~Remember you should always aim to improve the overall contents of the wiki with your edits.~~

	~~== Discussion ==~~
	~~Every article has its own "talk page" where you can ask questions, make suggestions, or discuss corrections. See [https://www.mediawiki.org/wiki/Help:Talk_pages Talk Pages].~~

AC14: Editing medium

2017-02-03T00:09:27Z

Editing medium

New page

It's very easy to edit the contents of a wiki:

# Click the "'''Edit'''" page tab at the top of the page.
# Make changes to the text.
# Click the "Save page" button.

Voila! You've edited a wiki page!

== Editing rules, editing conventions, and formatting ==

The number one rule of wiki editing is to '''be bold'''. Go ahead - make changes. Other people can correct any mistakes you make, so have confidence, and give it a try! There are all kinds of editing conventions, rules, and philosophies for the editing of wiki pages, but the "be bold" rule is the most important of these!

An edit can contribute whole new paragraphs or pages of information, or it can be as simple as fixing a typo or a spelling mistake. In general, try to add or edit text so that it is clear and concise. Most importantly, make sure you are always aiming to do something which'' improves ''the contents of the wiki.

When you need to use some type of formatting, such as for new headings or bolding of text, you do this using wiki syntax or the buttons in the Edit Toolbar above the editing zone. See [Help:Formatting] for some of the common types of formatting used.

== Edit summary ==
Before you save a change, you can enter a short note in the "'''Summary'''" box describing your changes. Don't worry too much about this, or spend too much time thinking about it: just put in a short description of what you just changed. For example, you might say "''fixed typo''" or "''added more information about sunflowers''".

This summary gets stored alongside your edit, and allows people to track changes in the wiki more effectively.

== Preview ==
It's a good idea to use the "'''Show preview'''" button to see what your change will look like, before you save it. This is also related to tracking changes because every time you save, this is displayed to others as a separate change. This isn't something to worry about too much, but it's good to get into the habit of eliminating mistakes in your own work, by using a preview before saving, rather than saving, then having to do ''another'' edit just to make one or more minor corrections.

==Show changes==

Another option is the '''Show Changes''' button which allows you to see the differences between the current version and the edited version.

== Other types of editing ==
Sometimes the page you want to edit doesn't yet exist. In that case you can start a new page!

* [https://www.mediawiki.org/wiki/Help:Starting_a_new_page Help:Starting a new page]

Remember you should always aim to improve the overall contents of the wiki with your edits.

== Discussion ==
Every article has its own "talk page" where you can ask questions, make suggestions, or discuss corrections. See [https://www.mediawiki.org/wiki/Help:Talk_pages Talk Pages].