浏览代码

Merge pull request #10053 from vieux/update_copyrights

update copyrights to 2015
Alexander Morozov 10 年之前
父节点
当前提交
6ef475bada
共有 7 个文件被更改,包括 9 次插入10 次删除
  1. 1 1
      docs/mkdocs.yml
  2. 2 2
      docs/theme/mkdocs/footer.html
  3. 1 1
      pkg/mflag/LICENSE
  4. 1 1
      pkg/mflag/flag.go
  5. 2 3
      pkg/mflag/flag_test.go
  6. 1 1
      pkg/symlink/LICENSE.APACHE
  7. 1 1
      pkg/symlink/LICENSE.BSD

+ 1 - 1
docs/mkdocs.yml

@@ -18,7 +18,7 @@ use_absolute_urls: true
 theme_dir: ./theme/mkdocs/
 theme_dir: ./theme/mkdocs/
 theme_center_lead: false
 theme_center_lead: false
 
 
-copyright: Copyright © 2014, Docker, Inc.
+copyright: Copyright © 2014-2015, Docker, Inc.
 google_analytics: ['UA-6096819-11', 'docker.io']
 google_analytics: ['UA-6096819-11', 'docker.io']
 
 
 pages:
 pages:

+ 2 - 2
docs/theme/mkdocs/footer.html

@@ -101,7 +101,7 @@
     </div>
     </div>
     <div class="row clearfix">
     <div class="row clearfix">
       <div class="span6 pagination-right copyright">
       <div class="span6 pagination-right copyright">
-        <span>&copy; 2014 Docker, Inc.</span>
+        <span>&copy; 2014-2015 Docker, Inc.</span>
       </div>
       </div>
       <div class="span6 pagination-left copyright">
       <div class="span6 pagination-left copyright">
         <a href="http://www.docker.com/legal/terms_of_service">Terms</a> &middot;
         <a href="http://www.docker.com/legal/terms_of_service">Terms</a> &middot;
@@ -110,4 +110,4 @@
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
-</div>
+</div>

+ 1 - 1
pkg/mflag/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 The Docker & Go Authors. All rights reserved.
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
 
 
 Redistribution and use in source and binary forms, with or without
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 modification, are permitted provided that the following conditions are

+ 1 - 1
pkg/mflag/flag.go

@@ -1,4 +1,4 @@
-// Copyright 2014 The Docker & Go Authors. All rights reserved.
+// Copyright 2014-2015 The Docker & Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 // license that can be found in the LICENSE file.
 
 

+ 2 - 3
pkg/mflag/flag_test.go

@@ -1,13 +1,12 @@
-// Copyright 2014 The Docker & Go Authors. All rights reserved.
+// Copyright 2014-2015 The Docker & Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 // license that can be found in the LICENSE file.
 
 
-package mflag_test
+package mflag
 
 
 import (
 import (
 	"bytes"
 	"bytes"
 	"fmt"
 	"fmt"
-	. "github.com/docker/docker/pkg/mflag"
 	"os"
 	"os"
 	"sort"
 	"sort"
 	"strings"
 	"strings"

+ 1 - 1
pkg/symlink/LICENSE.APACHE

@@ -176,7 +176,7 @@
 
 
    END OF TERMS AND CONDITIONS
    END OF TERMS AND CONDITIONS
 
 
-   Copyright 2014 Docker, Inc.
+   Copyright 2014-2015 Docker, Inc.
 
 
    Licensed under the Apache License, Version 2.0 (the "License");
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    you may not use this file except in compliance with the License.

+ 1 - 1
pkg/symlink/LICENSE.BSD

@@ -1,4 +1,4 @@
-Copyright (c) 2014 The Docker & Go Authors. All rights reserved.
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
 
 
 Redistribution and use in source and binary forms, with or without
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 modification, are permitted provided that the following conditions are