Skip to content

Commit 1795b61

Browse files
morgantmorgant
committed
Resolved merge conflict.
2 parents b9c0de8 + b7370e9 commit 1795b61

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NewtonScript.org
22
================
33

4-
This is the repository for the NewtonScript.org site.
4+
This is the repository for the [NewtonScript.org](http://newtonscript.org/) site.
55

66
Improvements, fixes, translations, etc., are not only welcome, but highly encouraged. See [CONTRIBUTING](CONTRIBUTING.md) for details on how to appropriately & effectively submit improvements so that they are more likely to be accepted and the process is as smooth as possible for all parties involved.

‎index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<title>NewtonScript</title>
55
<link rel="stylesheet" type="text/css" href="css/basic.css" />
@@ -12,7 +12,7 @@
1212
</head>
1313
<body>
1414
<h1>NewtonScript</h1>
15-
<p><em>NewtonScript</em> is an object-oriented programming language developed by <a href="http://waltersmith.us/">Walter Smith</a> for <a href="http://www.apple.com/">Apple</a> for the NewtonOS running on their MessagePad &amp; eMate hardware. It borrows concepts from the Smalltalk, LISP, and Self programming languages with special consideration for a low memory footprint (esp. differential inheritance). In 2003 a NewtonScript interpreter, <a href="#newt0">NEWT/0</a> was developed by Makoto Nukui allowing for its use on other platforms. Here you'll find information about the language and programming reference materials.</p>
15+
<p><em>NewtonScript</em> is an object-oriented programming language developed by <a href="http://waltersmith.us/">Walter Smith</a> for <a href="http://www.apple.com/">Apple</a> for the NewtonOS running on their MessagePad &amp; eMate hardware. It borrows concepts from the Smalltalk, LISP, and Self programming languages with special consideration for a low memory footprint (esp. differential inheritance). In 2003 a NewtonScript interpreter, <a href="#newt0">NEWT/0</a> was developed by Makoto Nukui allowing for its use on other platforms. Here you’ll find information about the language and programming reference materials.</p>
1616
<h2>Development Tools</h2>
1717
<dl>
1818
<dt><a id="dashboard" href="http://www.fivespeedsoftware.com/dashboard/">Dashboard</a></dt>
@@ -22,7 +22,7 @@ <h2>Development Tools</h2>
2222
<dd>An open source Linux, Mac OS X, and Windows IDE for NewtonOS software development by Matthias Melcher. Built on <a href="#newt0">NEWT/0</a>.</dd>
2323

2424
<dt><a id="einstein" href="http://code.google.com/p/einstein/">Einstein</a></dt>
25-
<dd>An open source Mac OS X, Linux, Windows, iOS, Android, and ARM-Linux NewtonOS 2.1 emulator by Paul Guyot. It includes a "Relativity" feature that allows NewtonScript to call native methods from the parent OS from within the NewtonOS.</dd>
25+
<dd>An open source Mac OS X, Linux, Windows, iOS, Android, and ARM-Linux NewtonOS 2.1 emulator by Paul Guyot. It includes a “Relativity” feature that allows NewtonScript to call native methods from the parent OS from within the NewtonOS.</dd>
2626

2727
<dt><a id="minspector" href="http://www.fivespeedsoftware.com/minspector/">Minspector</a></dt>
2828
<dd>A freeware NewtonOS inspector by Five Speed Software.</dd>
@@ -40,7 +40,7 @@ <h2>Development Tools</h2>
4040
<dd>A Mac OS X <a href="http://codingmonkeys.de/subethaedit/">SubEthaEdit</a>/<a href="http://panic.com/coda/">Coda</a> Mode (syntax highlighter) for the NewtonScript language by Morgan Aldridge.</dd>
4141

4242
<dt><a id="ntk">Newton Toolkit</a> (a.k.a NTK)</dt>
43-
<dd>Apple's Mac OS &amp; Windows IDE for NewtonOS software development.</dd>
43+
<dd>Apple’s Mac OS &amp; Windows IDE for NewtonOS software development.</dd>
4444

4545
<dt><a id="tntk" href="http://github.com/ekoeppen/tntk">tntk</a></dt>
4646
<dd>An open source, Mac OS X command line NewtonScript compiler by Eckhart Köppen. Built on <a href="#newt0">NEWT/0</a>.</dd>
@@ -55,7 +55,7 @@ <h2>Documentation</h2>
5555

5656
<dt>develop (Magazine, HTML; mirrors: <a href="http://old.mactech.com/articles/develop/">MacTech</a>)</dt>
5757
<dd>
58-
<p>Apple's quarterly technical journal published from 1990-1997, before being pulled into <a href="http://www.mactech.com/">MacTech magazine</a> as a regular column. The following issues contain Newton/NewtonScript-specific articles:</p>
58+
<p>Apple’s quarterly technical journal published from 1990-1997, before being pulled into <a href="http://www.mactech.com/">MacTech magazine</a> as a regular column. The following issues contain Newton/NewtonScript-specific articles:</p>
5959
<ul>
6060
<li><a href="http://old.mactech.com/articles/develop/issue_17/index.html">Issue 17</a> (HTML; March 1994)</li>
6161
<li><a href="http://old.mactech.com/articles/develop/issue_18/index.html">Issue 18</a> (HTML; June 1994)</li>
@@ -100,11 +100,11 @@ <h2>Documentation</h2>
100100
<dd></dd>
101101

102102
<dt><a href="http://manuals.info.apple.com/en_US/NewtonScriptProgramLanguage.PDF">The NewtonScript Programming Language</a> (PDF; mirrors: <a href="http://www.unna.org/unna/apple/documentation/developer/NewtonScriptProgLanguage.pdf">UNNA</a>, <a href="http://www.newted.org/download/manuals/NewtonScriptProgramLanguage.pdf">Newted</a>)</dt>
103-
<dd>Apple's official introduction &amp; reference material for the NewtonScript language under NewtonOS 2.x. You'll probably want to start here.</dd>
103+
<dd>Apple’s official introduction &amp; reference material for the NewtonScript language under NewtonOS 2.x. You’ll probably want to start here.</dd>
104104

105105
<dt>Newton Technology Journal (PDF; mirrors: <a href="http://www.unna.org/view.php?/apple/documentation/developer/NewtonTechnologyJournal">UNNA</a>)</dt>
106106
<dd>
107-
<p>Apple's Newton-specific technical journal, published six times per year from 1995-1997. The content is 70% and 30% marketing.</p>
107+
<p>Apple’s Newton-specific technical journal, published six times per year from 1995-1997. The content is 70% and 30% marketing.</p>
108108
<ul>
109109
<li><a href="http://www.unna.org/unna/apple/documentation/developer/NewtonTechnologyJournal/NTJ_1_01.pdf">Volume I, Number 1</a> (PDF; February 1995)</li>
110110
<li><a href="http://www.unna.org/unna/apple/documentation/developer/NewtonTechnologyJournal/NTJ_1_02.pdf">Volume I, Number 2</a> (PDF; April 1995)</li>
@@ -142,7 +142,7 @@ <h2>Documentation</h2>
142142
<dt>User Interface Guidelines for Newton OS 2.1 Keyboard Enhancements (PDF; mirrors: <a href="http://www.unna.org/unna/apple/documentation/developer/UserInterfaceKeyboardOS2.1.pdf">UNNA</a>, <a href="http://www.newted.org/download/manuals/NewtonKeyboardUIGuide.pdf">Newted</a>)</dt>
143143
<dd></dd>
144144

145-
<dt><a href="http://waltersmith.us/newton/OOPSLA95.pdf">Using a Prototype-based Language for User Interface: The Newton Project's Experience</a> (PDF)</dt>
145+
<dt><a href="http://waltersmith.us/newton/OOPSLA95.pdf">Using a Prototype-based Language for User Interface: The Newton Project’s Experience</a> (PDF)</dt>
146146
<dd></dd>
147147
</dl>
148148
</body>

0 commit comments

Comments
 (0)