From 906e935c7ebddec74fb03f029e5a7060755c1ac8 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Fri, 25 Jul 2014 13:52:40 -0700
Subject: [PATCH] copyright/naming/date updates

---
 .../osx/MBTiles Spotlight Importer/GetMetadataForFile.m      | 5 ++---
 platforms/osx/MBTiles Spotlight Importer/Info.plist          | 2 +-
 .../MBTilesQuickLook/GeneratePreviewForURL.m                 | 5 ++---
 .../MBTilesQuickLook/GenerateThumbnailForURL.m               | 5 ++---
 platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.h    | 5 ++---
 platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.m    | 5 ++---
 .../MBTilesQuickLook/MBTilesQuickLook-Info.plist             | 2 +-
 platforms/osx/TileMillAppDelegate.h                          | 3 +--
 platforms/osx/TileMillAppDelegate.m                          | 5 ++---
 platforms/osx/TileMillBrowserWindowController.h              | 3 +--
 platforms/osx/TileMillBrowserWindowController.m              | 3 +--
 platforms/osx/TileMillChildProcess.h                         | 3 +--
 platforms/osx/TileMillChildProcess.m                         | 3 +--
 platforms/osx/TileMillDatabaseWatcher.h                      | 3 +--
 platforms/osx/TileMillDatabaseWatcher.m                      | 3 +--
 platforms/osx/TileMillSparklePrefsWindowController.h         | 3 +--
 platforms/osx/TileMillSparklePrefsWindowController.m         | 3 +--
 platforms/osx/main.m                                         | 3 +--
 platforms/osx/tilemill-Info.plist                            | 2 +-
 templates/Config._                                           | 2 +-
 20 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/platforms/osx/MBTiles Spotlight Importer/GetMetadataForFile.m b/platforms/osx/MBTiles Spotlight Importer/GetMetadataForFile.m
index d13dfa848..4a38ee75e 100644
--- a/platforms/osx/MBTiles Spotlight Importer/GetMetadataForFile.m	
+++ b/platforms/osx/MBTiles Spotlight Importer/GetMetadataForFile.m	
@@ -1,8 +1,7 @@
 //
 //  MBTiles Spotlight Importer
 //
-//  Created by Justin R. Miller on 2/7/11.
-//  Copyright 2011-2013 MapBox, Inc.
+//  Copyright 2011-2014 Mapbox, Inc.
 //  All rights reserved.
 //  
 //  Redistribution and use in source and binary forms, with or without
@@ -15,7 +14,7 @@
 //        notice, this list of conditions and the following disclaimer in the
 //        documentation and/or other materials provided with the distribution.
 //  
-//      * Neither the name of MapBox, Inc. nor the names of its contributors
+//      * Neither the name of Mapbox, Inc. nor the names of its contributors
 //        may be used to endorse or promote products derived from this
 //        software without specific prior written permission.
 //
diff --git a/platforms/osx/MBTiles Spotlight Importer/Info.plist b/platforms/osx/MBTiles Spotlight Importer/Info.plist
index 48badc8ca..6ef59a87d 100644
--- a/platforms/osx/MBTiles Spotlight Importer/Info.plist	
+++ b/platforms/osx/MBTiles Spotlight Importer/Info.plist	
@@ -56,7 +56,7 @@
 	<key>CFPlugInUnloadFunction</key>
 	<string></string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2011-2013 MapBox, Inc.</string>
+	<string>Copyright © 2011-2014 Mapbox, Inc.</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
diff --git a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GeneratePreviewForURL.m b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GeneratePreviewForURL.m
index a77cb5c17..c459e5a3f 100644
--- a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GeneratePreviewForURL.m
+++ b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GeneratePreviewForURL.m
@@ -1,8 +1,7 @@
 //
 //  MBTilesQuickLook
 //
-//  Created by Käfer Konstantin on 04.08.11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //  
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
@@ -14,7 +13,7 @@
 //        notice, this list of conditions and the following disclaimer in the
 //        documentation and/or other materials provided with the distribution.
 //  
-//      * Neither the name of MapBox, Inc. nor the names of its contributors
+//      * Neither the name of Mapbox, Inc. nor the names of its contributors
 //        may be used to endorse or promote products derived from this
 //        software without specific prior written permission.
 //
diff --git a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GenerateThumbnailForURL.m b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GenerateThumbnailForURL.m
index d8ec0c0c3..b411d78bd 100644
--- a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GenerateThumbnailForURL.m
+++ b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/GenerateThumbnailForURL.m
@@ -1,8 +1,7 @@
 //
 //  MBTilesQuickLook
 //
-//  Created by Käfer Konstantin on 04.08.11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
@@ -14,7 +13,7 @@
 //        notice, this list of conditions and the following disclaimer in the
 //        documentation and/or other materials provided with the distribution.
 //  
-//      * Neither the name of MapBox, Inc. nor the names of its contributors
+//      * Neither the name of Mapbox, Inc. nor the names of its contributors
 //        may be used to endorse or promote products derived from this
 //        software without specific prior written permission.
 //
