Merge remote-tracking branch 'upstream/master'

Conflicts:
	it.baeyens.arduino.core/META-INF/MANIFEST.MF

Author: Andreas Stange

Eclipse update site/WebContent/archived-1.x.html renamed to Eclipse update site/WebContent/archived-1.x.php

@@ -8,7 +8,7 @@
     <meta name="author" content="Roberto Lo Giacco">
     <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
 
-    <title>Arduino Eclipse Plugin - Archive ver 1.x</title>
+    <title>Arduino Eclipse IDE - Archive ver 1.x</title>
 
     <!-- Bootstrap core CSS and theme -->
     <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
@@ -29,17 +29,18 @@
 
     <!-- Fixed navbar -->
     <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-      <ng-include src="'fragments/navbar.html'"/>
+      <?php include 'fragments/navbar.html';?>
     </nav>
 
     <div class="container" role="main">
       <div class="page-header">
         <h1>Archive version 1.x <small>in case you want to travel back in time</small></h1>
         <a name="top">&nbsp;</a>
       </div>
-      <p>One of the major problems encountered in time travel is not that of becoming your own father or mother. There is no problem in becoming your own father or mother that a broad-minded and well-adjusted family can't cope with. There is no problem with changing the course of history—the course of history does not change because it all fits together like a jigsaw. All the important changes have happened before the things they were supposed to change and it all sorts itself out in the end.<br>The hitchhikers guide to the galaxy.</p>
+      <p  class="solid"><small>One of the major problems encountered in time travel is not that of becoming your own father or mother. There is no problem in becoming your own father or mother that a broad-minded and well-adjusted family can't cope with. There is no problem with changing the course of history—the course of history does not change because it all fits together like a jigsaw. All the important changes have happened before the things they were supposed to change and it all sorts itself out in the end.<br>
+      The hitchhikers guide to the galaxy.</small></p>
       <h3>Before you start <small>don't skip this section, you will regret it!</small></h3>
-      <p>V1 is only available as plugin.</p>
+      <p>V1 Arduino eclipse IDE is only available as plugin.</p>
 
       <h3>Eclipse Update Site</h3>
       <p>Install V1 of the plugin by setting the following update site within an existing Eclipse CDT installation</p>
@@ -55,7 +56,7 @@ <h3>Troubleshooting <small>known solutions to common problems</small></h3>
     </div><!-- /container -->
 
     <div id="footer">
-      <ng-include src="'fragments/footer.html'"/>
+      <?php include 'fragments/footer.html';?>
     </div>
   </body>
 

Eclipse update site/WebContent/archived-2.2.html renamed to Eclipse update site/WebContent/archived-2.2.php

@@ -8,7 +8,7 @@
     <meta name="author" content="Roberto Lo Giacco">
     <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
 
-    <title>Arduino Eclipse Plugin - Archive ver 2.2</title>
+    <title>Arduino Eclipse IDE - Archive ver 2.2</title>
 
     <!-- Bootstrap core CSS and theme -->
     <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
@@ -29,28 +29,30 @@
 
     <!-- Fixed navbar -->
     <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-      <ng-include src="'fragments/navbar.html'"/>
+      <?php include 'fragments/navbar.html';?>
     </nav>
 
     <div class="container" role="main">
       <div class="page-header">
         <h1>Archive version 2.2 <small>in case you want to travel back in time</small></h1>
         <a name="top">&nbsp;</a>
       </div>
-      <p>...some funny description of the archive list...</p>
+            <p  class="solid"><small>One of the major problems encountered in time travel is not that of becoming your own father or mother. There is no problem in becoming your own father or mother that a broad-minded and well-adjusted family can't cope with. There is no problem with changing the course of history—the course of history does not change because it all fits together like a jigsaw. All the important changes have happened before the things they were supposed to change and it all sorts itself out in the end.<br>
+      The hitchhikers guide to the galaxy.</small></p>
       <h3>Before you start <small>don't skip this section, you will regret it!</small></h3>
       <p>...installation instructions go here...</p>
       <a href="#top" scroll-to="top">Back to top</a>
       <h3>Pick your OS architecture in the following list</h3>
-      <ng-include src="'fragments/file-list.php?ver=2.2'"></ng-include>
+      		<?php include 'fragments/file-list.php?ver=2.2';?>
+
       <a href="#top" scroll-to="top">Back to top</a>
       <h3>Troubleshooting <small>known solutions to common problems</small></h3>
       <p>...known solutions to know problems...</p>
       <a href="#top" scroll-to="top">Back to top</a>
     </div><!-- /container -->
 
     <div id="footer">
-      <ng-include src="'fragments/footer.html'"/>
+      <?php include 'fragments/footer.html';?>
     </div>
   </body>
 

Eclipse update site/WebContent/archived-2.3.shtml renamed to Eclipse update site/WebContent/archived-2.3.php

@@ -8,7 +8,7 @@
 <meta name="author" content="Roberto Lo Giacco">
 <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
 
-<title>Arduino Eclipse Plugin - Archive ver 2.3</title>
+<title>Arduino Eclipse IDE - Archive ver 2.3</title>
 
 <!-- Bootstrap core CSS and theme -->
 <link rel="stylesheet"
@@ -33,7 +33,7 @@
 
 	<!-- Fixed navbar -->
 	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-		<!--#include virtual="fragments/navbar.html" -->
+		<?php include 'fragments/navbar.html';?>
 	</nav>
 
 	<div class="container" role="main">
