Copyright wording

CONTRIBUTING.md

@@ -11,7 +11,8 @@ Commons Attribution 4.0 International License. You retain the copyright
 to code you have written.
 
 When accepting your first contribution, the maintainer of the project
-will ensure that you are added to the CONTRIBUTORS file.
+will ensure that you are added to the CONTRIBUTORS file. You are welcome
+to add yourself as a separate commit in your first pull request.
 
 ## Building
 

LICENSE

@@ -1,11 +1,11 @@
-Copyright (C) 2014 Jakob Borg and other contributors (see the CONTRIBUTORS file).
+Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
+Permission is hereby granted, free of charge, to any person obtaining a copy
-this software and associated documentation files (the "Software"), to deal in
+of this software and associated documentation files (the "Software"), to
-the Software without restriction, including without limitation the rights to
+deal in the Software without restriction, including without limitation the
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-of the Software, and to permit persons to whom the Software is furnished to do
+sell copies of the Software, and to permit persons to whom the Software is
-so, subject to the following conditions:
+furnished to do so, subject to the following conditions:
 
 - The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
@@ -14,6 +14,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-SOFTWARE.
+IN THE SOFTWARE.

beacon/beacon.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package beacon
 

beacon/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package beacon
 

beacon/doc.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package beacon implements an UDP broadcast beacon
 package beacon

cmd/assets/assets.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

cmd/syncthing/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

cmd/syncthing/gui.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

cmd/syncthing/gui_solaris.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 //+build solaris
 

cmd/syncthing/gui_unix.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 //+build !windows,!solaris
 

cmd/syncthing/limitedwriter.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

cmd/syncthing/locktrace.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 //+build locktrace
 

cmd/syncthing/main.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

cmd/syncthing/openurl_unix.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build !windows
 

cmd/syncthing/openurl_windows.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build windows
 

cmd/syncthing/tls.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

cmd/syncthing/upgrade_supported.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build !solaris,!windows
 

cmd/syncthing/upgrade_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

cmd/syncthing/usage.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

config/config.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package config implements reading and writing of the syncthing configuration file.
 package config

config/config_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package config
 

discover/cmd/discosrv/main.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

discover/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package discover
 

discover/discover.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package discover
 

discover/doc.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package discover implements the node discovery protocol.
 package discover

discover/packets.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package discover
 

files/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package files
 

files/set.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package files provides a set type to track local/remote files with newness checks.
 package files

files/set_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package files_test
 

gui/app.js

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 /*jslint browser: true, continue: true, plusplus: true */
 /*global $: false, angular: false */

gui/index.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <!--
-Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-found in the LICENSE file.
+// license that can be found in the LICENSE file.
 -->
 <html lang="en" ng-app="syncthing" ng-controller="SyncthingCtrl" class="ng-cloak">
 <head>
@@ -685,7 +685,7 @@ found in the LICENSE file.
         <h1>Syncthing <small>{{version}}</small></h1>
         <hr/>
 
-        <p>Copyright &copy; 2013-2014 <b>Jakob Borg</b> and the following contributors:</p>
+        <p>Copyright &copy; 2014 <b>Jakob Borg</b> and the following <b>Contributors</b>:</p>
         <div class="row">
         <div class="col-md-6">
         <ul>
@@ -708,7 +708,7 @@ found in the LICENSE file.
         </div>
         <hr/>
 
-        <p>Syncthing includes the following software, copyright their respective authors.
+        <p>Syncthing includes the following software or portions thereof:
         <ul>
           <li><a href="http://golang.org/">The Go Programming Languange</a>, Copyright &copy; 2012 The Go Authors.</li>
           <li><a href="https://bitbucket.org/kardianos/osext">kardianos/osext</a>, Copyright &copy; 2012 Daniel Theophanes.</li>

integration/genfiles.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build ignore
 

integration/http.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build ignore
 

integration/json.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build ignore
 

integration/md5r.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build ignore
 

lamport/clock.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package lamport implements a simple Lamport Clock for versioning
 package lamport

logger/logger.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package logger implements a standardized logger with callback functionality
 package logger

model/blockqueue.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

model/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

model/doc.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package model implements repository abstraction and file pulling mechanisms
 package model

model/model.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

model/model_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

model/puller.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

model/suppressor.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

model/suppressor_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

model/tempname.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build !windows
 

model/tempname_windows.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build windows
 

model/util.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package model
 

osutil/hidden_unix.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build !windows
 

osutil/hidden_windows.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build windows
 

osutil/osutil.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package osutil
 

protocol/common_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

protocol/counting.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

protocol/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

protocol/doc.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package protocol implements the Block Exchange Protocol.
 package protocol

protocol/header.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

protocol/message.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

protocol/nativemodel_darwin.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build darwin
 

protocol/nativemodel_unix.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build !windows,!darwin
 

protocol/nativemodel_windows.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build windows
 

protocol/protocol.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

protocol/protocol_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

protocol/wireformat.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package protocol
 

scanner/blocks.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package scanner
 

scanner/blocks_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package scanner
 

scanner/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package scanner
 

scanner/doc.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package scanner implements a file system scanner and hasher.
 package scanner

scanner/walk.go

@@ -1,12 +1,11 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package scanner
 
 import (
 	"bytes"
-	"code.google.com/p/go.text/unicode/norm"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -15,6 +14,7 @@ import (
 	"runtime"
 	"strings"
 	"time"
+	"code.google.com/p/go.text/unicode/norm"
 
 	"github.com/calmh/syncthing/lamport"
 	"github.com/calmh/syncthing/protocol"

scanner/walk_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package scanner
 

upnp/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package upnp
 

upnp/upnp.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Adapted from https://github.com/jackpal/Taipei-Torrent/blob/dd88a8bfac6431c01d959ce3c745e74b8a911793/IGD.go
 // Copyright (c) 2010 Jack Palevich (https://github.com/jackpal/Taipei-Torrent/blob/dd88a8bfac6431c01d959ce3c745e74b8a911793/LICENSE)

versioner/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package versioner
 

versioner/simple.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package versioner
 

versioner/versioner.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package versioner
 

xdr/bench_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package xdr_test
 

xdr/cmd/genxdr/main.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package main
 

xdr/debug.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package xdr
 

xdr/doc.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // Package xdr implements an XDR (RFC 4506) encoder/decoder.
 package xdr

xdr/encdec_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package xdr_test
 

xdr/reader.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package xdr
 

xdr/refl_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 // +build refl
 

xdr/writer.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package xdr
 

xdr/xdr_test.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// Use of this source code is governed by an MIT-style license that can be
+// All rights reserved. Use of this source code is governed by an MIT-style
-// found in the LICENSE file.
+// license that can be found in the LICENSE file.
 
 package xdr