Merge branch 'master' of git.unl.edu:iim/UNL_Top_Level

.htaccess

@@ -2,6 +2,8 @@ AddType 'text/html; charset=UTF-8' shtml
 RewriteEngine On
 RewriteOptions inherit
 RewriteRule ^news/$    http://newsroom.unl.edu/         [R=301]
+RewriteRule ^lincoln$    http://www.unl.edu/lincoln/         [R=301]
+RewriteRule ^lincoln/$    http://www.unl.edu/lincoln/         [R=301]
 RewriteRule ^international/$    http://international.unl.edu/         [R=301]
 RewriteRule ^foodfuelwaterphotocontest/$    http://innovate.unl.edu/photocontest/        [R=301]
 RewriteRule ^unltoday/$   http://news.unl.edu/newsrooms/unltoday/       [R=301]

.htaccess.root

@@ -19,6 +19,7 @@ RewriteCond %{REMOTE_HOST} ^216\.128\.(20[8-9]|21[0-9]|22[0-3])\.
 RewriteRule .* - [E=UNL_CAMPUS:on]
 
 RewriteCond %{ENV:UNL_CAMPUS} on
+RewriteCond %{HTTP_HOST} ^www.unl.edu$
 RewriteCond %{REQUEST_URI} ^/$ [OR]
 RewriteCond %{REQUEST_URI} ^/index.shtml$ 
 RewriteRule (.*) http://news.unl.edu/newsrooms/unltoday/ [R=302,L]

aboutunl/index.shtml

@@ -149,7 +149,7 @@
 <p>
 UNL's research expenditures totaled more than $253 million in 2012, the most recent fiscal year for which expenditure information is available. This total included nearly $105 million in federal research expenditures. The National Science Foundation accounted for 30 percent of UNL's federal research expenditures, followed by 20 percent from the Department of Health and Human Services, including the National Institutes of Health, and 12 percent from the Department of Defense. UNL's goal is to achieve $300 million in total research expenditures by 2017, with at least half coming from federal agencies.</p>
 
-<p><strong><a href="http://research.unl.edu/" title="go to the UNL Office of Research website">OFFICE OF RESEARCH</a></strong></p>
+<p><strong><a href="http://research.unl.edu/" title="go to the UNL Office of Research website">OFFICE OF RESEARCH AND ECONOMIC DEVELOPMENT</a></strong></p>
   </div>
         <div class="grid3">
           <div class="zenbox primary">

admin/index.shtml

@@ -88,7 +88,7 @@
 					<li><a href="http://irp.unl.edu/" title="Institutional research, campus planning, examination services, UNL Fact Book">Institutional Research and Planning</a></li>
 					<li><a href="http://www.unl.edu/lentz/" title="The Lentz Center for Asian Culture">Lentz Center for Asian Culture</a></li>
 					<li><a href="http://www.liedcenter.org/" title="Performance schedule, tickets, building info">Lied Center</a></li>
-					<li><a href="http://oa.unl.edu/" title="Operations Analysis">Operations Analysis</a></li>
+					<li><a href="http://audit.unl.edu/" title="Office of Internal Audit">Office of Internal Audit</a></li>
 					<li>Reserve Officers Training Corps: <a title="Overview, scholarships, staff, alumni" href="http://www.unl.edu/afrotc/">Air Force,</a> <a href="http://www.unl.edu/armyrotc/" title="Overview, scholarships, military science, training, cadet battalion, alumni">Army,</a> <a href="http://www.unl.edu/nrotc/" title="Navy/Marines: Overview, scholarships, instructors, competitive teams, alumni">Navy</a></li>
 					<li><a href="http://www.sheldonartmuseum.org/" title="Exhibitions, features, news, collections, building info">Sheldon Museum of Art</a></li>
 					<li><a href="http://ucomm.unl.edu/" title="Director, news/video services, publications/photography, web, the Scarlet">University Communications</a></li>

index.bak.shtml

-<!--#if expr="
-        ($REMOTE_ADDR = /^129\.93/) ||
-        ($REMOTE_ADDR = /^65\.123\.(3[2-9]|[4-5][0-9]|6[0-3])\./) ||
-        ($REMOTE_ADDR = /^64\.39\.(24[0-9]|25[0-5])\./) ||
-        ($REMOTE_ADDR = /^216\.218\.(20[8-9]|21[0-9]|22[0-3])\./)
-" -->
-	<!--#if expr='$QUERY_STRING = /^mobile=no/' -->
-        	<!--#include virtual="/ucomm/unltoday/index.shtml?mobile=no" -->
-	<!--#else -->
-        	<!--#include virtual="/ucomm/unltoday/index.shtml" -->
-	<!--#endif -->
-<!--#else -->
-	<!--#if expr='$QUERY_STRING = /^mobile=no/' -->
-        	<!--#include virtual="/ucomm/splash/index.shtml?mobile=no" -->
-	<!--#else -->
-        	<!--#include virtual="/ucomm/splash/index.shtml" -->
-	<!--#endif -->
-<!--#endif -->

sharedcode/footer.html

-&copy; 2013 University of Nebraska&ndash;Lincoln | Lincoln, NE 68588 | 402-472-7211 | <a href="http://www.unl.edu/ucomm/aboutunl/" title="Click here to learn more about UNL">About UNL</a> | <a href="http://www1.unl.edu/comments/" title="Click here to direct your comments and questions">comments?</a><br />
+&copy; 2014 University of Nebraska&ndash;Lincoln | Lincoln, NE 68588 | 402-472-7211 | <a href="http://www.unl.edu/ucomm/aboutunl/" title="Click here to learn more about UNL">About UNL</a> | <a href="http://www1.unl.edu/comments/" title="Click here to direct your comments and questions">comments?</a><br />
 The University of Nebraska-Lincoln is an <a href="http://www.unl.edu/equity/">equal opportunity</a> educator and employer. For current job openings, visit <a href="http://employment.unl.edu/" title="Employment at UNL">employment.unl.edu</a><br />
 
 <p style="margin:0.5em 0 -1.4em 0">This site produced and maintained by <a href="http://ucomm.unl.edu/iim.shtml" title="Go to the University Communications Internet and Interactive Media site">University Communications Internet and Interactive Media</a></p>