Move copyright license to help book.
authorJoe Wreschnig <joe.wreschnig@gmail.com>
Wed, 6 Mar 2013 16:06:52 +0000 (17:06 +0100)
committerJoe Wreschnig <joe.wreschnig@gmail.com>
Wed, 6 Mar 2013 16:06:52 +0000 (17:06 +0100)
Credits.rtf [deleted file]
Enjoyable Help/Enjoyable Help.helpindex
Enjoyable Help/Enjoyable Help.html
Enjoyable Help/pgs/boring.html [new file with mode: 0644]
Enjoyable.xcodeproj/project.pbxproj

diff --git a/Credits.rtf b/Credits.rtf
deleted file mode 100644 (file)
index 60f8d64..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf470
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww9800\viewh11760\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
-
-\f0\fs24 \cf0 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is 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.\
-\
-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, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\
-\
-\
-The joystick icon is from the Tango icon set and is public domain.}
\ No newline at end of file
index 2c293218be38901d9c0e19cbc98a3d96039d883e..8a646b3cb06bc0d07d7d3e290080e21c8d2a721e 100644 (file)
Binary files a/Enjoyable Help/Enjoyable Help.helpindex and b/Enjoyable Help/Enjoyable Help.helpindex differ
index d2e382be6273cb27c9183ee60e0421a870f70e65..4c8ec53e7845f64b1881990bd668f3d9c9d32970 100644 (file)
     </div>
 
     <p style="border-top: #777 solid 1px; text-align: center; margin-top: 2em">
+      <a class="weblink" href="help:anchor='boring' bookID='Enjoyable Help'">
+        license
+      </a>
+      -
       <a class="weblink" href="http://yukkurigames.com/enjoyable">
-        Visit the Enjoyable website.
+        website
       </a>
     </p>
 
diff --git a/Enjoyable Help/pgs/boring.html b/Enjoyable Help/pgs/boring.html
new file mode 100644 (file)
index 0000000..89c0efb
--- /dev/null
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>License &amp; Copyright</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="robots" content="anchors" />
+    <link href="../sty/default.css"
+          rel="stylesheet"
+          type="text/css"
+          media="all"/>
+  </head>
+  
+  <body>
+    <a name="boring"></a>
+    
+    <div id="navbox">
+      <div id="navleftbox">
+        <a class="navlink_left"
+           href="help:anchor='home' bookID='Enjoyable Help'">
+          Home
+        </a>
+      </div>
+    </div>
+    
+    <div id="headerbox">
+      <div id="iconbox">
+        <img id="iconimg"
+             src="../gfx/Icon.png"
+             alt="Icon"
+             height="32" width="32"/>
+      </div>
+      <h1>License &amp; Copyright</h1>
+    </div>
+
+    <h3><a name="copyright"></a>Copyright</h3>
+    <p>
+      2013 Joe Wreschnig<br />
+      2012 Yifeng Huang<br />
+      2009 Sam McCall &amp; the University of Otago
+    </p>
+
+    <h3><a name="license"></a>License</h3>
+    <p>
+      Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without
+      restriction, including without limitation the rights to use,
+      copy, modify, merge, publish, distribute, sublicense, and/or
+      sell copies of the Software, and to permit persons to whom the
+      Software is furnished to do so, subject to the following
+      conditions:
+    </p>
+    <p>
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+    </p>
+    <p>
+      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, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+      OTHER DEALINGS IN THE SOFTWARE.
+    </p>
+    <p>
+      The joystick icon is from the Tango icon set and is public
+      domain.
+    </p>
+  </body>
+</html>
index 2cc0bfedacf0ab9bc31ac8a2f7940e9c29928091..d28d5b8078ffbe30ec443b1559f895037f94d7ed 100644 (file)
@@ -14,7 +14,6 @@
                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
                8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-               D549CA4C0FBB441B00BC8203 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = D549CA4B0FBB441B00BC8203 /* Credits.rtf */; };
                D5617A360FAEB74000928B3A /* NJMappingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = D5617A350FAEB74000928B3A /* NJMappingsController.m */; };
                D5617A390FAEBA1800928B3A /* NJMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = D5617A380FAEBA1800928B3A /* NJMapping.m */; };
                D5617D1A0FAF568100928B3A /* NJInputButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D5617D190FAF568100928B3A /* NJInputButton.m */; };
@@ -53,7 +52,6 @@
                8BEFAD9B15C46BFF00823AEC /* NJOutputMouseScroll.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJOutputMouseScroll.m; sourceTree = "<group>"; };
                8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                8D1107320486CEB800E47090 /* Enjoyable.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Enjoyable.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               D549CA4B0FBB441B00BC8203 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
                D5617A080FAEAF8300928B3A /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
                D5617A340FAEB74000928B3A /* NJMappingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJMappingsController.h; sourceTree = "<group>"; };
                D5617A350FAEB74000928B3A /* NJMappingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJMappingsController.m; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                EE03150C16E63481002B2DCE /* Enjoyable Help */,
-                               D549CA4B0FBB441B00BC8203 /* Credits.rtf */,
                                D5617A080FAEAF8300928B3A /* icon.icns */,
                                8D1107310486CEB800E47090 /* Info.plist */,
                                089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
                                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
                                1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
                                D5F80A9D0FB0A2FF0006A4DE /* icon.icns in Resources */,
-                               D549CA4C0FBB441B00BC8203 /* Credits.rtf in Resources */,
                                EE03150D16E63481002B2DCE /* Enjoyable Help in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;