--- a/jdk/src/share/classes/java/nio/channels/Channels.java	Thu Aug 20 08:48:29 2009 +0100
+++ b/jdk/src/share/classes/java/nio/channels/Channels.java	Sat Aug 22 17:40:18 2009 +0100
@@ -182,7 +182,6 @@
     }
 
     /**
-     * {@note new}
      * Constructs a stream that reads bytes from the given channel.
      *
      * <p> The stream will not be buffered, and it will not support the {@link
@@ -258,7 +257,6 @@
     }
 
     /**
-     * {@note new}
      * Constructs a stream that writes bytes to the given channel.
      *
      * <p> The stream will not be buffered. The stream will be safe for access

--- a/jdk/src/share/classes/java/nio/channels/FileChannel.java	Thu Aug 20 08:48:29 2009 +0100
+++ b/jdk/src/share/classes/java/nio/channels/FileChannel.java	Sat Aug 22 17:40:18 2009 +0100
@@ -39,8 +39,7 @@
 /**
  * A channel for reading, writing, mapping, and manipulating a file.
  *
- * <p> {@note revised}
- * A file channel is a {@link SeekableByteChannel} that is connected to
+ * <p> A file channel is a {@link SeekableByteChannel} that is connected to
  * a file. It has a current <i>position</i> within its file which can
  * be both {@link #position() <i>queried</i>} and {@link #position(long)
  * <i>modified</i>}.  The file itself contains a variable-length sequence
@@ -151,7 +150,6 @@
  * @author Mike McCloskey
  * @author JSR-51 Expert Group
  * @since 1.4
- * @updated 1.7
  */
 
 public abstract class FileChannel
@@ -164,7 +162,6 @@
     protected FileChannel() { }
 
     /**
-     * {@note new}
      * Opens or creates a file, returning a file channel to access the file.
      *
      * <p> The {@code options} parameter determines how the file is opened.
@@ -293,7 +290,6 @@
     private static final FileAttribute<?>[] NO_ATTRIBUTES = new FileAttribute[0];
 
     /**
-     * {@note new}
      * Opens or creates a file, returning a file channel to access the file.
      *
      * <p> An invocation of this method behaves in exactly the same way as the

--- a/jdk/src/share/classes/java/nio/channels/FileLock.java	Thu Aug 20 08:48:29 2009 +0100
+++ b/jdk/src/share/classes/java/nio/channels/FileLock.java	Sat Aug 22 17:40:18 2009 +0100
@@ -114,7 +114,6 @@
  * @author Mark Reinhold
  * @author JSR-51 Expert Group
  * @since 1.4
- * @updated 1.7
  */
 
 public abstract class FileLock {
@@ -161,7 +160,7 @@
     }
 
     /**
-     * {@note new} Initializes a new instance of this class.
+     * Initializes a new instance of this class.
      *
      * @param  channel
      *         The channel upon whose file this lock is held
@@ -199,7 +198,6 @@
     }
 
     /**
-     * {@note revised}
      * Returns the file channel upon whose file this lock was acquired.
      *
      * <p> This method has been superseded by the {@link #acquiredBy acquiredBy}
@@ -213,7 +211,6 @@
     }
 
     /**
-     * {@note new}
      * Returns the channel upon whose file this lock was acquired.
      *
      * @return  The channel upon whose file this lock was acquired.

--- a/jdk/src/share/classes/java/nio/channels/package-info.java	Thu Aug 20 08:48:29 2009 +0100
+++ b/jdk/src/share/classes/java/nio/channels/package-info.java	Sat Aug 22 17:40:18 2009 +0100
@@ -285,7 +285,6 @@
  * java.lang.NullPointerException NullPointerException} to be thrown.
  *
  * @since 1.4
- * @updated 1.7
  * @author Mark Reinhold
  * @author JSR-51 Expert Group
  */

--- a/jdk/src/share/classes/java/nio/file/FileRef.java	Thu Aug 20 08:48:29 2009 +0100
+++ b/jdk/src/share/classes/java/nio/file/FileRef.java	Sat Aug 22 17:40:18 2009 +0100
@@ -39,8 +39,6 @@
  * metadata or file attributes.
  *
  * @since 1.7
- * @see java.io.Inputs
- * @see java.io.Outputs
  * @see java.nio.file.attribute.Attributes
  * @see java.io.File#toPath
  */

--- a/jdk/src/share/classes/java/util/Scanner.java	Thu Aug 20 08:48:29 2009 +0100
+++ b/jdk/src/share/classes/java/util/Scanner.java	Sat Aug 22 17:40:18 2009 +0100
@@ -674,7 +674,6 @@
     }
 
     /**
-     * {@note new}
      * Constructs a new <code>Scanner</code> that produces values scanned
      * from the specified file. Bytes from the file are converted into
      * characters using the underlying platform's
@@ -694,7 +693,6 @@
     }
 
     /**
-     * {@note new}
      * Constructs a new <code>Scanner</code> that produces values scanned
      * from the specified file. Bytes from the file are converted into
      * characters using the specified charset.