Merge branch 'master' into squeeze-backportssqueeze-backports

Conflicts:
	debian/changelog

1 files changed, 3 insertions, 6 deletions

diff --git a/Java/com/phidgets/StepperPhidget.java b/Java/com/phidgets/StepperPhidget.java
index aed6b1a..83fa772 100644
--- a/Java/com/phidgets/StepperPhidget.java
+++ b/Java/com/phidgets/StepperPhidget.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2012 Phidgets Inc.  All rights reserved.

+ * Copyright 2006 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

@@ -9,14 +9,11 @@ import java.util.LinkedList;
 import com.phidgets.event.*;

 /**

  * This class represents a Phidget Stepper Controller. All methods

- * to control a stepper controller and read back stepper data are implemented in this class.

+ * to to control a stepper controller and read back stepper data are implemented in this class.

  * <p>

  * The Phidget Stepper is able to control 1 or more Stepper motors. Motor Acceleration and Velocity are

- * controllable, and micro-stepping is used for bipolar motors. The type and number of motors that can be controlled

+ * controllable, and micro-stepping is used. The type and number of motors that can be controlled

  * depend on the Stepper Controller. Digital inputs are available on select Phidget Stepper Controllers.

- * See your device's User Guide for more specific API details, 

- * technical information, and revision details. The User Guide, along with other resources, can be found on 

- * the product page for your device.

  * 

  * @author Phidgets Inc.

  */