Merge pull request #137 from rhwood/jmri-org

Use JMRI.org in all URLs

community/clinics/NMRA2008/LayoutEditorClinic2008/LayoutEditorClinic.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="http://jmri.sourceforge.net/xml/XSLT/panelfile.xsl" type="text/xsl"?>
+<?xml-stylesheet href="http://jmri.org/xml/XSLT/panelfile.xsl" type="text/xsl"?>
 <!DOCTYPE layout-config SYSTEM "layout-config-2-1-5.dtd">
 
 <layout-config>

community/clinics/NMRA2008/LayoutEditorClinic2008/LayoutEditorClinicCTC.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="http://jmri.sourceforge.net/xml/XSLT/panelfile.xsl" type="text/xsl"?>
+<?xml-stylesheet href="http://jmri.org/xml/XSLT/panelfile.xsl" type="text/xsl"?>
 <!DOCTYPE layout-config SYSTEM "layout-config.dtd">
 
 <layout-config>

community/connections/XtrkCadReader/index.shtml

@@ -65,12 +65,12 @@ XTrkCadReader was created by Giorgio Terdina.
 It is part of the JMRI project and is available under the 
 GNU General Public License.  For additional information about 
 licensing terms, kindly refer to 
-<a href="http://jmri.sourceforge.net/Copyright.html#license">our license page</a>.
+<a href="http://jmri.org/Copyright.html#license">our license page</a>.
 
 <h3>Technical Details</h3>
 
 The code for XTrkCadReader is available in the 
-<a href="http://jmri.sourceforge.net/help/en/html/doc/Technical/getgitcode.shtml">JMRI code Repository</a>. 
+<a href="http://jmri.org/help/en/html/doc/Technical/getgitcode.shtml">JMRI code Repository</a>. 
 <P>
 If you'd like a complete copy of the code, for example to modify or improve it,
 you can check it out from its

community/examples/Gallery.shtml

@@ -110,10 +110,10 @@ via a large seven-node C/MRI installation.</p>
 </a>
 
 <h3>Durenver &amp; Silverton RR</h3>
-	<p>Egbert Broerse's <a href="http://www.ebroerse.nl/railroading.html#dcc">Durenver &amp; Silverton Railroad</a> panel was made using Panel Editor and is displayed on a compact LCD monitor by <a href="http://jmri.sourceforge.net/help/en/html/apps/PanelPro/PanelPro.shtml">JMRI PanelPro 2.4.1</a> on OSX 10.4.6, the last version supported by the MacMini hardware.The graphics on the panel match a generic (US-built) Entrance-Exit (NX) CTC machine, in use from 1950 until the mid nineties. However, most turnouts are operated with an Individual Function Switch (IFS); see the <a href="https://en.wikipedia.org/wiki/Signalling_control">Signaling Wiki</a>.</p>
+	<p>Egbert Broerse's <a href="http://www.ebroerse.nl/railroading.html#dcc">Durenver &amp; Silverton Railroad</a> panel was made using Panel Editor and is displayed on a compact LCD monitor by <a href="http://jmri.org/help/en/html/apps/PanelPro/PanelPro.shtml">JMRI PanelPro 2.4.1</a> on OSX 10.4.6, the last version supported by the MacMini hardware.The graphics on the panel match a generic (US-built) Entrance-Exit (NX) CTC machine, in use from 1950 until the mid nineties. However, most turnouts are operated with an Individual Function Switch (IFS); see the <a href="https://en.wikipedia.org/wiki/Signalling_control">Signaling Wiki</a>.</p>
 <img src="http://www.nicospilt.com/scans/nx-tableau_eindhoven.JPG" WIDTH="300" HEIGHT="200" ALT="NX-panel Eindhoven/NL"</img><br/>
 The NX CTC machine in Eindhoven, The Netherlands (photo &copy; <a href="http://www.nicospilt.com/index_seinhuizen.htm">Nico Spilt<a>)
