4.0/Drafts - Revision history

Kat Walsh: link launch announcement and versioning notes

2013-11-26T22:56:51Z

link launch announcement and versioning notes

Kat Walsh: /* Draft 4 Details */ comparisons

2013-10-15T18:33:49Z

‎Draft 4 Details: comparisons

CCID-diane peters: /* 4.0d4v2 Licenses (updated as of 15 October 2013) */

2013-10-15T17:58:45Z

‎4.0d4v2 Licenses (updated as of 15 October 2013)

CCID-diane peters: /* 4.0d4v2 Licenses (updated as of 15 October 2013) */

2013-10-15T17:58:14Z

‎4.0d4v2 Licenses (updated as of 15 October 2013)

CCID-diane peters: /* 4.0d4v2 Licenses (updated as of 15 October 2013) */

2013-10-15T17:53:39Z

‎4.0d4v2 Licenses (updated as of 15 October 2013)

CCID-diane peters: /* 4.0d4v2 Licenses (updated as of 15 October 2013) */

2013-10-15T16:57:08Z

‎4.0d4v2 Licenses (updated as of 15 October 2013)

CCID-diane peters: /* 4.0d4 Licenses (updated as of 10 October 2013) */

2013-10-15T16:11:19Z

‎4.0d4 Licenses (updated as of 10 October 2013)

CCID-diane peters: /* Draft 4 Details */

2013-10-10T21:24:34Z

‎Draft 4 Details

Kat Walsh: /* 4.0d4 Licenses */ verb tense

2013-09-16T23:12:57Z

‎4.0d4 Licenses: verb tense

Kat Walsh: /* 4.0d4 Licenses */ fix links

2013-09-16T23:04:22Z

‎4.0d4 Licenses: fix links