diff --git a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.h b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.h
index dcc90b56e..415f8e83e 100644
--- a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.h
+++ b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.h
@@ -2,8 +2,7 @@
 //  MBTiles.h
 //  MBTilesQuickLook
 //
-//  Created by Käfer Konstantin on 04.08.11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
@@ -15,7 +14,7 @@
 //        notice, this list of conditions and the following disclaimer in the
 //        documentation and/or other materials provided with the distribution.
 //  
-//      * Neither the name of MapBox, Inc. nor the names of its contributors
+//      * Neither the name of Mapbox, Inc. nor the names of its contributors
 //        may be used to endorse or promote products derived from this
 //        software without specific prior written permission.
 //
diff --git a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.m b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.m
index aba7373c7..79fd8fd9c 100644
--- a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.m
+++ b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTiles.m
@@ -2,8 +2,7 @@
 //  MBTiles.m
 //  MBTilesQuickLook
 //
-//  Created by Käfer Konstantin on 04.08.11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
@@ -15,7 +14,7 @@
 //        notice, this list of conditions and the following disclaimer in the
 //        documentation and/or other materials provided with the distribution.
 //  
-//      * Neither the name of MapBox, Inc. nor the names of its contributors
+//      * Neither the name of Mapbox, Inc. nor the names of its contributors
 //        may be used to endorse or promote products derived from this
 //        software without specific prior written permission.
 //
diff --git a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTilesQuickLook-Info.plist b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTilesQuickLook-Info.plist
index fb9f71924..55c0138b7 100644
--- a/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTilesQuickLook-Info.plist
+++ b/platforms/osx/MBTilesQuickLook/MBTilesQuickLook/MBTilesQuickLook-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFPlugInUnloadFunction</key>
 	<string></string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2011-2013 MapBox, Inc.</string>
+	<string>Copyright © 2011-2014 Mapbox, Inc.</string>
 	<key>QLNeedsToBeRunInMainThread</key>
 	<false/>
 	<key>QLPreviewHeight</key>
diff --git a/platforms/osx/TileMillAppDelegate.h b/platforms/osx/TileMillAppDelegate.h
index 3a5585cf3..221a5bdf3 100755
--- a/platforms/osx/TileMillAppDelegate.h
+++ b/platforms/osx/TileMillAppDelegate.h
@@ -2,8 +2,7 @@
 //  TileMillAppDelegate.h
 //  TileMill
 //
-//  Created by Dane Springmeyer on 7/28/11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import "TileMillChildProcess.h"
diff --git a/platforms/osx/TileMillAppDelegate.m b/platforms/osx/TileMillAppDelegate.m
index cee35239d..a60f821f6 100755
--- a/platforms/osx/TileMillAppDelegate.m
+++ b/platforms/osx/TileMillAppDelegate.m
@@ -2,8 +2,7 @@
 //  TileMillAppDelegate.m
 //  TileMill
 //
-//  Created by Dane Springmeyer on 7/28/11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import "TileMillAppDelegate.h"
@@ -50,7 +49,7 @@ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filenam
                                          defaultButton:@"OK"
                                        alternateButton:nil
                                            otherButton:nil
-                             informativeTextWithFormat:@"While %@ can export to MBTiles, it is unable to do anything with them itself. Maybe try uploading the file to your MapBox account?", [[NSProcessInfo processInfo] processName]];
+                             informativeTextWithFormat:@"While %@ can export to MBTiles, it is unable to do anything with them itself. Maybe try uploading the file to your Mapbox account?", [[NSProcessInfo processInfo] processName]];
         
         [alert runModal];
     }
diff --git a/platforms/osx/TileMillBrowserWindowController.h b/platforms/osx/TileMillBrowserWindowController.h
index e7f14b5dd..ebb2512bb 100644
--- a/platforms/osx/TileMillBrowserWindowController.h
+++ b/platforms/osx/TileMillBrowserWindowController.h
@@ -2,8 +2,7 @@
 //  TileMillBrowserWindowController.h
 //  TileMill
 //
-//  Created by Justin Miller on 10/12/11.
-//  Copyright (c) 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright (c) 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import <WebKit/WebKit.h>
diff --git a/platforms/osx/TileMillBrowserWindowController.m b/platforms/osx/TileMillBrowserWindowController.m
index bb4b360b6..45a83fb2f 100644
--- a/platforms/osx/TileMillBrowserWindowController.m
+++ b/platforms/osx/TileMillBrowserWindowController.m
@@ -2,8 +2,7 @@
 //  TileMillBrowserWindowController.m
 //  TileMill
 //
-//  Created by Justin Miller on 10/12/11.
-//  Copyright (c) 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright (c) 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import "TileMillBrowserWindowController.h"
diff --git a/platforms/osx/TileMillChildProcess.h b/platforms/osx/TileMillChildProcess.h
index 5af1c9a19..d7a996bad 100755
--- a/platforms/osx/TileMillChildProcess.h
+++ b/platforms/osx/TileMillChildProcess.h
@@ -2,8 +2,7 @@
 //  TileMillChildProcess.h
 //  TileMill
 //