-<p>Egbert started by drawing a compact track schematic in 4 pt white lines on a black background. Location names and block boundaries were added to help in the orientation of the dispatcher. Icons from the Small LED schematics group were added to show track occupancy and Medium LED icons display and control the current state of lighting etc. Turnouts in hidden trackage are monitored using Infrared detectors, shown on the panel, supported bij audio signals produced by JMRI. Later, signals were added on the layout as well as to the panel (below, center). All logic is controlled as Signal Mast Logic following a customized <a href="http://jmri.sourceforge.net/xml/signals/RG-1965/index.shtml">Rio Grande 1965 Rule Book</a> signal definition. Physical control panels on the layout fascia sport the same graphic style, be it black on yellow (below, right; 3 images &copy; <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.ebroerse.nl" property="cc:attributionName" rel="cc:attributionURL">EJB</a> as <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA</a>)).</p>
+<p>Egbert started by drawing a compact track schematic in 4 pt white lines on a black background. Location names and block boundaries were added to help in the orientation of the dispatcher. Icons from the Small LED schematics group were added to show track occupancy and Medium LED icons display and control the current state of lighting etc. Turnouts in hidden trackage are monitored using Infrared detectors, shown on the panel, supported bij audio signals produced by JMRI. Later, signals were added on the layout as well as to the panel (below, center). All logic is controlled as Signal Mast Logic following a customized <a href="http://jmri.org/xml/signals/RG-1965/index.shtml">Rio Grande 1965 Rule Book</a> signal definition. Physical control panels on the layout fascia sport the same graphic style, be it black on yellow (below, right; 3 images &copy; <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.ebroerse.nl" property="cc:attributionName" rel="cc:attributionURL">EJB</a> as <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA</a>)).</p>
 <img src="DSRR_Panel_Background.png" WIDTH="349" HEIGHT="162" ALT="DSRR background"</img>&nbsp;
 <img src="DSRR_Panel_Screen.png" WIDTH="311" HEIGHT="163" ALT="DSRR screenshot w/icons"</img>&nbsp;
 <img src="IMG_3536_D_SNGRR_panel.jpg" WIDTH="371" HEIGHT="163" ALT="DSRR physical panel"</img>

community/examples/Modules.shtml

@@ -42,7 +42,7 @@
 
 <p>
 JMRI 
-<a href="http://jmri.sf.net/help/en/html/apps/PanelPro/PanelPro.shtml">PanelPro</a>
+<a href="http://jmri.org/help/en/html/apps/PanelPro/PanelPro.shtml">PanelPro</a>
 can be used to operate modular railroads. 
 The long runs make it very convenient to have a central dispatcher
 controlling the layout.
@@ -56,7 +56,7 @@ combine them on the computer screen.
 
 <p>
 You can also define JMRI
-<a href="http://jmri.sf.net/help/en/html/tools/Routes.shtml">Routes</a>
+<a href="http://jmri.org/help/en/html/tools/Routes.shtml">Routes</a>
 to rapidly set turnouts as needed.
 
 <p>

community/examples/SPShasta.shtml

@@ -97,7 +97,7 @@ the CTC machine is installed, the turnouts will be controlled from
 both the fascia and the CTC machine.  To do this, the toggle switch
 is connected to a C/MRI input, and the SMC is connected to a C/MRI
 output.  A JMRI
-<a hret="http://jmri.sourceforge.net/help/en/html/tools/Routes.shtml">Route</a>
+<a hret="http://jmri.org/help/en/html/tools/Routes.shtml">Route</a>
 		is then used to operate the turnout when the slide switch changes.</p>
 <p>
 This works very well when the program is running, but does an 
@@ -122,7 +122,7 @@ power, they won't be able to move the Tortoises until they are
 	under positive control.</p>
 
 <p>PanelPro legacy 
-"<a href="http://jmri.sourceforge.net/help/en/package/jmri/jmrit/blockboss/BlockBossFrame.shtml">Simple Signaling Logic</a>"
+"<a href="http://jmri.org/help/en/package/jmri/jmrit/blockboss/BlockBossFrame.shtml">Simple Signaling Logic</a>"
 is used to operate each signal.  Note that this is entirely
 "behind the scenes"; there's no control panel on the computer, 
 and the dispatcher has no way to set the signals.  Instead, they
@@ -188,7 +188,7 @@ throat turnouts and orients the power for entrance or exit in the loops.
 It also reads the track occupancy status and lights indicators on
 the panels to show which tracks are occupied.  All of this is
 done with a total of about 48 JMRI
-<a HREF="http://jmri.sourceforge.net/help/en/html/tools/Routes.shtml">Routes</a>.
+<a HREF="http://jmri.org/help/en/html/tools/Routes.shtml">Routes</a>.
 
 <p>
 The next step, which we probably won't work on until

info.txt

@@ -1,7 +1,7 @@
 
 # Contact info submission
 
-url: jmri.sourceforge.net/
+url: jmri.org/
 site_owner: JMRI
 address1: 
 address2: 

install/MacOSClassic.html

@@ -105,7 +105,7 @@ <h1>
 
 	<p>Download a version of JMRI.  If you're on this install page,
 	then that version should be
-	<a href="http://jmri.sourceforge.net/releasenotes/jmri1.6.1.html">JMRI release 1.6.1</a> or earlier.
+	<a href="http://jmri.org/releasenotes/jmri1.6.1.html">JMRI release 1.6.1</a> or earlier.
 	As the version numbers change with every release, 
 	<a href="../download/index.shtml">this link</a>
 	takes you to the general JMRI download page, where you can

install/MacOSLocations.shtml

@@ -73,9 +73,9 @@ Program directory: /Applications/JMRI/
 </pre>
 
 For more information follow these links:
-<a href="http://jmri.sourceforge.net/apps/DecoderPro/Files.html">Files</a>,
-<a href="http://jmri.sourceforge.net/apps/DecoderPro/RosterFile.html">Roster</a>,
-<a href="http://jmri.sourceforge.net/apps/DecoderPro/NetworkFiles.html">Network files</a>.
+<a href="http://jmri.org/apps/DecoderPro/Files.html">Files</a>,
+<a href="http://jmri.org/apps/DecoderPro/RosterFile.html">Roster</a>,
+<a href="http://jmri.org/apps/DecoderPro/NetworkFiles.html">Network files</a>.
 
 <!--#include virtual="/Footer" -->
 	  </div> <!-- closes #mainContent-->

install/MacOSX.shtml

@@ -51,7 +51,7 @@
         Version 2.12 requires Java 1.5 or later.
         </p>
 
-        <p>Mac OS X version 10.8.3 "Mountain Lion"/10.9 "Maverick/10.10 "Yosemite"/10.11 "El Capitan" can run the <a href="http://jmri.sourceforge.net/download/index.shtml">current JMRI test and production releases</a> with Java 8.
+        <p>Mac OS X version 10.8.3 "Mountain Lion"/10.9 "Maverick/10.10 "Yosemite"/10.11 "El Capitan" can run the <a href="http://jmri.org/download/index.shtml">current JMRI test and production releases</a> with Java 8.
         If your computer runs one of these OS versions, just go to the next step.<br>
         Mac OS X version 10.7.3 "Lion" can run <a href="http://jmri.org/releasenotes/jmri3.10.1.shtml">JMRI 3.10.1</a> using Java 1.7.<br>
         Mac OS X version 10.5.8 "Leopard" can run <a href="http://jmri.org/releasenotes/jmri2.14.1.shtml">JMRI 2.14.1</a> using Java 1.6.<br>

install/MacOSXRetro.html

@@ -78,7 +78,7 @@ <h2>Installing JMRI release 2.8 and below on a Mac OS X computer</h2>
 	     href="http://support.apple.com/kb/HT1514?viewlocale=en_US">able
 	    to run Mac OS X 10.4</a>. If you're still running Mac OS X
 	    10.3 "Panther", you can download and use <a
-	     href="http://jmri.sourceforge.net/releasenotes/jmri2.2.shtml">JMRI
+	     href="http://jmri.org/releasenotes/jmri2.2.shtml">JMRI
 	    version 2.2</a>.</p>
 
 	    <p>You should have enough memory for your computer to run
@@ -190,7 +190,7 @@ <h2>Installing JMRI release 2.8 and below on a Mac OS X computer</h2>
 
 	<p>Download a version of JMRI.  If you're on this install page,
 	then that version should be
-	<a href="http://jmri.sourceforge.net/releasenotes/jmri2.8.shtml">JMRI release 2.8</a> or earlier.
+	<a href="http://jmri.org/releasenotes/jmri2.8.shtml">JMRI release 2.8</a> or earlier.
 	As the version numbers change with every release, 
 	<a href="../download/index.shtml">this link</a>
 	takes you to the general JMRI download page, where you can

install/Mint.shtml

@@ -33,7 +33,7 @@ Installing JMRI on a Linux Mint
 1) If you have a recent version of Linux Mint installed on your machine, it will already include the Java libraries.
    If not then open the Software Manager and install "openjdk-7-jre", if it is already installed it will show as "installed"
 
-2) Download JMRI from http://jmri.sourceforge.net/download/index.shtml and save the file.
+2) Download JMRI from http://jmri.org/download/index.shtml and save the file.
 
 3) Double click the downloaded tarball, that will open the archive manager program. Extract the JMRI tarball to your home directory, or some other directory. The extract program will create a JMRI folder in this location.
 

