Page MenuHomePhabricator

DBug-editconflict.html

Authored By
bzimport
Nov 21 2014, 6:48 PM
Size
65 KB
Referenced Files
None
Subscribers
None

DBug-editconflict.html

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="noindex,nofollow" />
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="copyright" href="http://www.gnu.org/copyleft/fdl.html" />
<title>Edit conflict: User talk:Ereinion - Preview - Wikipedia, the free encyclopedia</title>
<style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "/skins-1.5/monobook/main.css"; /*]]>*/</style>
<link rel="stylesheet" type="text/css" media="print" href="/skins-1.5/common/commonPrint.css" />
<!--[if lt IE 5.5000]><style type="text/css">@import "/skins-1.5/monobook/IE50Fixes.css";</style><![endif]-->
<!--[if IE 5.5000]><style type="text/css">@import "/skins-1.5/monobook/IE55Fixes.css";</style><![endif]-->
<!--[if IE 6]><style type="text/css">@import "/skins-1.5/monobook/IE60Fixes.css";</style><![endif]-->
<!--[if IE]><script type="text/javascript" src="/skins-1.5/common/IEFixes.js"></script>
<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
<script type="text/javascript" src="/w/index.php?title=-&amp;action=raw&amp;smaxage=0&amp;gen=js"></script> <script type="text/javascript" src="/skins-1.5/common/wikibits.js"></script>
<script type="text/javascript" src="/skins-1.5/common/sorttable.js"></script>
<style type="text/css">/*<![CDATA[*/
@import "/w/index.php?title=MediaWiki:Monobook.css&action=raw&ctype=text/css&smaxage=2678400";
@import "/w/index.php?title=-&action=raw&gen=css&maxage=2678400&ts=20050714061746";
@import "/w/index.php?title=User:Dragons_flight/monobook.css&action=raw&ctype=text/css";
/*]]>*/</style> <script type="text/javascript" src="/w/index.php?title=User:Dragons_flight/monobook.js&amp;action=raw&amp;ctype=text/javascript&amp;dontcountme=s"></script> </head>
<body class="ns-3">
<div id="globalWrapper">
<div id="column-content">
<div id="content">
<a name="top" id="contentTop"></a>
<div id="siteNotice"><p>The <a href="http://meta.wikimedia.org/wiki/Elections_for_the_Board_of_Trustees_of_the_Wikimedia_Foundation%2C_2005/En" class='external text' title="http://meta.wikimedia.org/wiki/Elections for the Board of Trustees of the Wikimedia Foundation, 2005/En">Elections for the Board of Trustees</a> of the <a href="http://wikimediafoundation.org/wiki/Home" class='extiw' title="Wikimedia:Home">Wikimedia Foundation</a> are complete.</p>
</div> <h1 class="firstHeading">Edit conflict: User talk:Ereinion</h1>
<div id="bodyContent">
<h3 id="siteSub">From Wikipedia, the free encyclopedia.</h3>
<div id="contentSub"></div>
<!-- start content -->
<p>Someone else has changed this page since you started editing it. The upper text area contains the page text as it currently exists. Your changes are shown in the lower text area. You will have to merge your changes into the existing text. <strong>Only</strong> the text in the upper text area will be saved when you press "Save page".</p>
<div id="wikiPreview"></div><script type='text/javascript'>
/*<![CDATA[*/
document.writeln("<div id='toolbar'>");
addButton('/skins-1.5/common/images/button_bold.png','Bold text','\'\'\'','\'\'\'','Bold text');
addButton('/skins-1.5/common/images/button_italic.png','Italic text','\'\'','\'\'','Italic text');
addButton('/skins-1.5/common/images/button_link.png','Internal link','[[',']]','Link title');
addButton('/skins-1.5/common/images/button_extlink.png','External link (remember http:// prefix)','[',']','http://www.example.com link title');
addButton('/skins-1.5/common/images/button_headline.png','Level 2 headline','\n== ',' ==\n','Headline text');
addButton('/skins-1.5/common/images/button_image.png','Embedded image','[[Image:',']]','Example.jpg');
addButton('/skins-1.5/common/images/button_media.png','Media file link','[[Media:',']]','Example.ogg');
addButton('/skins-1.5/common/images/button_math.png','Mathematical formula (LaTeX)','\<math\>','\</math\>','Insert formula here');
addButton('/skins-1.5/common/images/button_nowiki.png','Ignore wiki formatting','\<nowiki\>','\</nowiki\>','Insert non-formatted text here');
addButton('/skins-1.5/common/images/button_sig.png','Your signature with timestamp','--~~~~','','');
addButton('/skins-1.5/common/images/button_hr.png','Horizontal line (use sparingly)','\n----\n','','');
addInfobox('Click a button to get an example text','Please enter the text you want to be formatted.\\n It will be shown in the infobox for copy and pasting.\\nExample:\\n$1\\nwill become:\\n$2');
document.writeln("</div>");
/*]]>*/
</script>
<form id="editform" name="editform" method="post" action="/w/index.php?title=User_talk:Ereinion&amp;action=submit"
enctype="multipart/form-data">
<textarea tabindex='1' accesskey="," name="wpTextbox1" rows='25'
cols='80'>&lt;div id=&quot;talk&quot; style=&quot;border: 1px solid #CC9; margin: 0em 1em 0em 1em; padding:5px; clear: both; background-color:#002F14&quot;&gt;
&lt;center&gt;&lt;font size=+1&gt;&lt;font color=#E1D3B3&gt;'''Talk Page Etiquette'''&lt;/font&gt;&lt;/center&gt;
&lt;center&gt;&lt;font size=0&gt;&lt;font color=#E1D3B3&gt;(keep in mind before posting)&lt;/font&gt;&lt;/center&gt;
* &lt;font color=#E1D3B3&gt;Properly introduce yourself.
* &lt;font color=#E1D3B3&gt;Offer a tribute of respect.
* &lt;font color=#E1D3B3&gt;Replies will be based on interest or importance.
&lt;/div&gt;
----
==Re:Master Sword==
Ereinion, what exactly do you find objectionable about [[Master Sword]]? You still haven't put any complaints on its Talk Page. If you list your disputes, I will attempt to deal with them. --[[User:Carlj7|Carl]] 07:18, 12 Feb 2005 (UTC)
I'm still confused. There is no debate that I can see on the [[Talk:Master_Sword |Master Sword talk page]]. The closest to a debate that I can see is:
:&quot;If someone would state where it's said that the Master Sword is also called the &quot;Sword of Evil's Bane&quot; it would be more authoritive. Cúchulainn 00:08, Feb 6, 2005 (UTC)
:&quot;Erm, it's called SoEB up, down and across Ocarina of Time. Sheik, Rauru, the manual, and the player's guide all refer to it as such. There are a couple in-game references in other games too. Adam Marx Squared 00:25, 9 Feb 2005 (UTC)&quot;
But that's not really a debate. Cúchulainn just wondered when the term &quot;Sword of Evil's Bane&quot; was used, and Adam Marx answered, in Ocarina of Time. Which is true. Google for &quot;Sword of Evil's Bane&quot; and it's basically only ever used about Zelda. So there's no dispute. Right? Other than that, Adam wanted the Smash Brothers stuff differentiated from the Soul Calibur stuff (which I did) since Soul Calibur may or may not be cannon. Anyhow, there's no controversy that I'm aware of about Master Sword. --[[User:Carlj7|Carl]] 12:32, 13 Feb 2005 (UTC)
Ah. However, [[User:Telperion|Telperion]] made that comment in September, and since then, the page [http://en.wikipedia.org/w/index.php?title=Master_Sword&amp;oldid=6261633 has changed a lot]. I assume that if (s)he still had a problem, he would have voiced his concern by now. (In fact, Telperion hasn't even made any changes to Wikipedia at all since September.) I think that we can remove the controversial disclaimer for now, unless someone has a specific problem with the page. If tempers start to flare later, we can put up a warning, but at this point, I don't think anyone has a serious problem with the page. --[[User:Carlj7|Carl]] 02:16, 14 Feb 2005 (UTC)
I understand your concern but feel that for now it's better to wait for an edit war to start and then put up a disclaimer than to scare people away from making contributions. If the article was already relatively complete or already had a brewing edit war, I would endorse the disclaimer, but I still think it's a bit early to say that Master Sword is the new George W. Bush. ;p --[[User:Carlj7|Carl]] 02:49, 14 Feb 2005 (UTC)
==Zelda Images==
The zelda image that you recently uploaded are tagged as &quot;copyright free use&quot;. That seems surprising to me, can you give some evidence that Nintendo have released copyright on their characters in this way. Thanks [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 06:38, 19 Feb 2005 (UTC)
:The images themseles are copyrighted to Nintendo, however they are avaible for third-party use and distibution, which is how I obtained them. I hope this answers your question. '''Ereinion''' 00:05, 20 Feb 2005 (UTC)
::Ok thanks. That's great. What we should do in this case (where there is a general permisson) is to create a new template at [[Template:Zelda Image]]. That template should link to the source and to Nintendo's release statement. Also a category tag. There was (and is) a big argument over the [[pokemon]] images, and I want to avoid the same over Zelda. If you want me to do the hard work just let me know the source and where I can see the details of the copyright. Thanks again for uploading these free use images [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 01:12, 20 Feb 2005 (UTC)
:::I'm not entirely sure I know what you mean... Nintendo has their policy http://www.nintendo.com/corp/legal.jsp#copyrights] regarding copyrights, trademarks, and intellectual properties published on their company's home page. I could create such a template that you were suggesting if indeed the current templates Wikipedia has are in some way unsuitable. '''Ereinion'''
::::Well I looked at that page, and I saw that Nintendo does claim copyright over Game charaters, what I didn't see is any statement from them that they allow free use of images of their characters, which is the issue. Where does Nintendo say that the images are &quot;avaible for third-party use and distibution&quot;. Now fair use would probably apply to these images so I'm not thinking of deleting them, just putting them in the correct category.
::::Also I want to know the ''source''. Are these taken from a web-site? Where? As for a new tag, the advice (somewhere in the backwoods of the wiki) is when uploading a number of images from a single source, create a new tag to sub-categorize. (By the way, I think the new Zelda game looks awesome) [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 04:32, 20 Feb 2005 (UTC)
:::::Under U.S. copyright law, partial works are allowed to be used for commentary or teaching. In the case of Nintendo, it wouldn't be practical to give a statement stating that their copyrights are given free license because they still use the intellectual rights, however distribution is still permitted with the acknowledgement that Nintendo owns all rights to its respective works and properties. This is my understanding. You can research this more indepth if you like at the Reproductions of Copyrighted Works by Educators and Librarians http://www.copyright.gov/circs/circ21.pdf] section. Ereinion 00:26, 21 Feb 2005 (UTC)
:::::: Yes, partial works are allowed to be used for commentary or teaching, or more generally for the benefit of the arts and sciences. This is what [[Fair use]] is, and that's fine, but that is not what &quot;CopyrightFreeUse&quot; is for, that is for images that the creator has explicitly released under a licence similar to the GFDL, allowing &quot;Free&quot; distribution, use and modification (including commercial use).
:::::: If there has not been any such explicit release of these images under such a licence then they are ''not'' free images. They are (I think) fair use images, though I know there are some in the poke image dispute who disagree.
:::::: (There is also an exemption for archival by libraries, but that doesn't apply to us, and wikipedia isn't a classroom, and the editors aren't teachers, so those exemptions also don't apply).
:::::: So what I propose is to re-tag as &quot;fair use&quot; as I believe that is the correct statement of copyright for these images.
:::::: Finally the source. Is it [http://www.ffsims.de/bilderbuch/zelda/oca.htm]? [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 05:34, 21 Feb 2005 (UTC)
==Zeno image==
Thank you for uploading [[:Image:Zeno.jpg]]. You have marked it as public domain. What was the source of the photograph? Although the sculpture itself is in public domain because of its age, any photograph of it is a new work and has its own copyright. So unless the photograph is old enough to be have its copyright lapse, or the creator has released it, it is not in the public domain. [[User:Dsmdgold|Dsmdgold]] 03:07, Mar 2, 2005 (UTC)
==Kaepora Gaebora==
To answer the question in your edit comment, although I did not add the portion of text you deleted, it seems to be based on a popular fan theory that the Wind Fish is in fact a later incarnation of the Hero of Time. I forget the logic behind it, but I wouldn't give it much credence. [[User:Dcoetzee|Deco]] 09:23, 23 Apr 2005 (UTC)
== Image copyright ==
I am trying to clear our the non-sourced images category. If you notice the fairuse tag, it says that the uploader and those who add it claim fairuse. Therefor, I never presume to make that judgement if I have not uploaded it or added it. I am also adding several dozen images at a time, and the tag catches the eye, and makes my job far far easier.
I apologize if you were offended, I am merely attempting to do some janitorial work. [[User:Burgundavia|Burgundavia]] &lt;small&gt;([[User talk:Burgundavia|&amp;#9992; take a flight?]])&lt;/small&gt; 23:01, May 23, 2005 (UTC)
== Master Sword - Hero of Time ==
What exactly is your reasoning for reverting my changes? Because I see none. The Hero of Time appeared in two games, ''[[The Legend of Zelda: Ocarina of Time|Ocarina of Time]]'' and ''[[The Legend of Zelda: Majora's Mask|Majora's Mask]]'', and he only wielded the Master Sword in ''OoT''. The Master Sword is also wielded by the Links in ''[[The Legend of Zelda: A Link to the Past|A Link to the Past]]'', ''[[The Legend of Zelda: Link's Awakening|Link's Awakening]]'', the two ''Oracle'' games and ''[[The Legend of Zelda: The Wind Waker|The Wind Waker]]''. That comes to the Hero of Time wielding the Master Sword once out of its six appearances. Even if you discount the appearances in the Game Boy games as bonuses, the HoT still only uses it for a third of the appearances. Having &quot;Hero of Time&quot; in that paragraph gives the impression that all Links, or at least all who wield the Master Sword, are the Hero of Time, which they are not. Unless you can think of an extraordinarily good reason, don't revert it again. [[User:Ian Moody|Ian Moody]] 12:33, 6 Jun 2005 (UTC)
== Re: Your Gripe ==
I'd appreciate it if you didn't tell others not to do a thing in the exact same fashion in which it was done. And, in the future, stay out of things that don't concern or involve you until they can be resolved by the participating parties. Thank you. [[User:Ereinion|Ereinion]][[Image:RAHSymbol.JPG|30px|]] 19:50, Jun 7, 2005 (UTC)
:In retrospect (what a wonderful thing that is!) it was indeed foolish for me to do such a hyppocritical action. I was indisposed at the time so used the edit summary to &quot;nip it in the bud&quot; so it could be sorted out later; had I had the time, I would have personally contacted both parties with more eloquently-worded advice before starting a new talk section detailing both sides of the issue so other editors could also comment.
:On to the second point, it does not matter that I was not involved, indeed it was much better that I was not; I was a neutral party trying to prevent a nasty [[edit war]] from potentially occurring; had I been an involved party, any possible resolution methods would appear to be biased towards at least one of my points on the given matter. But I thank you for your valid concerns, and I will certainly bear that in mind for future dispute resolutions. Thank you for your time. [[User:Master Thief Garrett|Master Thief Garrett]]&lt;sup&gt;[[User talk:Master Thief Garrett|Talk]]&lt;/sup&gt; 03:32, 8 Jun 2005 (UTC)
== RE: My Reasons ==
Okay, I'll do my best in showing the relation of characters to the story and FFVII as a cultural icon.
Big Bro - The man that Cloud and Aeris have to see in order to get the Wig Key Item. This is part of the Wall Market arc. Big Bro is also a cross dresser which reflects a unique portion of the population and sets FFVII closer to our world rather than a fantasy one.
Choco Bill - owner of the Chocobo Farm who informs the party that they're better off catching a chocobo to cross the marsh. Later, he sells chocobo stables to the player, without these, racing and breeding chocobos is impossible.
Choco Billy - A key figure in selling the character greens (used to catch chocobos and then increase their stats once in the stable). He is also in charge of mating chocobos as well as selling nuts, integral parts of breeding chocobos, without him, acquiring different color chocobos is impossible.
Chocobo Sage - the mysterious guy who tells Cloud how to get chocobos to breed in different colors. He is also the only person selling the highest quality greens and nuts. There's a section devoted to him in the PC version player's guide.
Chole - she gives statistics on your Chocobos
Elder Bugah - many people overlook this character, but he is instrumental in putting a working timeline on the FFVII story and also gives information that it was Professor Gast who discovered and mistakenly labeled Jenova as an Ancient.
Elder Hargo - an elder in Cosmo Canyon who sheds light on what the Lifesteram is, important if the player wants to grasp the larget picture of the story
Ester - another story-important character who is comparable to Mayor Domino, but the player must see her every time that he or she wishes to race chobos. She also instructs cloud on how to race chocobos.
Hart - offers to sell the player clues to the Mayor's puzzle
Holzoff - the man living at the base of Gaea's Cliffs rescues the party whenever they collapse from wandering around the Great Glacier for too long. He also tells the party how to avoid freezing to death while on Gaea's Cliffs. It's his map that the characters take from Icicle Inn.
Joe - The chocobo jockey reappears several time in races on his black chocobo (the only one save for the player's) to make the races difficult. His chocobo always has better stats than whatever the player is using. He is introduced to the player by Ester.
Johnny - This character bears some resemblance to Johnny from Chrono Trigger. He appears in several areas in the game and usually has something to comment on the situation or the state of the party.
Kalm Traveller - two sidequests revolve around this guy: defeating Emerald and defeating Ruby as well as getting a guidebook. He is the only person in the world to offer mastered materia or a gold chocobo or underwater materia.
Kotch - simply one of Don Corneo's lackeys and part of the Wall Market arc. What sets him apart from other NPCs is that he has a name and actually interacts with the player.
Mukki - the guy who slaps Cloud awake in the Honeybee Inn, his apparent homosexuality helps connect the FFVII world to our contemporary one
Priscilla - Cloud saves her from Bottomswell, without her, the party wouldn't have been able to go up to the Upper Junon area, she gives the party the Shiva materia as thanks.
Skotch - same as kotch
Snow - A sidequest NPC/enemy not found by every FFVII player, there's actually a small sidequest just to get her to fight you, and fighting her is the only way to acquire the Alexander materia, ultimately necessary in order to meld mastered summon materia into a master summon materia
Zangan - a character that the player meets in the Flashback, Tifa's martial arts instructor and mentor. There's a letter to Tifa, in her piano, from him explaining Shin-Ra's coverup of the events in Nibelheim.
I'm pretty sure that's everybody I added.
== Your icon ==
If I understand correctly, you claim [[copyright]] over [[:Image:RAHSymbol.JPG]]. This is incompatible with the standards of Wikipedia. I would suggest you tag it with a [[GFDL]], [[public domain]] or other free license. If not, it will need to be deleted. [[User:Dragons flight|Dragons flight]] 07:13, July 11, 2005 (UTC)
</textarea>
<br /><a href="/wiki/Wikipedia:Edit_summary" class='internal' title="Briefly describe the changes you have made here">Edit summary</a>: <input tabindex='2' type='text' value="/* Your icon */ " name="wpSummary" maxlength='200' size='60' /><br />
<input tabindex='3' type='checkbox' value='1' name='wpMinoredit' accesskey='i' id='wpMinoredit' /><label for='wpMinoredit' title='Mark this as a minor edit [alt-i]'>This is a minor edit</label><input tabindex='4' type='checkbox' name='wpWatchthis' checked='checked' accesskey='w' id='wpWatchthis' /><label for='wpWatchthis' title='Add this page to your watchlist [alt-w]'>Watch this page</label><br />
<input tabindex='5' id='wpSave' type='submit' value="Save page" name="wpSave" accesskey="s" title="Save your changes [alt-s]"/>
<input tabindex='6' id='wpPreview' type='submit' value="Show preview" name="wpPreview" accesskey="p" title="Preview your changes, please use this before saving! [alt-p]"/>
<input tabindex='7' id='wpDiff' type='submit' value="Show changes" name="wpDiff" accesskey="d" title="Show which changes you made to the text. [alt-d]"/>
<em><a href="/wiki/User_talk:Ereinion" title="User talk:Ereinion">Cancel</a></em> | <em><a target="helpwindow" href="/wiki/Wikipedia:How_to_edit_a_page">Editing help</a> (opens in new window)</em><br />Templates used on this page:<ul><li><a href="/w/index.php?title=Template:Zelda_Image&amp;action=edit" class="new" title="Template:Zelda Image">Template:Zelda Image</a></li></ul><div id="editpage-copywarn">
<div id="editpage-specialchars" class="plainlinks" style="margin-top:15px;border-width:1px;border-style:solid;border-color:#aaaaaa;padding:2px;">
<p><small>Insert: <a href="javascript:insertTags('Á','','')">Á</a> <a href="javascript:insertTags('á','','')">á</a> <a href="javascript:insertTags('É','','')">É</a> <a href="javascript:insertTags('é','','')">é</a> <a href="javascript:insertTags('Í','','')">Í</a> <a href="javascript:insertTags('í','','')">í</a> <a href="javascript:insertTags('Ó','','')">Ó</a> <a href="javascript:insertTags('ó','','')">ó</a> <a href="javascript:insertTags('Ú','','')">Ú</a> <a href="javascript:insertTags('ú','','')">ú</a> &#160; <a href="javascript:insertTags('À','','')">À</a> <a href="javascript:insertTags('à','','')">à</a> <a href="javascript:insertTags('È','','')">È</a> <a href="javascript:insertTags('è','','')">è</a> <a href="javascript:insertTags('Ì','','')">Ì</a> <a href="javascript:insertTags('ì','','')">ì</a> <a href="javascript:insertTags('Ò','','')">Ò</a> <a href="javascript:insertTags('ò','','')">ò</a> <a href="javascript:insertTags('Ù','','')">Ù</a> <a href="javascript:insertTags('ù','','')">ù</a> &#160; <a href="javascript:insertTags('Â','','')">Â</a> <a href="javascript:insertTags('â','','')">â</a> <a href="javascript:insertTags('Ê','','')">Ê</a> <a href="javascript:insertTags('ê','','')">ê</a> <a href="javascript:insertTags('Î','','')">Î</a> <a href="javascript:insertTags('î','','')">î</a> <a href="javascript:insertTags('Ô','','')">Ô</a> <a href="javascript:insertTags('ô','','')">ô</a> <a href="javascript:insertTags('Û','','')">Û</a> <a href="javascript:insertTags('û','','')">û</a> &#160; <a href="javascript:insertTags('Ä','','')">Ä</a> <a href="javascript:insertTags('ä','','')">ä</a> <a href="javascript:insertTags('Ë','','')">Ë</a> <a href="javascript:insertTags('ë','','')">ë</a> <a href="javascript:insertTags('Ï','','')">Ï</a> <a href="javascript:insertTags('ï','','')">ï</a> <a href="javascript:insertTags('Ö','','')">Ö</a> <a href="javascript:insertTags('ö','','')">ö</a> <a href="javascript:insertTags('Ü','','')">Ü</a> <a href="javascript:insertTags('ü','','')">ü</a> &#160; <a href="javascript:insertTags('ß','','')">ß</a> &#160; <a href="javascript:insertTags('Ã','','')">Ã</a> <a href="javascript:insertTags('ã','','')">ã</a> <a href="javascript:insertTags('Ñ','','')">Ñ</a> <a href="javascript:insertTags('ñ','','')">ñ</a> <a href="javascript:insertTags('Õ','','')">Õ</a> <a href="javascript:insertTags('õ','','')">õ</a> &#160; <a href="javascript:insertTags('Ç','','')">Ç</a> <a href="javascript:insertTags('ç','','')">ç</a> <a href="javascript:insertTags('Ģ','','')">Ģ</a> <a href="javascript:insertTags('ģ','','')">ģ</a> <a href="javascript:insertTags('Ķ','','')">Ķ</a> <a href="javascript:insertTags('ķ','','')">ķ</a> <a href="javascript:insertTags('Ļ','','')">Ļ</a> <a href="javascript:insertTags('ļ','','')">ļ</a> <a href="javascript:insertTags('Ņ','','')">Ņ</a> <a href="javascript:insertTags('ņ','','')">ņ</a> <a href="javascript:insertTags('Ŗ','','')">Ŗ</a> <a href="javascript:insertTags('ŗ','','')">ŗ</a> <a href="javascript:insertTags('Ş','','')">Ş</a> <a href="javascript:insertTags('ş','','')">ş</a> <a href="javascript:insertTags('Ţ','','')">Ţ</a> <a href="javascript:insertTags('ţ','','')">ţ</a> &#160; <a href="javascript:insertTags('Ć','','')">Ć</a> <a href="javascript:insertTags('ć','','')">ć</a> <a href="javascript:insertTags('Ĺ','','')">Ĺ</a> <a href="javascript:insertTags('ĺ','','')">ĺ</a> <a href="javascript:insertTags('Ń','','')">Ń</a> <a href="javascript:insertTags('ń','','')">ń</a> <a href="javascript:insertTags('Ŕ','','')">Ŕ</a> <a href="javascript:insertTags('ŕ','','')">ŕ</a> <a href="javascript:insertTags('Ś','','')">Ś</a> <a href="javascript:insertTags('ś','','')">ś</a> <a href="javascript:insertTags('Ý','','')">Ý</a> <a href="javascript:insertTags('ý','','')">ý</a> <a href="javascript:insertTags('Ź','','')">Ź</a> <a href="javascript:insertTags('ź','','')">ź</a> &#160; <a href="javascript:insertTags('Đ','','')">Đ</a> <a href="javascript:insertTags('đ','','')">đ</a> &#160; <a href="javascript:insertTags('Ů','','')">Ů</a> <a href="javascript:insertTags('ů','','')">ů</a> &#160; <a href="javascript:insertTags('Č','','')">Č</a> <a href="javascript:insertTags('č','','')">č</a> <a href="javascript:insertTags('Ď','','')">Ď</a> <a href="javascript:insertTags('ď','','')">ď</a> <a href="javascript:insertTags('Ľ','','')">Ľ</a> <a href="javascript:insertTags('ľ','','')">ľ</a> <a href="javascript:insertTags('Ň','','')">Ň</a> <a href="javascript:insertTags('ň','','')">ň</a> <a href="javascript:insertTags('Ř','','')">Ř</a> <a href="javascript:insertTags('ř','','')">ř</a> <a href="javascript:insertTags('Š','','')">Š</a> <a href="javascript:insertTags('š','','')">š</a> <a href="javascript:insertTags('Ť','','')">Ť</a> <a href="javascript:insertTags('ť','','')">ť</a> <a href="javascript:insertTags('Ž','','')">Ž</a> <a href="javascript:insertTags('ž','','')">ž</a> &#160; <a href="javascript:insertTags('Ǎ','','')">Ǎ</a> <a href="javascript:insertTags('ǎ','','')">ǎ</a> <a href="javascript:insertTags('Ě','','')">Ě</a> <a href="javascript:insertTags('ě','','')">ě</a> <a href="javascript:insertTags('Ǐ','','')">Ǐ</a> <a href="javascript:insertTags('ǐ','','')">ǐ</a> <a href="javascript:insertTags('Ǒ','','')">Ǒ</a> <a href="javascript:insertTags('ǒ','','')">ǒ</a> <a href="javascript:insertTags('Ǔ','','')">Ǔ</a> <a href="javascript:insertTags('ǔ','','')">ǔ</a> &#160; <a href="javascript:insertTags('Ā','','')">Ā</a> <a href="javascript:insertTags('ā','','')">ā</a> <a href="javascript:insertTags('Ē','','')">Ē</a> <a href="javascript:insertTags('ē','','')">ē</a> <a href="javascript:insertTags('Ī','','')">Ī</a> <a href="javascript:insertTags('ī','','')">ī</a> <a href="javascript:insertTags('Ō','','')">Ō</a> <a href="javascript:insertTags('ō','','')">ō</a> <a href="javascript:insertTags('Ū','','')">Ū</a> <a href="javascript:insertTags('ū','','')">ū</a> &#160; <a href="javascript:insertTags('ǖ','','')">ǖ</a> <a href="javascript:insertTags('ǘ','','')">ǘ</a> <a href="javascript:insertTags('ǚ','','')">ǚ</a> <a href="javascript:insertTags('ǜ','','')">ǜ</a> &#160; <a href="javascript:insertTags('Ĉ','','')">Ĉ</a> <a href="javascript:insertTags('ĉ','','')">ĉ</a> <a href="javascript:insertTags('Ĝ','','')">Ĝ</a> <a href="javascript:insertTags('ĝ','','')">ĝ</a> <a href="javascript:insertTags('Ĥ','','')">Ĥ</a> <a href="javascript:insertTags('ĥ','','')">ĥ</a> <a href="javascript:insertTags('Ĵ','','')">Ĵ</a> <a href="javascript:insertTags('ĵ','','')">ĵ</a> <a href="javascript:insertTags('Ŝ','','')">Ŝ</a> <a href="javascript:insertTags('ŝ','','')">ŝ</a> <a href="javascript:insertTags('Ŵ','','')">Ŵ</a> <a href="javascript:insertTags('ŵ','','')">ŵ</a> <a href="javascript:insertTags('Ŷ','','')">Ŷ</a> <a href="javascript:insertTags('ŷ','','')">ŷ</a> &#160; <a href="javascript:insertTags('Ă','','')">Ă</a> <a href="javascript:insertTags('ă','','')">ă</a> <a href="javascript:insertTags('Ğ','','')">Ğ</a> <a href="javascript:insertTags('ğ','','')">ğ</a> <a href="javascript:insertTags('Ŭ','','')">Ŭ</a> <a href="javascript:insertTags('ŭ','','')">ŭ</a> &#160; <a href="javascript:insertTags('Ċ','','')">Ċ</a> <a href="javascript:insertTags('ċ','','')">ċ</a> <a href="javascript:insertTags('Ė','','')">Ė</a> <a href="javascript:insertTags('ė','','')">ė</a> <a href="javascript:insertTags('Ġ','','')">Ġ</a> <a href="javascript:insertTags('ġ','','')">ġ</a> <a href="javascript:insertTags('İ','','')">İ</a> <a href="javascript:insertTags('ı','','')">ı</a> <a href="javascript:insertTags('Ż','','')">Ż</a> <a href="javascript:insertTags('ż','','')">ż</a> &#160; <a href="javascript:insertTags('Ą','','')">Ą</a> <a href="javascript:insertTags('ą','','')">ą</a> <a href="javascript:insertTags('Ę','','')">Ę</a> <a href="javascript:insertTags('ę','','')">ę</a> <a href="javascript:insertTags('Į','','')">Į</a> <a href="javascript:insertTags('į','','')">į</a> <a href="javascript:insertTags('Ų','','')">Ų</a> <a href="javascript:insertTags('ų;','','')">ų;</a> &#160; <a href="javascript:insertTags('Ł','','')">Ł</a> <a href="javascript:insertTags('ł','','')">ł</a> &#160; <a href="javascript:insertTags('Ő','','')">Ő</a> <a href="javascript:insertTags('ő','','')">ő</a> <a href="javascript:insertTags('Ű','','')">Ű</a> <a href="javascript:insertTags('ű','','')">ű</a> &#160; <a href="javascript:insertTags('Ŀ','','')">Ŀ</a> <a href="javascript:insertTags('ŀ','','')">ŀ</a> &#160; <a href="javascript:insertTags('Ħ','','')">Ħ</a> <a href="javascript:insertTags('ħ','','')">ħ</a> &#160; <a href="javascript:insertTags('Ð','','')">Ð</a> <a href="javascript:insertTags('ð','','')">ð</a> <a href="javascript:insertTags('Þ','','')">Þ</a> <a href="javascript:insertTags('þ','','')">þ</a> &#160; <a href="javascript:insertTags('Œ','','')">Œ</a> <a href="javascript:insertTags('œ','','')">œ</a> &#160; <a href="javascript:insertTags('Æ','','')">Æ</a> <a href="javascript:insertTags('æ','','')">æ</a> <a href="javascript:insertTags('Ø','','')">Ø</a> <a href="javascript:insertTags('ø','','')">ø</a> <a href="javascript:insertTags('Å','','')">Å</a> <a href="javascript:insertTags('å','','')">å</a> &#160; <a href="javascript:insertTags('–','','')"></a> <a href="javascript:insertTags('—','','')"></a> <a href="javascript:insertTags('…','','')"></a> &#160; <a href="javascript:insertTags('[',']','')">[]</a> <a href="javascript:insertTags('[[',']]','')">[[]]</a> <a href="javascript:insertTags('{{','}}','')">{{}}</a> &#160; <a href="javascript:insertTags('~','','')">~</a> <a href="javascript:insertTags('|','','')">|</a> <a href="javascript:insertTags('°','','')">°</a> <a href="javascript:insertTags('→','','')"></a> &#160; <a href="javascript:insertTags('±','','')">±</a> <a href="javascript:insertTags('−','','')"></a> <a href="javascript:insertTags('×','','')">×</a> <a href="javascript:insertTags('¹','','')">¹</a> <a href="javascript:insertTags('²','','')">²</a> <a href="javascript:insertTags('³','','')">³</a> &#160; <a href="javascript:insertTags('‘','','')"></a> <a href="javascript:insertTags('“','','')"></a> <a href="javascript:insertTags('’','','')"></a> <a href="javascript:insertTags('”','','')"></a> &#160; <a href="javascript:insertTags('€','','')"></a> &#160;</small></p>
</div>
<div style="margin-top:2em">
<div style="font-weight: bold; font-size: 120%;">Your changes will be visible immediately.</div>
<ul>
<li>For testing, please use the <a href="/wiki/Wikipedia:Sandbox" title="Wikipedia:Sandbox">sandbox</a>.</li>
<li>You're encouraged to create, expand, and improve upon articles; however, bad edits to articles are watched for and will be quickly removed.</li>
<li><b>Please <i><a href="/wiki/Wikipedia:Cite_sources" title="Wikipedia:Cite sources">cite your sources</a></i> so others can check your work.</b></li>
</ul>
<hr />
<div style="font-weight: bold; font-size: 120%;">DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</div>
<ul>
<li>All contributions to any page on Wikipedia are released under the GNU Free Documentation License (see <a href="/wiki/Wikipedia:Copyrights" title="Wikipedia:Copyrights">Project:Copyrights</a> for details).</li>
<li><b>If you do not want your writing to be edited mercilessly and redistributed at will, do not submit it.</b></li>
<li>By submitting your work you promise you wrote it yourself, or copied it from <a href="/wiki/Public_domain" title="Public domain">public domain</a> resources—this does <b>not</b> include most web pages.</li>
</ul>
</div>
</div>
<input type='hidden' value="9" name="wpSection" />
<input type='hidden' value="20050714072356" name="wpEdittime" />
<input type='hidden' value="6bd07ad5722418bb33f0ad107002713f" name="wpEditToken" />
<div class="editsection" style="float:right;margin-left:5px;">[<a href="/w/index.php?title=User_talk:Ereinion&amp;action=edit&amp;section=1" title="User talk:Ereinion">edit</a>]</div>
<p><a name="Differences" id="Differences"></a></p>
<h2>Differences</h2>
<table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>
<tr>
<td colspan='2' width='50%' align='center' class='diff-otitle'>Your text</td>
<td colspan='2' width='50%' align='center' class='diff-ntitle'>Stored version</td>
</tr>
<tr><td colspan="2" align="left"><strong>Line 1:</strong></td>
<td colspan="2" align="left"><strong>Line 1:</strong></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>&lt;div id=&quot;talk&quot; style=&quot;border: 1px solid #CC9; margin: 0em 1em 0em 1em; padding:5px; clear: both; background-color:#002F14&quot;&gt;</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>&lt;center&gt;&lt;font size=+1&gt;&lt;font color=#E1D3B3&gt;'''Talk Page Etiquette'''&lt;/font&gt;&lt;/center&gt;</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>&lt;center&gt;&lt;font size=0&gt;&lt;font color=#E1D3B3&gt;(keep in mind before posting)&lt;/font&gt;&lt;/center&gt;</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>* &lt;font color=#E1D3B3&gt;Properly introduce yourself.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>* &lt;font color=#E1D3B3&gt;Offer a tribute of respect.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>* &lt;font color=#E1D3B3&gt;Replies will be based on interest or importance.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>&lt;/div&gt;</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>----</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>==Re:Master Sword==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Ereinion, what exactly do you find objectionable about [[Master Sword]]? You still haven't put any complaints on its Talk Page. If you list your disputes, I will attempt to deal with them. --[[User:Carlj7|Carl]] 07:18, 12 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>I'm still confused. There is no debate that I can see on the [[Talk:Master_Sword |Master Sword talk page]]. The closest to a debate that I can see is:</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:&quot;If someone would state where it's said that the Master Sword is also called the &quot;Sword of Evil's Bane&quot; it would be more authoritive. Cúchulainn 00:08, Feb 6, 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:&quot;Erm, it's called SoEB up, down and across Ocarina of Time. Sheik, Rauru, the manual, and the player's guide all refer to it as such. There are a couple in-game references in other games too. Adam Marx Squared 00:25, 9 Feb 2005 (UTC)&quot;</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>But that's not really a debate. Cúchulainn just wondered when the term &quot;Sword of Evil's Bane&quot; was used, and Adam Marx answered, in Ocarina of Time. Which is true. Google for &quot;Sword of Evil's Bane&quot; and it's basically only ever used about Zelda. So there's no dispute. Right? Other than that, Adam wanted the Smash Brothers stuff differentiated from the Soul Calibur stuff (which I did) since Soul Calibur may or may not be cannon. Anyhow, there's no controversy that I'm aware of about Master Sword. --[[User:Carlj7|Carl]] 12:32, 13 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Ah. However, [[User:Telperion|Telperion]] made that comment in September, and since then, the page [http://en.wikipedia.org/w/index.php?title=Master_Sword&amp;oldid=6261633 has changed a lot]. I assume that if (s)he still had a problem, he would have voiced his concern by now. (In fact, Telperion hasn't even made any changes to Wikipedia at all since September.) I think that we can remove the controversial disclaimer for now, unless someone has a specific problem with the page. If tempers start to flare later, we can put up a warning, but at this point, I don't think anyone has a serious problem with the page. --[[User:Carlj7|Carl]] 02:16, 14 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>I understand your concern but feel that for now it's better to wait for an edit war to start and then put up a disclaimer than to scare people away from making contributions. If the article was already relatively complete or already had a brewing edit war, I would endorse the disclaimer, but I still think it's a bit early to say that Master Sword is the new George W. Bush. ;p --[[User:Carlj7|Carl]] 02:49, 14 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>==Zelda Images==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>The zelda image that you recently uploaded are tagged as &quot;copyright free use&quot;. That seems surprising to me, can you give some evidence that Nintendo have released copyright on their characters in this way. Thanks [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 06:38, 19 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:The images themseles are copyrighted to Nintendo, however they are avaible for third-party use and distibution, which is how I obtained them. I hope this answers your question. '''Ereinion''' 00:05, 20 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>::Ok thanks. That's great. What we should do in this case (where there is a general permisson) is to create a new template at [[Template:Zelda Image]]. That template should link to the source and to Nintendo's release statement. Also a category tag. There was (and is) a big argument over the [[pokemon]] images, and I want to avoid the same over Zelda. If you want me to do the hard work just let me know the source and where I can see the details of the copyright. Thanks again for uploading these free use images [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 01:12, 20 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:::I'm not entirely sure I know what you mean... Nintendo has their policy http://www.nintendo.com/corp/legal.jsp#copyrights] regarding copyrights, trademarks, and intellectual properties published on their company's home page. I could create such a template that you were suggesting if indeed the current templates Wikipedia has are in some way unsuitable. '''Ereinion'''</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>::::Well I looked at that page, and I saw that Nintendo does claim copyright over Game charaters, what I didn't see is any statement from them that they allow free use of images of their characters, which is the issue. Where does Nintendo say that the images are &quot;avaible for third-party use and distibution&quot;. Now fair use would probably apply to these images so I'm not thinking of deleting them, just putting them in the correct category. </td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>::::Also I want to know the ''source''. Are these taken from a web-site? Where? As for a new tag, the advice (somewhere in the backwoods of the wiki) is when uploading a number of images from a single source, create a new tag to sub-categorize. (By the way, I think the new Zelda game looks awesome) [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 04:32, 20 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:::::Under U.S. copyright law, partial works are allowed to be used for commentary or teaching. In the case of Nintendo, it wouldn't be practical to give a statement stating that their copyrights are given free license because they still use the intellectual rights, however distribution is still permitted with the acknowledgement that Nintendo owns all rights to its respective works and properties. This is my understanding. You can research this more indepth if you like at the Reproductions of Copyrighted Works by Educators and Librarians http://www.copyright.gov/circs/circ21.pdf] section. Ereinion 00:26, 21 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:::::: Yes, partial works are allowed to be used for commentary or teaching, or more generally for the benefit of the arts and sciences. This is what [[Fair use]] is, and that's fine, but that is not what &quot;CopyrightFreeUse&quot; is for, that is for images that the creator has explicitly released under a licence similar to the GFDL, allowing &quot;Free&quot; distribution, use and modification (including commercial use).</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:::::: If there has not been any such explicit release of these images under such a licence then they are ''not'' free images. They are (I think) fair use images, though I know there are some in the poke image dispute who disagree.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:::::: (There is also an exemption for archival by libraries, but that doesn't apply to us, and wikipedia isn't a classroom, and the editors aren't teachers, so those exemptions also don't apply).</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:::::: So what I propose is to re-tag as &quot;fair use&quot; as I believe that is the correct statement of copyright for these images.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:::::: Finally the source. Is it [http://www.ffsims.de/bilderbuch/zelda/oca.htm]? [[User:Zeimusu|&lt;nowiki&gt;&lt;/nowiki&gt;]] &amp;mdash; [[User:Zeimusu|Zeimusu]] | [[User talk:Zeimusu|Talk]] 05:34, 21 Feb 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>==Zeno image==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Thank you for uploading [[:Image:Zeno.jpg]]. You have marked it as public domain. What was the source of the photograph? Although the sculpture itself is in public domain because of its age, any photograph of it is a new work and has its own copyright. So unless the photograph is old enough to be have its copyright lapse, or the creator has released it, it is not in the public domain. [[User:Dsmdgold|Dsmdgold]] 03:07, Mar 2, 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>==Kaepora Gaebora==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>To answer the question in your edit comment, although I did not add the portion of text you deleted, it seems to be based on a popular fan theory that the Wind Fish is in fact a later incarnation of the Hero of Time. I forget the logic behind it, but I wouldn't give it much credence. [[User:Dcoetzee|Deco]] 09:23, 23 Apr 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>== Image copyright ==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>I am trying to clear our the non-sourced images category. If you notice the fairuse tag, it says that the uploader and those who add it claim fairuse. Therefor, I never presume to make that judgement if I have not uploaded it or added it. I am also adding several dozen images at a time, and the tag catches the eye, and makes my job far far easier.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>I apologize if you were offended, I am merely attempting to do some janitorial work. [[User:Burgundavia|Burgundavia]] &lt;small&gt;([[User talk:Burgundavia|&amp;#9992; take a flight?]])&lt;/small&gt; 23:01, May 23, 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>== Master Sword - Hero of Time ==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>What exactly is your reasoning for reverting my changes? Because I see none. The Hero of Time appeared in two games, ''[[The Legend of Zelda: Ocarina of Time|Ocarina of Time]]'' and ''[[The Legend of Zelda: Majora's Mask|Majora's Mask]]'', and he only wielded the Master Sword in ''OoT''. The Master Sword is also wielded by the Links in ''[[The Legend of Zelda: A Link to the Past|A Link to the Past]]'', ''[[The Legend of Zelda: Link's Awakening|Link's Awakening]]'', the two ''Oracle'' games and ''[[The Legend of Zelda: The Wind Waker|The Wind Waker]]''. That comes to the Hero of Time wielding the Master Sword once out of its six appearances. Even if you discount the appearances in the Game Boy games as bonuses, the HoT still only uses it for a third of the appearances. Having &quot;Hero of Time&quot; in that paragraph gives the impression that all Links, or at least all who wield the Master Sword, are the Hero of Time, which they are not. Unless you can think of an extraordinarily good reason, don't revert it again. [[User:Ian Moody|Ian Moody]] 12:33, 6 Jun 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>== Re: Your Gripe ==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>I'd appreciate it if you didn't tell others not to do a thing in the exact same fashion in which it was done. And, in the future, stay out of things that don't concern or involve you until they can be resolved by the participating parties. Thank you. [[User:Ereinion|Ereinion]][[Image:RAHSymbol.JPG|30px|]] 19:50, Jun 7, 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:In retrospect (what a wonderful thing that is!) it was indeed foolish for me to do such a hyppocritical action. I was indisposed at the time so used the edit summary to &quot;nip it in the bud&quot; so it could be sorted out later; had I had the time, I would have personally contacted both parties with more eloquently-worded advice before starting a new talk section detailing both sides of the issue so other editors could also comment.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>:On to the second point, it does not matter that I was not involved, indeed it was much better that I was not; I was a neutral party trying to prevent a nasty [[edit war]] from potentially occurring; had I been an involved party, any possible resolution methods would appear to be biased towards at least one of my points on the given matter. But I thank you for your valid concerns, and I will certainly bear that in mind for future dispute resolutions. Thank you for your time. [[User:Master Thief Garrett|Master Thief Garrett]]&lt;sup&gt;[[User talk:Master Thief Garrett|Talk]]&lt;/sup&gt; 03:32, 8 Jun 2005 (UTC)</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>== RE: My Reasons ==</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Okay, I'll do my best in showing the relation of characters to the story and FFVII as a cultural icon.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Big Bro - The man that Cloud and Aeris have to see in order to get the Wig Key Item. This is part of the Wall Market arc. Big Bro is also a cross dresser which reflects a unique portion of the population and sets FFVII closer to our world rather than a fantasy one.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Choco Bill - owner of the Chocobo Farm who informs the party that they're better off catching a chocobo to cross the marsh. Later, he sells chocobo stables to the player, without these, racing and breeding chocobos is impossible.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Choco Billy - A key figure in selling the character greens (used to catch chocobos and then increase their stats once in the stable). He is also in charge of mating chocobos as well as selling nuts, integral parts of breeding chocobos, without him, acquiring different color chocobos is impossible.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Chocobo Sage - the mysterious guy who tells Cloud how to get chocobos to breed in different colors. He is also the only person selling the highest quality greens and nuts. There's a section devoted to him in the PC version player's guide.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Chole - she gives statistics on your Chocobos</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Elder Bugah - many people overlook this character, but he is instrumental in putting a working timeline on the FFVII story and also gives information that it was Professor Gast who discovered and mistakenly labeled Jenova as an Ancient.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Elder Hargo - an elder in Cosmo Canyon who sheds light on what the Lifesteram is, important if the player wants to grasp the larget picture of the story</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Ester - another story-important character who is comparable to Mayor Domino, but the player must see her every time that he or she wishes to race chobos. She also instructs cloud on how to race chocobos.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Hart - offers to sell the player clues to the Mayor's puzzle</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Holzoff - the man living at the base of Gaea's Cliffs rescues the party whenever they collapse from wandering around the Great Glacier for too long. He also tells the party how to avoid freezing to death while on Gaea's Cliffs. It's his map that the characters take from Icicle Inn.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Joe - The chocobo jockey reappears several time in races on his black chocobo (the only one save for the player's) to make the races difficult. His chocobo always has better stats than whatever the player is using. He is introduced to the player by Ester.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Johnny - This character bears some resemblance to Johnny from Chrono Trigger. He appears in several areas in the game and usually has something to comment on the situation or the state of the party.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Kalm Traveller - two sidequests revolve around this guy: defeating Emerald and defeating Ruby as well as getting a guidebook. He is the only person in the world to offer mastered materia or a gold chocobo or underwater materia.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Kotch - simply one of Don Corneo's lackeys and part of the Wall Market arc. What sets him apart from other NPCs is that he has a name and actually interacts with the player.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Mukki - the guy who slaps Cloud awake in the Honeybee Inn, his apparent homosexuality helps connect the FFVII world to our contemporary one</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Priscilla - Cloud saves her from Bottomswell, without her, the party wouldn't have been able to go up to the Upper Junon area, she gives the party the Shiva materia as thanks.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Skotch - same as kotch</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Snow - A sidequest NPC/enemy not found by every FFVII player, there's actually a small sidequest just to get her to fight you, and fighting her is the only way to acquire the Alexander materia, ultimately necessary in order to meld mastered summon materia into a master summon materia</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>Zangan - a character that the player meets in the Flashback, Tifa's martial arts instructor and mentor. There's a letter to Tifa, in her piano, from him explaining Shin-Ra's coverup of the events in Nibelheim.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'>I'm pretty sure that's everybody I added.</td></tr>
<tr><td colspan="2">&nbsp;</td><td>+</td><td class='diff-addedline'></td></tr>
<tr><td> </td><td class='diff-context'>== Your icon ==</td><td> </td><td class='diff-context'>== Your icon ==</td></tr>
<tr><td> </td><td class='diff-context'></td><td> </td><td class='diff-context'></td></tr>
<tr><td> </td><td class='diff-context'>If I understand correctly, you claim [[copyright]] over [[:Image:RAHSymbol.JPG]]. This is incompatible with the standards of Wikipedia. I would suggest you tag it with a [[GFDL]], [[public domain]] or other free license. If not, it will need to be deleted. [[User:Dragons flight|Dragons flight]] 07:13, July 11, 2005 (UTC)</td><td> </td><td class='diff-context'>If I understand correctly, you claim [[copyright]] over [[:Image:RAHSymbol.JPG]]. This is incompatible with the standards of Wikipedia. I would suggest you tag it with a [[GFDL]], [[public domain]] or other free license. If not, it will need to be deleted. [[User:Dragons flight|Dragons flight]] 07:13, July 11, 2005 (UTC)</td></tr>
<tr><td>-</td><td class='diff-deletedline'></td><td colspan="2">&nbsp;</td></tr>
<tr><td>-</td><td class='diff-deletedline'>:Could you please respond to this? ~~~~</td><td colspan="2">&nbsp;</td></tr>
</table>
<div class="editsection" style="float:right;margin-left:5px;">[<a href="/w/index.php?title=User_talk:Ereinion&amp;action=edit&amp;section=1" title="User talk:Ereinion">edit</a>]</div>
<p><a name="Your_text" id="Your_text"></a></p>
<h2>Your text</h2>
<textarea tabindex=6 id='wpTextbox2' name="wpTextbox2" rows='25' cols='80' wrap='virtual'>== Your icon ==
If I understand correctly, you claim [[copyright]] over [[:Image:RAHSymbol.JPG]]. This is incompatible with the standards of Wikipedia. I would suggest you tag it with a [[GFDL]], [[public domain]] or other free license. If not, it will need to be deleted. [[User:Dragons flight|Dragons flight]] 07:13, July 11, 2005 (UTC)
:Could you please respond to this? ~~~~
</textarea></form>
<div class="printfooter">
Retrieved from "<a href="http://en.wikipedia.org/wiki/User_talk:Ereinion">http://en.wikipedia.org/wiki/User_talk:Ereinion</a>"</div>
<!-- end content -->
<div class="visualClear"></div>
</div>
</div>
</div>
<div id="column-one">
<div id="p-cactions" class="portlet">
<h5>Views</h5>
<ul>
<li id="ca-nstab-user"
><a href="/wiki/User:Ereinion">User page</a></li><li id="ca-talk"
class="selected" ><a href="/wiki/User_talk:Ereinion">Discussion</a></li><li id="ca-edit"
class="selected istalk" ><a href="/w/index.php?title=User_talk:Ereinion&amp;action=edit">Edit this page</a></li><li id="ca-addsection"
><a href="/w/index.php?title=User_talk:Ereinion&amp;action=edit&amp;section=new">+</a></li><li id="ca-history"
><a href="/w/index.php?title=User_talk:Ereinion&amp;action=history">History</a></li><li id="ca-move"
><a href="/wiki/Special:Movepage/User_talk:Ereinion">Move</a></li> </ul>
</div>
<div class="portlet" id="p-personal">
<h5>Personal tools</h5>
<div class="pBody">
<ul>
<li id="pt-userpage"><a href="/wiki/User:Dragons_flight">Dragons flight</a></li><li id="pt-mytalk"><a href="/wiki/User_talk:Dragons_flight">My talk</a></li><li id="pt-preferences"><a href="/wiki/Special:Preferences">Preferences</a></li><li id="pt-watchlist"><a href="/wiki/Special:Watchlist">My watchlist</a></li><li id="pt-mycontris"><a href="/wiki/Special:Contributions/Dragons_flight">My contributions</a></li><li id="pt-logout"><a href="/w/index.php?title=Special:Userlogout&amp;returnto=User_talk:Ereinion">Log out</a></li> </ul>
</div>
</div>
<div class="portlet" id="p-logo">
<a style="background-image: url(http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png);"
href="/wiki/Main_Page"
title="Main Page"></a>
</div>
<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
<div class='portlet' id='p-navigation'>
<h5>Navigation</h5>
<div class='pBody'>
<ul>
<li id="n-mainpage"><a href="/wiki/Main_Page">Main Page</a></li>
<li id="n-portal"><a href="/wiki/Wikipedia:Community_Portal">Community portal</a></li>
<li id="n-currentevents"><a href="/wiki/Current_events">Current events</a></li>
<li id="n-recentchanges"><a href="/wiki/Special:Recentchanges">Recent changes</a></li>
<li id="n-randompage"><a href="/wiki/Special:Random">Random article</a></li>
<li id="n-help"><a href="/wiki/Help:Contents">Help / Contact us</a></li>
<li id="n-sitesupport"><a href="http://wikimediafoundation.org/wiki/Fundraising">Donations</a></li>
</ul>
</div>
</div>
<div id="p-search" class="portlet">
<h5><label for="searchInput">Search</label></h5>
<div class="pBody">
<form name="searchform" action="/wiki/Special:Search" id="searchform">
<input id="searchInput" name="search" type="text"
accesskey="f" value="" />
<input type='submit' name="go" class="searchButton" id="searchGoButton"
value="Go"
/>&nbsp;<input type='submit' name="fulltext"
class="searchButton"
value="Search" />
</form>
</div>
</div>
<div class="portlet" id="p-tb">
<h5>Toolbox</h5>
<div class="pBody">
<ul>
<li id="t-whatlinkshere"><a href="/wiki/Special:Whatlinkshere/User_talk:Ereinion">What links here</a></li>
<li id="t-recentchangeslinked"><a href="/wiki/Special:Recentchangeslinked/User_talk:Ereinion">Related changes</a></li>
<li id="t-contributions"><a href="/wiki/Special:Contributions/Ereinion">User contributions</a></li> <li id="t-emailuser"><a href="/wiki/Special:Emailuser/Ereinion">E-mail this user</a></li> <li id="t-upload"><a href="/wiki/Special:Upload">Upload file</a></li> <li id="t-specialpages"><a href="/wiki/Special:Specialpages">Special pages</a></li> </ul>
</div>
</div>
</div><!-- end of the left (by default at least) column -->
<div class="visualClear"></div>
<div id="footer">
<div id="f-poweredbyico"><a href="http://www.mediawiki.org/"><img src="/skins-1.5/common/images/poweredby_mediawiki_88x31.png" alt="MediaWiki" /></a></div> <div id="f-copyrightico"><a href="http://wikimediafoundation.org/"><img src="http://upload.wikimedia.org/wikipedia/meta/9/9f/Wikimedia-button1.png" border="0" alt="Wikimedia Foundation"/></a></div> <ul id="f-list">
<li id="f-about"><a href="/wiki/Wikipedia:About" title="Wikipedia:About">About Wikipedia</a></li> <li id="f-disclaimer"><a href="/wiki/Wikipedia:General_disclaimer" title="Wikipedia:General disclaimer">Disclaimers</a></li> </ul>
</div>
</div>
<!-- Served by srv20 in 3.69 secs. --> </body>
</html>

File Metadata

Mime Type
text/html
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1160
Default Alt Text
DBug-editconflict.html (65 KB)

Event Timeline