34017 2010-01-22 13:36:18 -0800 website: Mention on contributing code page where to find preferred license text 2010-01-24 13:09:45 -0800 1 1 1 Unclassified WebKit WebKit Website 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek cjerdonek darin ddkilzer mjs oldest_to_newest 183774 0 cjerdonek 2010-01-22 13:36:18 -0800 This came up here: https://bugs.webkit.org/show_bug.cgi?id=33475#c9 183916 1 47257 cjerdonek 2010-01-22 18:35:21 -0800 Created attachment 47257 Proposed patch 184073 2 47257 ddkilzer 2010-01-24 08:51:17 -0800 Comment on attachment 47257 Proposed patch > diff --git a/WebKitSite/coding/contributing.html b/WebKitSite/coding/contributing.html > - <li>Add any new files and layout tests to Subversion using the <tt>svn add</tt> command.</li> > + <li>Add any <a href="#newfiles">new files</a> to your local checkout.</li> I would say "working directory" instead of "checkout" here. > +<h3 id="writecode">Develop your changes</h3> > + > +If you make substantive changes to a file, you may wish to add a > +copyright line for yourself or for the company on whose behalf you > +work. Below is an example copyright line for an individual contributor: > + > +<tt>Copyright (C) 2010 John Smith (jsmith@example.com)</tt> I would add an example for a company copyright as well (and modify the text above): work. Below is an example copyright line for an individual contributor and a company: <tt>Copyright (C) 2010 John Smith (jsmith@example.com)</tt> <tt>Copyright (C) 2010 Company Inc. All rights reserved.</tt> > +In addition, make sure that any new code files you introduce contain I suggest changing "new code files" to "new source code files". Maybe include "scripts" as well: In addition, make sure that all new scripts and source code files that you introduce contain > +license text at the beginning of the file. If you are the author of > +a new file, preferred license text to include can be found here: > +<a href="http://trac.webkit.org/browser/trunk/WebKit/LICENSE">WebKit/LICENSE</a>. > +(The "Original Format" link at the bottom of the page contains text > +that can be cut and pasted more easily.) Simply replace the copyright > +line with your own information, for example as suggested above. > +<h3 id="newfiles">Add new files to your checkout</h3> Change "checkout" to "working directory". > +If your changes include adding new files (like new layout tests), > +use the <tt>svn add</tt> command to mark these files for addition to the > +repository. If you do not do this, the new files will be missing from > +the patch file you generate below. > + > +You can learn more about Subversion commands like <tt>svn add</tt> > +from the online book <a href="http://svnbook.red-bean.com/">Version > +Control with Subversion</a> and from the <tt>svn help</tt> command. Book titles should be quoted: from the online book "<a href="http://svnbook.red-bean.com/">Version Control with Subversion</a>" and from the <tt>svn help</tt> command. r=me, but consider the minor editing suggestions above (cq-). 184081 3 cjerdonek 2010-01-24 10:28:44 -0800 (In reply to comment #2) Thanks for the review, David! Great comments. > > +You can learn more about Subversion commands like <tt>svn add</tt> > > +from the online book <a href="http://svnbook.red-bean.com/">Version > > +Control with Subversion</a> and from the <tt>svn help</tt> command. > > Book titles should be quoted: > > from the online book "<a href="http://svnbook.red-bean.com/">Version > Control with Subversion</a>" and from the <tt>svn help</tt> command. One minor point. I believe book titles should be underlined or italicized rather than quoted. (It is chapter titles in books and article titles within magazines, for example, that are quoted.) You can see an example of this behavior on their web site: http://svnbook.red-bean.com . 184084 4 ddkilzer 2010-01-24 10:59:37 -0800 (In reply to comment #3) > (In reply to comment #2) > > Thanks for the review, David! Great comments. > > > > +You can learn more about Subversion commands like <tt>svn add</tt> > > > +from the online book <a href="http://svnbook.red-bean.com/">Version > > > +Control with Subversion</a> and from the <tt>svn help</tt> command. > > > > Book titles should be quoted: > > > > from the online book "<a href="http://svnbook.red-bean.com/">Version > > Control with Subversion</a>" and from the <tt>svn help</tt> command. > > One minor point. I believe book titles should be underlined or italicized > rather than quoted. (It is chapter titles in books and article titles within > magazines, for example, that are quoted.) You can see an example of this > behavior on their web site: http://svnbook.red-bean.com . Hmm...I guess it's been a while since my English classes in high school. Please decorate the text as appropriate. I think italics is preferred to underline. :) 184099 5 cjerdonek 2010-01-24 13:09:45 -0800 Manually committed r53782 (via "git svn dcommit"): http://trac.webkit.org/changeset/53782 I added a "book" CSS class. :) 47257 2010-01-22 18:35:21 -0800 2010-01-24 08:51:16 -0800 Proposed patch _patch-34017-1.txt text/plain 4977 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFNpdGUvQ2hhbmdlTG9nIGIvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cK aW5kZXggZGMyZjg1ZS4uMDVjNThkNCAxMDA2NDQKLS0tIGEvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wMS0yMiAg Q2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0byBjb250cmlidXRpbmcgY29k ZSBwYWdlIGEgcG9pbnRlciB0byB0aGUgcHJlZmVycmVkCisgICAgICAgIGxpY2Vuc2UgdGV4dC4g QWxzbyBhZGRlZCBpbmZvcm1hdGlvbiBhYm91dCB0aGUgY29weXJpZ2h0IGxpbmUuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MDE3CisKKyAgICAg ICAgKiBjb2RpbmcvY29udHJpYnV0aW5nLmh0bWw6CisKIDIwMTAtMDEtMjEgIENocmlzIEplcmRv bmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQg TGV2aW4uCmRpZmYgLS1naXQgYS9XZWJLaXRTaXRlL2NvZGluZy9jb250cmlidXRpbmcuaHRtbCBi L1dlYktpdFNpdGUvY29kaW5nL2NvbnRyaWJ1dGluZy5odG1sCmluZGV4IGQ0Zjg4YmQuLmZmMjU1 ODcgMTAwNjQ0Ci0tLSBhL1dlYktpdFNpdGUvY29kaW5nL2NvbnRyaWJ1dGluZy5odG1sCisrKyBi L1dlYktpdFNpdGUvY29kaW5nL2NvbnRyaWJ1dGluZy5odG1sCkBAIC0yNywxMyArMjcsMTMgQEAg TGF0ZXIgc2VjdGlvbnMgb2YgdGhpcyBwYWdlIGV4cGxhaW4gZWFjaCBzdGVwIGluIG1vcmUgZGV0 YWlsLgogCiA8b2w+CiAgICAgPGxpPkNob29zZSBvciBjcmVhdGUgYSA8YSBocmVmPSIjYnVncmVw b3J0Ij5idWcgcmVwb3J0PC9hPiB0byB3b3JrIG9uLjwvbGk+Ci0gICAgPGxpPkNvbXBsZXRlIHlv dXIgY2hhbmdlcy48L2xpPgorICAgIDxsaT48YSBocmVmPSIjd3JpdGVjb2RlIj5EZXZlbG9wPC9h PiB5b3VyIGNoYW5nZXMuPC9saT4KICAgICA8bGk+TWFrZSBzdXJlIHlvdXIgY2hhbmdlcyBtZWV0 IHRoZSA8YSBocmVmPSIvY29kaW5nL2NvZGluZy1zdHlsZS5odG1sIj5jb2RlCiAgICAgICAgIHN0 eWxlIGd1aWRlbGluZXM8L2E+LiBUaGUgPHR0PmNoZWNrLXdlYmtpdC1zdHlsZTwvdHQ+IHNjcmlw dCBtYXkgYmUgb2YKICAgICAgICAgaGVscC48L2xpPgogICAgIDxsaT5SdW4gdGhlIGxheW91dCB0 ZXN0cyB1c2luZyB0aGUgPHR0PnJ1bi13ZWJraXQtdGVzdHM8L3R0PiBzY3JpcHQgYW5kIG1ha2Ug c3VyZSB0aGV5IGFsbCBwYXNzLgogICAgICAgICBTZWUgdGhlIDxhIGhyZWY9Ii9xdWFsaXR5L3Rl c3R3cml0aW5nLmh0bWwiPnRlc3RpbmcgcGFnZTwvYT4gZm9yIG1vcmUgaW5mb3JtYXRpb24sIGFz IHdlbGwgYXMgd2hhdCB5b3UgbmVlZCB0byBkbyBpZiB5b3UndmUgbW9kaWZpZWQgSmF2YVNjcmlw dENvcmUuPC9saT4KLSAgICA8bGk+QWRkIGFueSBuZXcgZmlsZXMgYW5kIGxheW91dCB0ZXN0cyB0 byBTdWJ2ZXJzaW9uIHVzaW5nIHRoZSA8dHQ+c3ZuIGFkZDwvdHQ+IGNvbW1hbmQuPC9saT4KKyAg ICA8bGk+QWRkIGFueSA8YSBocmVmPSIjbmV3ZmlsZXMiPm5ldyBmaWxlczwvYT4gdG8geW91ciBs b2NhbCBjaGVja291dC48L2xpPgogICAgIDxsaT5QcmVwYXJlIGEgY2hhbmdlIGxvZyBlbnRyeS4g WW91IG1heSBoYXZlIHRvIGFkZCBlbnRyaWVzIHRvIG11bHRpcGxlIENoYW5nZUxvZ3MuIFRoZSA8 dHQ+cHJlcGFyZS1DaGFuZ2VMb2c8L3R0PiBzY3JpcHQgd2lsbCBjcmVhdGUgc3R1YiBlbnRyaWVz IGZvciB5b3UuICBTZWUgdGhlIDxhIGhyZWY9IiNjaGFuZ2Vsb2dzIj5wYXJhZ3JhcGggYWJvdXQg Q2hhbmdlTG9nczwvYT4gYmVsb3cuPC9saT4KICAgICA8bGk+Q3JlYXRlIHRoZSBwYXRjaCB1c2lu ZyB0aGUgPHR0PnN2bi1jcmVhdGUtcGF0Y2g8L3R0PiBzY3JpcHQuPC9saT4KICAgICA8bGk+PGEg aHJlZj0iI3N1Ym1pdCI+U3VibWl0PC9hPiB5b3VyIHBhdGNoIGZvciByZXZpZXcgdG8KQEAgLTY1 LDYgKzY1LDIyIEBAIG1heSBiZSBjb250cm92ZXJzaWFsLCB5b3UgbWF5IHdhbnQgdG8gY2hlY2sg aW4gYWR2YW5jZSB3aXRoIHRoZQogPGEgaHJlZj0iaHR0cDovL2xpc3RzLndlYmtpdC5vcmcvbWFp bG1hbi9saXN0aW5mby93ZWJraXQtZGV2Ij4KIHdlYmtpdC1kZXY8L2E+IG1haWxpbmcgbGlzdC48 L3A+CiAKKzxoMyBpZD0id3JpdGVjb2RlIj5EZXZlbG9wIHlvdXIgY2hhbmdlczwvaDM+CisKKzxw PklmIHlvdSBtYWtlIHN1YnN0YW50aXZlIGNoYW5nZXMgdG8gYSBmaWxlLCB5b3UgbWF5IHdpc2gg dG8gYWRkIGEKK2NvcHlyaWdodCBsaW5lIGZvciB5b3Vyc2VsZiBvciBmb3IgdGhlIGNvbXBhbnkg b24gd2hvc2UgYmVoYWxmIHlvdQord29yay4gQmVsb3cgaXMgYW4gZXhhbXBsZSBjb3B5cmlnaHQg bGluZSBmb3IgYW4gaW5kaXZpZHVhbCBjb250cmlidXRvcjoKKworPHA+PHR0PkNvcHlyaWdodCAo QykgMjAxMCBKb2huIFNtaXRoIChqc21pdGhAZXhhbXBsZS5jb20pPC90dD48L3A+CisKKzxwPklu IGFkZGl0aW9uLCBtYWtlIHN1cmUgdGhhdCBhbnkgbmV3IGNvZGUgZmlsZXMgeW91IGludHJvZHVj ZSBjb250YWluCitsaWNlbnNlIHRleHQgYXQgdGhlIGJlZ2lubmluZyBvZiB0aGUgZmlsZS4gSWYg eW91IGFyZSB0aGUgYXV0aG9yIG9mCithIG5ldyBmaWxlLCBwcmVmZXJyZWQgbGljZW5zZSB0ZXh0 IHRvIGluY2x1ZGUgY2FuIGJlIGZvdW5kIGhlcmU6Cis8YSBocmVmPSJodHRwOi8vdHJhYy53ZWJr aXQub3JnL2Jyb3dzZXIvdHJ1bmsvV2ViS2l0L0xJQ0VOU0UiPldlYktpdC9MSUNFTlNFPC9hPi4K KyhUaGUgIk9yaWdpbmFsIEZvcm1hdCIgbGluayBhdCB0aGUgYm90dG9tIG9mIHRoZSBwYWdlIGNv bnRhaW5zIHRleHQKK3RoYXQgY2FuIGJlIGN1dCBhbmQgcGFzdGVkIG1vcmUgZWFzaWx5LikgU2lt cGx5IHJlcGxhY2UgdGhlIGNvcHlyaWdodAorbGluZSB3aXRoIHlvdXIgb3duIGluZm9ybWF0aW9u LCBmb3IgZXhhbXBsZSBhcyBzdWdnZXN0ZWQgYWJvdmUuCisKIDxoMz5Db2RlIFN0eWxlIEd1aWRl bGluZXM8L2gzPgogPHA+UGF0Y2hlcyBtdXN0IGNvbXBseSB3aXRoIHRoZSA8YSBocmVmPSIvY29k aW5nL2NvZGluZy1zdHlsZS5odG1sIj5jb2RlIHN0eWxlIGd1aWRlbGluZXM8L2E+LgogU29tZSBv bGRlciBwYXJ0cyBvZiB0aGUgY29kZWJhc2UgZG8gbm90IGZvbGxvdyB0aGVzZSBndWlkZWxpbmVz LgpAQCAtODUsOSArMTAxLDE1IEBAIHdoeSBhIG5ldyB0ZXN0IGlzbid0IG5lY2Vzc2FyeSB0byB0 aGUgcmV2aWV3ZXIuPC9wPgogPHA+SW5mb3JtYXRpb24gb24gd3JpdGluZyBhIGxheW91dCB0ZXN0 IGFzIHdlbGwgYXMgd2hhdCBuZWVkcyB0byBiZSBkb25lIGlmIHlvdSd2ZSBtYWRlIGNoYW5nZXMg dG8gSmF2YVNjcmlwdENvcmUKIGNhbiBiZSBmb3VuZCBvbiB0aGUgPGEgaHJlZj0iL3F1YWxpdHkv dGVzdHdyaXRpbmcuaHRtbCI+dGVzdGluZyBwYWdlPC9hPi48L3A+CiAKLTxoMz5BZGRpbmcgbmV3 IGZpbGVzPC9oMz4KLTxwPk5ldyBmaWxlcyBhbmQgbGF5b3V0IHRlc3RzIG11c3QgYmUgYWRkZWQg dG8gU3VidmVyc2lvbiBvciBlbHNlIHRoZXkgd29uJ3QgYmUgaW5jbHVkZWQgaW4geW91ciBwYXRj aC4gVGhpcyBpcyBkb25lIHdpdGggdGhlIDx0dD5zdm4gYWRkPC90dD4gY29tbWFuZC4KLU1vcmUg aW5mb3JtYXRpb24gb24gU3VidmVyc2lvbiBjb21tYW5kcyBjYW4gYmUgZm91bmQgdmlhIDx0dD5z dm4gaGVscDwvdHQ+IG9yIHRoZSA8YSBocmVmPSJodHRwOi8vc3ZuYm9vay5yZWQtYmVhbi5jb20v Ij5WZXJzaW9uIENvbnRyb2wgd2l0aCBTdWJ2ZXJzaW9uPC9hPiBvbmxpbmUgYm9vay48L3A+Cis8 aDMgaWQ9Im5ld2ZpbGVzIj5BZGQgbmV3IGZpbGVzIHRvIHlvdXIgY2hlY2tvdXQ8L2gzPgorPHA+ SWYgeW91ciBjaGFuZ2VzIGluY2x1ZGUgYWRkaW5nIG5ldyBmaWxlcyAobGlrZSBuZXcgbGF5b3V0 IHRlc3RzKSwKK3VzZSB0aGUgPHR0PnN2biBhZGQ8L3R0PiBjb21tYW5kIHRvIG1hcmsgdGhlc2Ug ZmlsZXMgZm9yIGFkZGl0aW9uIHRvIHRoZQorcmVwb3NpdG9yeS4gSWYgeW91IGRvIG5vdCBkbyB0 aGlzLCB0aGUgbmV3IGZpbGVzIHdpbGwgYmUgbWlzc2luZyBmcm9tCit0aGUgcGF0Y2ggZmlsZSB5 b3UgZ2VuZXJhdGUgYmVsb3cuPC9wPgorCis8cD5Zb3UgY2FuIGxlYXJuIG1vcmUgYWJvdXQgU3Vi dmVyc2lvbiBjb21tYW5kcyBsaWtlIDx0dD5zdm4gYWRkPC90dD4KK2Zyb20gdGhlIG9ubGluZSBi b29rIDxhIGhyZWY9Imh0dHA6Ly9zdm5ib29rLnJlZC1iZWFuLmNvbS8iPlZlcnNpb24KK0NvbnRy b2wgd2l0aCBTdWJ2ZXJzaW9uPC9hPiBhbmQgZnJvbSB0aGUgPHR0PnN2biBoZWxwPC90dD4gY29t bWFuZC48L3A+CiAKIDxoMyBpZD0iY2hhbmdlbG9ncyI+Q2hhbmdlTG9nIGZpbGVzPC9oMz4KIDxw PkNoYW5nZUxvZ3MgYXJlIHNpbXBsZSB0ZXh0IGZpbGVzIHdoaWNoIHByb3ZpZGUgaGlzdG9yaWNh bCBkb2N1bWVudGF0aW9uIGZvciBhbGwgY2hhbmdlcyB0byB0aGUgV2ViS2l0IHByb2plY3QuICBB bGwgcGF0Y2hlcyByZXF1aXJlIGFuIGVudHJ5IHRvIHRoZSBDaGFuZ2VMb2cuIFRoZSA8dHQ+cHJl cGFyZS1DaGFuZ2VMb2c8L3R0PiBzY3JpcHQgd2lsbCBjcmVhdGUgYSBiYXNpYyBlbnRyeSBjb250 YWluaW5nIGEgbGlzdCBvZiBhbGwgZmlsZXMgdGhhdCBoYXZlIGJlZW4gY2hhbmdlZC4gIFRoZSBm aXJzdCBsaW5lIGNvbnRhaW5zIHRoZSBkYXRlLCB5b3VyIGZ1bGwgbmFtZSwgYW5kIHlvdXIgZW1h aWwgYWRkcmVzcy4gIFVzZSB0aGlzIHRvIHdyaXRlIHVwIGEgYnJpZWYgc3VtbWFyeSBvZiB0aGUg Y2hhbmdlcyB5b3UndmUgbWFkZS4gIERvbid0IHdvcnJ5IGFib3V0IHRoZSAiUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkiIGxpbmUsIHRoZSBwZXJzb24gbGFuZGluZyB5b3VyIHBhdGNoIHdpbGwg ZmlsbCB0aGlzIGluLjwvcD4K