install/OLPC_XO.shtml

@@ -257,7 +257,7 @@ cp .xsession-example .xsession-xfce</pre>
 
 	<A NAME="Install_JMRI"><h2>Install JMRI</h2></a>
 		<p>Now determine what version of JMRI you want to install and 
-		<a href="http://jmri.sourceforge.net/download/index.shtml#prod-rel">download</a> 
+		<a href="http://jmri.org/download/index.shtml#prod-rel">download</a> 
 		the Linux version of 
 		it. Generally the latest release version is a good choice unless you have some specific 
 		reason for wanting to try something else.</p>

install/Raspbian.shtml

@@ -82,7 +82,7 @@ JMRI installation consists of two stages: install Java and install JMRI.
 	<p>[please report exact instructions to update Java]</p>
 
   <li>Get the JMRI software...</li>
-	<p><a href="http://jmri.sourceforge.net/download/index.shtml">Download JMRI</a> (choose the Linux edition).</p>
+	<p><a href="http://jmri.org/download/index.shtml">Download JMRI</a> (choose the Linux edition).</p>
 
   <li>...and install it.</li>
 	<p>
@@ -169,7 +169,7 @@ and then switch the power off once the shutdown is complete. <a href="#david">[4
 	<dd>Your login account should have root permissions to access the GPIO Pi interface (the 40 pins on a Pi board).<br>
 	More details on our <a href="../help/en/html/hardware/pi/index.shtml">Raspberry Pi via GPIO</a> hardware Help page.</dd>
   </dl>
-  <p>The JMRI <a href="http://jmri.sourceforge.net/help/en/html/hardware/index.shtml">Hardware help page</a> lists the various types of layout equipment that JMRI can connect to, and gives links to instruction pages. Go there next to complete your setup.</p>
+  <p>The JMRI <a href="http://jmri.org/help/en/html/hardware/index.shtml">Hardware help page</a> lists the various types of layout equipment that JMRI can connect to, and gives links to instruction pages. Go there next to complete your setup.</p>
 
 </a><h3>Errors</h3>
 <p>If you have any problems, get back to the <a href="https://groups.yahoo.com/neo/groups/jmriusers/info">JMRI users</a> Yahoo group.</p>

install/Ubuntu.shtml

@@ -67,7 +67,7 @@ Details</a></p>
 <p style="margin-left: 1.34cm;">Follow the Path
 "Download" and read up on the Help page which gives advice on how to download the ISO image and
 then create a bootable CD to install Ubuntu.</p>
-JMRI Help has details for <a href="http://jmri.sourceforge.net/install/decTop.shtml">installing Xubuntu</a> available.
+JMRI Help has details for <a href="http://jmri.org/install/decTop.shtml">installing Xubuntu</a> available.
 
 <a id="notes"/>
 <h2>Notes:</h2>
@@ -154,7 +154,7 @@ The above description is brief, but the script itself can be opened in a text ed
 
 <h3>3.3 Get JMRI</h3>
 <p>JMRI is downloaded in the normal manner.</p>
-<p><a href="http://jmri.sourceforge.net/download/index.shtml#prod-rel">Download JMRI</a> </p>
+<p><a href="http://jmri.org/download/index.shtml#prod-rel">Download JMRI</a> </p>
 
 <p>Double click on the .tgz file to open the File Roller, then click extract. </p>
 
@@ -180,13 +180,13 @@ upgrading Ubuntu may create problems for JMRI releases prior to 2.9.2 as the upg
 port by adding "-Djavax.comm.rxtx.SerialPorts=/dev/ttyUSB0" as shown
 below
 </p><p style="margin-left: 40px;">java -noverify -Djavax.comm.rxtx.SerialPorts=/dev/ttyUSB0 -Djava.security.policy</p>
-<p>Please see the <a href="http://jmri.sourceforge.net/install/FAQLinux.html">FAQ</a> for more details.</p>
+<p>Please see the <a href="http://jmri.org/install/FAQLinux.html">FAQ</a> for more details.</p>
 
 <a id="startup"><h2>4. Starting JMRI</h2></a>
 <p>To start open a terminal and enter ./DecoderPro or double click on the icon.</p>
 <p>After a clean install, the JMRI Preferences pane will open. Select your Connection and USB port, click "Save"  and restart.</p>
 More on this on the <a href="../help/en/html/setup/index.shtml">JMRI Setup help page</a>.
-  <p>The JMRI <a href="http://jmri.sourceforge.net/help/en/html/hardware/index.shtml">Hardware help page</a> lists the various types of layout equipment that JMRI can connect to, and gives links to instruction pages. Go there next to complete your setup.</p>
+  <p>The JMRI <a href="http://jmri.org/help/en/html/hardware/index.shtml">Hardware help page</a> lists the various types of layout equipment that JMRI can connect to, and gives links to instruction pages. Go there next to complete your setup.</p>
 
 <h3>4.1 Errors</h3>
 <p>If you have any problems get back to the group.</p>

install/Windows.html

@@ -212,7 +212,7 @@ <h3>JMRI System Requirements</h3>
     <li>Configure the program to connect to your layout
     <p>
     The JMRI
-    <a href="http://jmri.sourceforge.net/help/en/html/hardware/index.shtml">hardware page</a>
+    <a href="http://jmri.org/help/en/html/hardware/index.shtml">hardware page</a>
     lists the various types of layout equipment that
     JMRI can connect to, and gives links to 
     instruction pages. Go there next to complete your

install/WindowsNew.shtml

@@ -58,7 +58,7 @@ for earlier versions (2012 and before), <a href="Windows.html">refer to the old
 	  Version 3.10.1 requires Java 1.6 or later.<br>
 	  Version 2.14.1 requires Java 1.5 (or 1.6 if you wish for drag &amp; drop).</p>
 
-		<p>Windows 7-10 and Vista SP2 can run the <a href="http://jmri.sourceforge.net/download/index.shtml">current JMRI test and production releases</a> with Java 8.
+		<p>Windows 7-10 and Vista SP2 can run the <a href="http://jmri.org/download/index.shtml">current JMRI test and production releases</a> with Java 8.
 		If your computer runs one of these Windows versions, just go to the next step.<br>
 		Computers running Vista SP1 can run <a href="http://jmri.org/releasenotes/jmri3.10.1.shtml">JMRI 3.10.1</a> using Java 1.7.<br>
 		Windows2000 SP3 and XP systems can run <a href="http://jmri.org/releasenotes/jmri2.14.1.shtml">JMRI 2.14.1</a> using Java 1.6.<br>
@@ -149,7 +149,7 @@ for earlier versions (2012 and before), <a href="Windows.html">refer to the old
     <br>(This shows the Start menu following a 'Typical' install - a 'Full' install will place additional icons in this menu)
 
   <li>Configure the program to connect to your layout. The Connections Preferences will open automatically on first run, or you can open the Preferences pane from the Edit menu. More on this on the <a href="../help/en/html/setup/index.shtml">JMRI Setup help page</a>.
-    <p>The JMRI <a href="http://jmri.sourceforge.net/help/en/html/hardware/index.shtml">Hardware help page</a> lists the various types of layout equipment that JMRI can connect to, and gives links to instruction pages</p>
+    <p>The JMRI <a href="http://jmri.org/help/en/html/hardware/index.shtml">Hardware help page</a> lists the various types of layout equipment that JMRI can connect to, and gives links to instruction pages</p>
   <li>When you start DecoderPro 3.8 or later on Windows for the first time, the <strong>JMRI StartUp Wizard</strong> displays a series of screens to guide you through the setup proces:</p>
     <ol type="i">
     <li>Welcome Screen:<br>

manual/3-0_DecoderPro/Dcode_Format.shtml

@@ -34,7 +34,7 @@
 <p>The easiest way to create a new decoder definition is to edit  one that already exists that has parameters similar to  your new decoder.&nbsp;  Hundreds of decoder definitions are available in JMRI, so you should be able to find one that is similar as a starting point.&nbsp; Don&rsquo;t feel bad about standing on someone  else&rsquo;s shoulders, that&rsquo;s the spirit of JMRI and open source software in  general.&nbsp; Although you can call this new  file anything you like, it will work best if you use the same convention as the  provided files. That is &quot;<strong>manufacturer  name</strong>&quot;_&quot;<strong>decoder family</strong>&quot;.xml, for example: <strong>Digitrax_1x2.xml</strong>  and <strong>Atlas_DualMode.xml</strong>.&nbsp; </p>
 <p>Now that you have located a Decoder Definition file as a starting point  open the file with an XML editor 
 (editors recommended by jmri are discussed on a  
-<a href="http://jmri.sourceforge.net/help/en/html/doc/Technical/XmlDtdUsage.shtml">separate page)</a>  or your favorite text editor.
+<a href="http://jmri.org/help/en/html/doc/Technical/XmlDtdUsage.shtml">separate page)</a>  or your favorite text editor.
 <strong>DO NOT</strong> try an advanced word processor like  Word.
 Use a basic text file editor like  Notepad, or an XML editor, XML Marker is a good one and it&rsquo;s free.</p>
 <p>The beginning XML lines deal with the Header:</p>