-//  Created by Will White on 8/2/11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 @class TileMillChildProcess;
diff --git a/platforms/osx/TileMillChildProcess.m b/platforms/osx/TileMillChildProcess.m
index 40bf4d87d..b2da9d9a9 100755
--- a/platforms/osx/TileMillChildProcess.m
+++ b/platforms/osx/TileMillChildProcess.m
@@ -2,8 +2,7 @@
 //  TileMillChildProcess.m
 //  TileMill
 //
-//  Created by Will White on 8/2/11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import "TileMillChildProcess.h"
diff --git a/platforms/osx/TileMillDatabaseWatcher.h b/platforms/osx/TileMillDatabaseWatcher.h
index d1013b74b..4557b6eaf 100644
--- a/platforms/osx/TileMillDatabaseWatcher.h
+++ b/platforms/osx/TileMillDatabaseWatcher.h
@@ -2,8 +2,7 @@
 //  TileMillDatabaseWatcher.h
 //  TileMill
 //
-//  Created by Justin R. Miller on 8/26/13.
-//  Copyright 2013 MapBox, Inc. All rights reserved.
+//  Copyright 2013-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
diff --git a/platforms/osx/TileMillDatabaseWatcher.m b/platforms/osx/TileMillDatabaseWatcher.m
index 0a7fc1316..c3d1a9578 100644
--- a/platforms/osx/TileMillDatabaseWatcher.m
+++ b/platforms/osx/TileMillDatabaseWatcher.m
@@ -2,8 +2,7 @@
 //  TileMillDatabaseWatcher.m
 //  TileMill
 //
-//  Created by Justin R. Miller on 8/26/13.
-//  Copyright 2013 MapBox, Inc. All rights reserved.
+//  Copyright 2013-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import "TileMillDatabaseWatcher.h"
diff --git a/platforms/osx/TileMillSparklePrefsWindowController.h b/platforms/osx/TileMillSparklePrefsWindowController.h
index d54a3ebde..aebb21e64 100644
--- a/platforms/osx/TileMillSparklePrefsWindowController.h
+++ b/platforms/osx/TileMillSparklePrefsWindowController.h
@@ -2,8 +2,7 @@
 //  TileMillSparklePrefsWindowController.h
 //  TileMill
 //
-//  Created by Justin Miller on 8/15/11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 #define TileMillProductionAppcastURL  [NSURL URLWithString:@"https://mapbox.com/tilemill/platforms/osx/appcast2.xml"]
diff --git a/platforms/osx/TileMillSparklePrefsWindowController.m b/platforms/osx/TileMillSparklePrefsWindowController.m
index 9170184cf..96cc1bbb4 100644
--- a/platforms/osx/TileMillSparklePrefsWindowController.m
+++ b/platforms/osx/TileMillSparklePrefsWindowController.m
@@ -2,8 +2,7 @@
 //  TileMillSparklePrefsWindowController.m
 //  TileMill
 //
-//  Created by Justin Miller on 8/15/11.
-//  Copyright 2011-2013 MapBox, Inc. All rights reserved.
+//  Copyright 2011-2014 Mapbox, Inc. All rights reserved.
 //
 
 #import "TileMillSparklePrefsWindowController.h"
diff --git a/platforms/osx/main.m b/platforms/osx/main.m
index 89d296350..9dd42ce04 100755
--- a/platforms/osx/main.m
+++ b/platforms/osx/main.m
@@ -2,8 +2,7 @@
 //  main.m
 //  TileMill
 //
-//  Created by Dane Springmeyer on 7/28/11.
-//  Copyright MapBox, Inc. 2011-2013. All rights reserved.
+//  Copyright Mapbox, Inc. 2011-2014. All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/platforms/osx/tilemill-Info.plist b/platforms/osx/tilemill-Info.plist
index 7ba4ce181..b10763af6 100644
--- a/platforms/osx/tilemill-Info.plist
+++ b/platforms/osx/tilemill-Info.plist
@@ -42,7 +42,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2010-2013 MapBox</string>
+	<string>Copyright © 2010-2014 Mapbox, Inc.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
diff --git a/templates/Config._ b/templates/Config._
index 95ceab9dd..682cfb53d 100644
--- a/templates/Config._
+++ b/templates/Config._
@@ -2,7 +2,7 @@
 <h2><a target='_blank' href='http://tilemill.com'>TileMill</a></h2>
 <p>
   Version <%=window.abilities.tilemill.version%> (<%=window.abilities.version[0]%>)<br/>
-  Copyright © 2010-2013 <a target='_blank' href='http://mapbox.com'>MapBox</a>
+  Copyright © 2010-2014 <a target='_blank' href='http://mapbox.com'>Mapbox, Inc.</a>
 </p>
 </div>