diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Abs.java b/src/main/java/org/apache/commons/math3/analysis/function/Abs.java
index 758c30cc6..5071e38cb 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Abs.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Abs.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Absolute value function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Abs implements UnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Acos.java b/src/main/java/org/apache/commons/math3/analysis/function/Acos.java
index caf8606c2..fc38c38ef 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Acos.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Acos.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Arc-cosine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Acos implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Acosh.java b/src/main/java/org/apache/commons/math3/analysis/function/Acosh.java
index 9a891bbcc..cd1047afe 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Acosh.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Acosh.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Hyperbolic arc-cosine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Acosh implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Add.java b/src/main/java/org/apache/commons/math3/analysis/function/Add.java
index 09fa77792..8d99fa382 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Add.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Add.java
@@ -22,8 +22,8 @@ import org.apache.commons.math3.analysis.BivariateFunction;
 /**
  * Add the two operands.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Add implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Asin.java b/src/main/java/org/apache/commons/math3/analysis/function/Asin.java
index c3db51407..ffcc3a0e0 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Asin.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Asin.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Arc-sine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Asin implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Asinh.java b/src/main/java/org/apache/commons/math3/analysis/function/Asinh.java
index df68956c8..4d5ef8a30 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Asinh.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Asinh.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Hyperbolic arc-sine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Asinh implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Atan.java b/src/main/java/org/apache/commons/math3/analysis/function/Atan.java
index edae9f4b2..67fbd3dca 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Atan.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Atan.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Arc-tangent function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Atan implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Atan2.java b/src/main/java/org/apache/commons/math3/analysis/function/Atan2.java
index 0f555f35b..74074f86f 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Atan2.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Atan2.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Arc-tangent function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Atan2 implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Atanh.java b/src/main/java/org/apache/commons/math3/analysis/function/Atanh.java
index 7a794250c..85355cf20 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Atanh.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Atanh.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Hyperbolic arc-tangent function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Atanh implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Cbrt.java b/src/main/java/org/apache/commons/math3/analysis/function/Cbrt.java
index fb21ade22..607ebfbc6 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Cbrt.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Cbrt.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Cube root function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Cbrt implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Ceil.java b/src/main/java/org/apache/commons/math3/analysis/function/Ceil.java
index ef836d0ab..b574cb0eb 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Ceil.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Ceil.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * {@code ceil} function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Ceil implements UnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Constant.java b/src/main/java/org/apache/commons/math3/analysis/function/Constant.java
index 1c24f1ffe..c95827394 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Constant.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Constant.java
@@ -22,8 +22,8 @@ import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction;
 /**
  * Constant function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Constant implements DifferentiableUnivariateFunction {
     /** Constant. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Cos.java b/src/main/java/org/apache/commons/math3/analysis/function/Cos.java
index 5c17debb9..91020fc77 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Cos.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Cos.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Cosine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Cos implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Cosh.java b/src/main/java/org/apache/commons/math3/analysis/function/Cosh.java
index bd3a82a33..fa2bcbb70 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Cosh.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Cosh.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Hyperbolic cosine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Cosh implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Divide.java b/src/main/java/org/apache/commons/math3/analysis/function/Divide.java
index 107fa5b9f..61abac679 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Divide.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Divide.java
@@ -22,8 +22,8 @@ import org.apache.commons.math3.analysis.BivariateFunction;
 /**
  * Divide the first operand by the second.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Divide implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Exp.java b/src/main/java/org/apache/commons/math3/analysis/function/Exp.java
index 2bbd5ee11..9470d38b9 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Exp.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Exp.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Exponential function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Exp implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Expm1.java b/src/main/java/org/apache/commons/math3/analysis/function/Expm1.java
index ea48d7628..726fdde5c 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Expm1.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Expm1.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * <code>e<sup>x</sup>-1</code> function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Expm1 implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Floor.java b/src/main/java/org/apache/commons/math3/analysis/function/Floor.java
index 8e9a95496..20614f606 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Floor.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Floor.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * {@code floor} function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Floor implements UnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Gaussian.java b/src/main/java/org/apache/commons/math3/analysis/function/Gaussian.java
index 88f18ed2f..92935101a 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Gaussian.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Gaussian.java
@@ -29,8 +29,8 @@ import org.apache.commons.math3.util.FastMath;
  * <a href="http://en.wikipedia.org/wiki/Gaussian_function">
  *  Gaussian</a> function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Gaussian implements DifferentiableUnivariateFunction {
     /** Mean. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/HarmonicOscillator.java b/src/main/java/org/apache/commons/math3/analysis/function/HarmonicOscillator.java
index 3a264d558..44e7c7bfe 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/HarmonicOscillator.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/HarmonicOscillator.java
@@ -28,8 +28,8 @@ import org.apache.commons.math3.util.FastMath;
  * <a href="http://en.wikipedia.org/wiki/Harmonic_oscillator">
  *  simple harmonic oscillator</a> function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class HarmonicOscillator implements DifferentiableUnivariateFunction {
     /** Amplitude. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Identity.java b/src/main/java/org/apache/commons/math3/analysis/function/Identity.java
index cd51bbaf1..a4b0bbd7d 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Identity.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Identity.java
@@ -22,8 +22,8 @@ import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction;
 /**
  * Identity function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Identity implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Inverse.java b/src/main/java/org/apache/commons/math3/analysis/function/Inverse.java
index 169799f3a..6b9a194f0 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Inverse.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Inverse.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction;
 /**
  * Inverse function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Inverse implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Log.java b/src/main/java/org/apache/commons/math3/analysis/function/Log.java
index 26d05db93..1886f48e3 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Log.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Log.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Natural logarithm function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Log implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Log10.java b/src/main/java/org/apache/commons/math3/analysis/function/Log10.java
index 4cb1230f5..1ff9f8bfa 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Log10.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Log10.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Base 10 logarithm function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Log10 implements DifferentiableUnivariateFunction {
     /** ln(10) = {@value}.*/
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Log1p.java b/src/main/java/org/apache/commons/math3/analysis/function/Log1p.java
index 298b0bfeb..2a4236230 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Log1p.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Log1p.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * <code>log(1 + p)</code> function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Log1p implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java b/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java
index f7981b7d4..db3c0fba3 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java
@@ -29,8 +29,8 @@ import org.apache.commons.math3.util.FastMath;
  * <a href="http://en.wikipedia.org/wiki/Generalised_logistic_function">
  *  Generalised logistic</a> function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Logistic implements DifferentiableUnivariateFunction {
     /** Lower asymptote. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Logit.java b/src/main/java/org/apache/commons/math3/analysis/function/Logit.java
index 1388c119f..fbbb12ae9 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Logit.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Logit.java
@@ -30,8 +30,8 @@ import org.apache.commons.math3.util.FastMath;
  *  Logit</a> function.
  * It is the inverse of the {@link Sigmoid sigmoid} function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Logit implements DifferentiableUnivariateFunction {
     /** Lower bound. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Max.java b/src/main/java/org/apache/commons/math3/analysis/function/Max.java
index 3ec68ffc7..dcdf3c95f 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Max.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Max.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Maximum function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Max implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Min.java b/src/main/java/org/apache/commons/math3/analysis/function/Min.java
index 3f691df97..4a1321420 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Min.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Min.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Minimum function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Min implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Minus.java b/src/main/java/org/apache/commons/math3/analysis/function/Minus.java
index 12346b9eb..ccbd08cda 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Minus.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Minus.java
@@ -22,8 +22,8 @@ import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction;
 /**
  * Minus function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Minus implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Multiply.java b/src/main/java/org/apache/commons/math3/analysis/function/Multiply.java
index 291154508..8c924067d 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Multiply.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Multiply.java
@@ -22,8 +22,8 @@ import org.apache.commons.math3.analysis.BivariateFunction;
 /**
  * Multiply the two operands.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Multiply implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Pow.java b/src/main/java/org/apache/commons/math3/analysis/function/Pow.java
index 7a1428b30..ca505b357 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Pow.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Pow.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Power function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Pow implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Power.java b/src/main/java/org/apache/commons/math3/analysis/function/Power.java
index 907cb7b7d..cbb79d8ac 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Power.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Power.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Power function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Power implements DifferentiableUnivariateFunction {
     /** Power. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Rint.java b/src/main/java/org/apache/commons/math3/analysis/function/Rint.java
index 628152707..9bdce2117 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Rint.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Rint.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * {@code rint} function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Rint implements UnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java b/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java
index 3695697fe..a200db32f 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java
@@ -31,8 +31,8 @@ import org.apache.commons.math3.util.FastMath;
  * A more flexible version, the generalised logistic, is implemented
  * by the {@link Logistic} class.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Sigmoid implements DifferentiableUnivariateFunction {
     /** Lower asymptote. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Signum.java b/src/main/java/org/apache/commons/math3/analysis/function/Signum.java
index f39331545..036c904bb 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Signum.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Signum.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * {@code signum} function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Signum implements UnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Sin.java b/src/main/java/org/apache/commons/math3/analysis/function/Sin.java
index 8096e846a..745bb183a 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Sin.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Sin.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Sine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Sin implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Sinc.java b/src/main/java/org/apache/commons/math3/analysis/function/Sinc.java
index 10634edfb..6a50f6a73 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Sinc.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Sinc.java
@@ -29,8 +29,8 @@ import org.apache.commons.math3.util.FastMath;
  *             sin(x) / x   otherwise.
  * </code></pre>
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Sinc implements DifferentiableUnivariateFunction {
     /**
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Sinh.java b/src/main/java/org/apache/commons/math3/analysis/function/Sinh.java
index 93445f91f..a2ef713e6 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Sinh.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Sinh.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Hyperbolic sine function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Sinh implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Sqrt.java b/src/main/java/org/apache/commons/math3/analysis/function/Sqrt.java
index e71980a5d..5bfe36d6f 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Sqrt.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Sqrt.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Square-root function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Sqrt implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/StepFunction.java b/src/main/java/org/apache/commons/math3/analysis/function/StepFunction.java
index f06682f46..4de0dc663 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/StepFunction.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/StepFunction.java
@@ -28,8 +28,8 @@ import org.apache.commons.math3.util.MathArrays;
  * <a href="http://en.wikipedia.org/wiki/Step_function">
  *  Step function</a>.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class StepFunction implements UnivariateFunction {
     /** Abscissae. */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Subtract.java b/src/main/java/org/apache/commons/math3/analysis/function/Subtract.java
index 01ee5211a..d270b2598 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Subtract.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Subtract.java
@@ -22,8 +22,8 @@ import org.apache.commons.math3.analysis.BivariateFunction;
 /**
  * Subtract the second operand from the first.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Subtract implements BivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Tan.java b/src/main/java/org/apache/commons/math3/analysis/function/Tan.java
index 34b90a017..4f6b092a2 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Tan.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Tan.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Tangent function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Tan implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Tanh.java b/src/main/java/org/apache/commons/math3/analysis/function/Tanh.java
index c9662e58f..4da619ef5 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Tanh.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Tanh.java
@@ -24,8 +24,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * Hyperbolic tangent function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Tanh implements DifferentiableUnivariateFunction {
     /** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math3/analysis/function/Ulp.java b/src/main/java/org/apache/commons/math3/analysis/function/Ulp.java
index 8f1399596..c083be277 100644
--- a/src/main/java/org/apache/commons/math3/analysis/function/Ulp.java
+++ b/src/main/java/org/apache/commons/math3/analysis/function/Ulp.java
@@ -23,8 +23,8 @@ import org.apache.commons.math3.util.FastMath;
 /**
  * {@code ulp} function.
  *
- * @version $Id$
  * @since 3.0
+ * @version $Id$
  */
 public class Ulp implements UnivariateFunction {
     /** {@inheritDoc} */