@@ Line 2: / Line 2: @@
 * Global Summit (Sept 2011), [http://creativecommons.org/weblog/entry/29639 outcomes related to 4.0]
 * Public discussion [http://creativecommons.org/weblog/entry/30676 launch (December 2011)]
-* [[4.0|4.0 wiki]] detailing objectives, process, topic/issue page
+* [[4.0|4.0 wiki pages]] detailing objectives, process, topic/issue pages
+* [https://creativecommons.org/weblog/entry/40768 4.0 launch announcement (November 2013)]
 ==[[4.0/Draft_1|Draft 1 Details]]==

@@ Line 95: / Line 95: @@
 ''(all six are presented in HTML; BY-NC-SA is published in alternative formats as well)''
-* '''BY  (4.0d4)''' [http://staging.creativecommons.org/licenses/by/4.0/legalcode HTML]
+* '''BY (4.0d4)''' [http://staging.creativecommons.org/licenses/by/4.0/legalcode HTML]
 * '''BY-SA (4.0d4)''' [http://staging.creativecommons.org/licenses/by-sa/4.0/legalcode HTML]
 * '''BY-NC-SA (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nc-sa/4.0/legalcode HTML], [[Media:4.0d4_BY-NC-SA.odt|ODT]], [[Media:4.0d4_BY-NC-SA.pdf|PDF]], and [[Media:4.0d4_BY-NC-SA.txt|TXT]]
@@ Line 109: / Line 109: @@
 ''All six are presented in HTML at the same location as above.  Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''
-Visit the [http://wiki.creativecommons.org/4.0/Draft_4#Updated_Draft_4_Legal_Code Draft 4 page] to view a summary of the main changes.
+* '''BY (4.0d4v2)''': [[Media:BY_(compare_d4v1_and_d4v2).doc|.doc]], [[Media:BY_(compare_d4v1_and_d4v2).odt|.odt]], [[Media:BY_(compare_d4v1_and_d4v2).pdf|.pdf]]
 {{Translations

@@ Line 107: / Line 107: @@
 ===4.0d4v2 Licenses (updated as of 15 October 2013)===
-''All six are presented in HTML at the same location as above.  Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''  Visit the [http://wiki.creativecommons.org/4.0/Draft_4#Updated_Draft_4_Legal_Code Draft 4 page] to view a summary of the main changes.
+''All six are presented in HTML at the same location as above.  Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''
 {{Translations

@@ Line 107: / Line 107: @@
 ===4.0d4v2 Licenses (updated as of 15 October 2013)===
-''All six are presented in HTML at the same location as above.  Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''
+''All six are presented in HTML at the same location as above.  Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''  Visit the [http://wiki.creativecommons.org/4.0/Draft_4#Updated_Draft_4_Legal_Code Draft 4 page] to view a summary of the main changes.
 {{Translations

← Older revision		Revision as of 17:53, 15 October 2013
Line 109:		Line 109:
	''All six are presented in HTML at the same location as above. Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''		''All six are presented in HTML at the same location as above. Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''

		+
		+	Visit the Draft 4 page [link] to view a summary of the main changes.

	{{Translations		{{Translations

← Older revision		Revision as of 16:57, 15 October 2013
Line 107:		Line 107:

	===4.0d4v2 Licenses (updated as of 15 October 2013)===		===4.0d4v2 Licenses (updated as of 15 October 2013)===
−	''All six are presented in HTML at the same location as above. Below are links to files comparing the ~~updated HTML~~ (4.0d4v1) and ~~the original draft 4 licenses~~ (4.0d4v2)''	+	''All six are presented in HTML at the same location as above. Below are links to files comparing the original draft 4 licenses (4.0d4v1) and all revisions to date (4.0d4v2) and incorporated in the current html''

@@ Line 106: / Line 106: @@
 * Attribution comparison chart from draft 3 to original draft 4: [[Media:Attribution_chart_%28v3_v_d4%29_.pdf|PDF]]
-===4.0d4 Licenses (updated as of 10 October 2013)===
+===4.0d4v2 Licenses (updated as of 15 October 2013)===
-''All six are presented in HTML at the same location as above.  Below are links to updated comparisons of the updated HTML and the original draft 4 licenses''
+''All six are presented in HTML at the same location as above.  Below are links to files comparing the updated HTML (4.0d4v1) and the original draft 4 licenses (4.0d4v2)''

@@ Line 86: / Line 86: @@
 ==[[4.0/Draft_4|Draft 4 Details]]==
-* '''Publication: 12 September 2013'''
+* '''First publication: 12 September 2013'''
 ** [http://creativecommons.org/weblog/entry/39587 Blog post]
 ** [http://lists.ibiblio.org/pipermail/cc-licenses/2013-September/007409.html Announcement] to license development list
-* '''Comment period (abbreviated): Approximately two weeks from publication, ending the week of September 23rd'''
+* '''Comment period (abbreviated): Approximately two weeks from publication subject to further revisions'''
-===4.0d4 Licenses===
+===Original 4.0d4 Licenses===
 ''(all six are presented in HTML; BY-NC-SA is published in alternative formats as well)''
@@ Line 103: / Line 103: @@
 ====Other 4.0d4 documents====
-* Comparison of draft 3 and draft 4: [[Media:Comparison_draft_3_to_draft_4.pdf|PDF]]
+* Comparison of draft 3 and original draft 4: [[Media:Comparison_draft_3_to_draft_4.pdf|PDF]]
-* Attribution comparison chart from draft 3 to draft 4: [[Media:Attribution_chart_%28v3_v_d4%29_.pdf|PDF]]
+* Attribution comparison chart from draft 3 to original draft 4: [[Media:Attribution_chart_%28v3_v_d4%29_.pdf|PDF]]
 {{Translations

@@ Line 95: / Line 95: @@
 ''(all six will be presented in HTML; BY-NC-SA is published in alternative formats as well)''
-* '''BY  (4.0d4)''' [http://staging.creativecommons.org/licenses/by/4.0/legalcodelink HTML]
+* '''BY  (4.0d4)''' [http://staging.creativecommons.org/licenses/by/4.0/legalcode HTML]
-* '''BY-SA (4.0d4)''' [http://staging.creativecommons.org/licenses/by-sa/4.0/legalcodelink HTML]
+* '''BY-SA (4.0d4)''' [http://staging.creativecommons.org/licenses/by-sa/4.0/legalcode HTML]
 * '''BY-NC-SA (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nc-sa/4.0/legalcode HTML], [[Media:4.0d4_BY-NC-SA.odt|ODT]], [[Media:4.0d4_BY-NC-SA.pdf|PDF]], and [[Media:4.0d4_BY-NC-SA.txt|TXT]]
-* '''BY-NC (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nc/4.0/legalcodelink HTML]
+* '''BY-NC (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nc/4.0/legalcode HTML]
-* '''BY-ND (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nd/4.0/legalcodelink HTML]
+* '''BY-ND (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nd/4.0/legalcode HTML]
-* '''BY-NC-ND (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nc-nd/4.0/legalcodelink HTML]
+* '''BY-NC-ND (4.0d4)''' [http://staging.creativecommons.org/licenses/by-nc-nd/4.0/legalcode HTML]
 ====Other 4.0d4 documents====