--- a/jdk/src/share/classes/java/security/PermissionCollection.java	Fri Jun 28 16:39:15 2013 +0100
+++ b/jdk/src/share/classes/java/security/PermissionCollection.java	Fri Jun 28 10:48:02 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,29 +32,29 @@
  *
  * <p>With a PermissionCollection, you can:
  * <UL>
- * <LI> add a permission to the collection using the <code>add</code> method.
+ * <LI> add a permission to the collection using the {@code add} method.
  * <LI> check to see if a particular permission is implied in the
- *      collection, using the <code>implies</code> method.
- * <LI> enumerate all the permissions, using the <code>elements</code> method.
+ *      collection, using the {@code implies} method.
+ * <LI> enumerate all the permissions, using the {@code elements} method.
  * </UL>
  * <P>
  *
  * <p>When it is desirable to group together a number of Permission objects
- * of the same type, the <code>newPermissionCollection</code> method on that
+ * of the same type, the {@code newPermissionCollection} method on that
  * particular type of Permission object should first be called. The default
  * behavior (from the Permission class) is to simply return null.
  * Subclasses of class Permission override the method if they need to store
  * their permissions in a particular PermissionCollection object in order
  * to provide the correct semantics when the
- * <code>PermissionCollection.implies</code> method is called.
+ * {@code PermissionCollection.implies} method is called.
  * If a non-null value is returned, that PermissionCollection must be used.
- * If null is returned, then the caller of <code>newPermissionCollection</code>
+ * If null is returned, then the caller of {@code newPermissionCollection}
  * is free to store permissions of the
  * given type in any PermissionCollection they choose
  * (one that uses a Hashtable, one that uses a Vector, etc).
  *
  * <p>The PermissionCollection returned by the
- * <code>Permission.newPermissionCollection</code>
+ * {@code Permission.newPermissionCollection}
  * method is a homogeneous collection, which stores only Permission objects
  * for a given Permission type.  A PermissionCollection may also be
  * heterogeneous.  For example, Permissions is a PermissionCollection
@@ -62,16 +62,16 @@
  * That is, its members are each a homogeneous PermissionCollection.
  * For example, a Permissions object might have a FilePermissionCollection
  * for all the FilePermission objects, a SocketPermissionCollection for all the
- * SocketPermission objects, and so on. Its <code>add</code> method adds a
+ * SocketPermission objects, and so on. Its {@code add} method adds a
  * permission to the appropriate collection.
  *
  * <p>Whenever a permission is added to a heterogeneous PermissionCollection
  * such as Permissions, and the PermissionCollection doesn't yet contain a
  * PermissionCollection of the specified permission's type, the
  * PermissionCollection should call
- * the <code>newPermissionCollection</code> method on the permission's class
+ * the {@code newPermissionCollection} method on the permission's class
  * to see if it requires a special PermissionCollection. If
- * <code>newPermissionCollection</code>
+ * {@code newPermissionCollection}
  * returns null, the PermissionCollection
  * is free to store the permission in any type of PermissionCollection it
  * desires (one using a Hashtable, one using a Vector, etc.). For example,
@@ -81,7 +81,7 @@
  * <p> Subclass implementations of PermissionCollection should assume
  * that they may be called simultaneously from multiple threads,
  * and therefore should be synchronized properly.  Furthermore,
- * Enumerations returned via the <code>elements</code> method are
+ * Enumerations returned via the {@code elements} method are
  * not <em>fail-fast</em>.  Modifications to a collection should not be
  * performed while enumerating over that collection.
  *
@@ -134,7 +134,7 @@
      * Marks this PermissionCollection object as "readonly". After
      * a PermissionCollection object
      * is marked as readonly, no new Permission objects can be added to it
-     * using <code>add</code>.
+     * using {@code add}.
      */
     public void setReadOnly() {
         readOnly = true;
@@ -143,10 +143,10 @@
     /**
      * Returns true if this PermissionCollection object is marked as readonly.
      * If it is readonly, no new Permission objects can be added to it
-     * using <code>add</code>.
+     * using {@code add}.
      *
      * <p>By default, the object is <i>not</i> readonly. It can be set to
-     * readonly by a call to <code>setReadOnly</code>.
+     * readonly by a call to {@code setReadOnly}.
      *
      * @return true if this PermissionCollection object is marked as readonly,
      * false otherwise.
@@ -166,7 +166,7 @@
      *   // one per line..
      * )</pre>
      *
-     * <code>super.toString</code> is a call to the <code>toString</code>
+     * {@code super.toString} is a call to the {@code toString}
      * method of this
      * object's superclass, which is Object. The result is
      * this PermissionCollection's type name followed by this object's