Edit_conflict_screenshot.png


Description Screenshot showing where to find your changes in the edit-conflict resolution window.
Date 2016-03-021
Source Screenshot
Author Text is public domain; user interface is authors of MediaWiki software
Permission
( Reusing this file )

Copyrighted by Wikimedia
This is a screenshot of a web page of a Wikimedia Foundation project. Text of Wikimedia projects (except for Wikinews [1] and parts of Wikidata [2] ) are licensed under the Creative Commons Attribution Share-Alike 4.0 license and may additionally be licensed under the GNU Free Documentation License (Version 1.2, 1.3, or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts), and are subject to terms of use . The MediaWiki software itself is licensed under the GNU General Public License.

Any other media in this image may be subject to other terms. Logos (if they appear in this screenshot) of the Wikimedia Foundation are Wikimedia trademarks and are subject to Trademark policy .

Note on licenses: Please note that the GPL is for software and its derivatives and the GFDL is for text documentations or other forms of text and their derivatives . This means that the interface design of Wikipedia and all other portions of the MediaWiki software are licensed under the GPL. The actual contents of Wikipedia are licensed with Creative Commons Attribution-ShareAlike 4.0 Unported License and in some cases also with the GFDL.

As such, portions of this screenshot may be licensed under two or three separate licenses . The GPL and GFDL are not the same license; they are only connected through the Free Software Foundation , the creator of the licenses.

  1. Wikinews uses the Creative Commons Attribution 2.5 Generic license, or "CC-BY 2.5".
  2. Wikidata's main , property , lexeme , and EntitySchema namespaces use the Creative Commons Public Domain Dedication , or "CC0". All other namespaces use the Creative Commons Attribution Share-Alike 4.0 license .
w:en:Creative Commons
attribution share alike
You are free:
  • to share – to copy, distribute and transmit the work
  • to remix – to adapt the work
Under the following conditions:
  • attribution – You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
  • share alike – If you remix, transform, or build upon the material, you must distribute your contributions under the same or compatible license as the original.
GNU head Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License , Version 1.2 or any later version published by the Free Software Foundation ; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled GNU Free Documentation License .

Captions

This Planet we call Earth is our world. (The Blue Marble)

Items portrayed in this file

depicts

image/png

e5986cbb4d36c5f12ea7fbc42e4d28c32bb907a7

227,490 byte

821 pixel

1,181 pixel