@@ -44,28 +44,30 @@
 			</h1>
 			<a name="top">&nbsp;</a>
 		</div>
-		<p>...some funny description of the archive list...</p>
+		      <p  class="solid"><small>One of the major problems encountered in time travel is not that of becoming your own father or mother. There is no problem in becoming your own father or mother that a broad-minded and well-adjusted family can't cope with. There is no problem with changing the course of history—the course of history does not change because it all fits together like a jigsaw. All the important changes have happened before the things they were supposed to change and it all sorts itself out in the end.<br>
+      The hitchhikers guide to the galaxy.</small></p>
 		<h3>
 			Before you start <small>don't skip this section, you will
 				regret it!</small>
 		</h3>
 		<p>Only for ArduinoIDE 1.6.2 and earlier</p>
 		<a href="#top" scroll-to="top">Back to top</a>
 		<h3>Pick your OS architecture in the following list</h3>
-		<ng-include src="'fragments/file-list.php?ver=2.3'"></ng-include>
-		<!--#include virtual="fragments/file-list.php?ver=2.3" --> 
+				<?php include 'fragments/file-list.php?ver=2.3';?>
+
 		<a href="#top" scroll-to="top">Back to top</a>
 		<h3>
 			Troubleshooting <small>known problems</small>
 		</h3>
 		<a href="https://github.com/jantje/arduino-eclipse-plugin/issues?q=label%3A%22status%3A+fixed+in+2.4%22+is%3Aclosed">Fixed issue in 2.4 and as such not fixed in this release.</a>
 		<p>...known solutions to know problems...</p>
+		<a href="https://github.com/jantje/arduino-eclipse-plugin/issues?utf8=%E2%9C%93&q=label%3A%22status%3A+fixed+in+2.4%22++label%3A%22status%3A+workaround+documented%22+">Fixed issue in 2.4 with a known workaround.</a>
 		<a href="#top" scroll-to="top">Back to top</a>
 	</div>
 	<!-- /container -->
 
     <div id="footer">
-      <!--#include virtual="fragments/footer.html" --> 
+      <?php include 'fragments/footer.html';?>
     </div>
 </body>
 

Eclipse update site/WebContent/archived-2.4.php

@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="">
+<meta name="author" content="Roberto Lo Giacco">
+<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+
+<title>Arduino Eclipse IDE - Archive ver 2.4</title>
+
+<!-- Bootstrap core CSS and theme -->
+<link rel="stylesheet"
+	href="https://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
+<link rel="stylesheet"
+	href="https://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.min.css">
+
+<!-- Custom styles  -->
+<link
+	href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,600italic,600,300|Open+Sans+Condensed:300,700|Ubuntu+Mono:400,700,400italic,700italic'
+	rel='stylesheet' type='text/css'>
+<link href="css/theme.css" rel="stylesheet">
+
+<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+<!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+</head>
+
+<body role="document" ng-app='arduinoEclipse'>
+
+	<!-- Fixed navbar -->
+	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+		<?php include 'fragments/navbar.html';?>
+	</nav>
+
+	<div class="container" role="main">
+		<div class="page-header">
+			<h1>
+				Archive version 2.4 <small>in case you want to travel back
+					in time</small>
+			</h1>
+			<a name="top">&nbsp;</a>
+		</div>
+		      <p  class="solid"><small>One of the major problems encountered in time travel is not that of becoming your own father or mother. There is no problem in becoming your own father or mother that a broad-minded and well-adjusted family can't cope with. There is no problem with changing the course of history—the course of history does not change because it all fits together like a jigsaw. All the important changes have happened before the things they were supposed to change and it all sorts itself out in the end.<br>
+      The hitchhikers guide to the galaxy.</small></p>
+		<h3>
+			Before you start <small>don't skip this section, you will
+				regret it!</small>
+		</h3>
+		<p>Only for ArduinoIDE 1.6.5 and earlier</p>
+		<a href="#top" scroll-to="top">Back to top</a>
+		<h3>Pick your OS architecture in the following list</h3>
+		<?php include 'fragments/file-list.php?ver=2.4';?>
+		<a href="#top" scroll-to="top">Back to top</a>
+		<h3>
+			Troubleshooting <small>known problems</small>
+		</h3>
+		<a href="https://github.com/jantje/arduino-eclipse-plugin/issues?q=label%3A%22status%3A+fixed+in+3.0%22+is%3Aclosed">Fixed issue in 3.0 and as such not fixed in this release.</a>
+		<p>...known solutions to know problems...</p>
+		<a href="https://github.com/jantje/arduino-eclipse-plugin/issues?utf8=%E2%9C%93&q=label%3A%22status%3A+fixed+in+3.0%22++label%3A%22status%3A+workaround+documented%22+">Fixed issue in 3.0 with a known workaround.</a>
+		<a href="#top" scroll-to="top">Back to top</a>
+	</div>
+	<!-- /container -->
+
+    <div id="footer">
+      <?php include 'fragments/footer.html';?>
+    </div>
+</body>
+
+<script
+	src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+<script
+	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
+<script
+	src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular.min.js"></script>
+<script src="js/marked.min.js"></script>
+<script src="js/angular-marked.min.js"></script>
+<script src="js/ui-bootstrap-tpls.js"></script>
+<script src="js/app.js"></script>
+</html>

Eclipse update site/WebContent/css/theme.css

@@ -56,4 +56,6 @@ body {
   bottom: 0;
   width: 100%;
   height: 80px;
-}
+}
+
+p.solid {border-style: solid;}