--- a/jdk/src/share/classes/java/security/Permission.java	Fri Jun 28 16:39:15 2013 +0100
+++ b/jdk/src/share/classes/java/security/Permission.java	Fri Jun 28 10:48:02 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, 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
@@ -33,17 +33,17 @@
  *
  * <p>Most Permission objects also include an "actions" list that tells the actions
  * that are permitted for the object.  For example,
- * for a <code>java.io.FilePermission</code> object, the permission name is
+ * for a {@code java.io.FilePermission} object, the permission name is
  * the pathname of a file (or directory), and the actions list
  * (such as "read, write") specifies which actions are granted for the
  * specified file (or for files in the specified directory).
  * The actions list is optional for Permission objects, such as
- * <code>java.lang.RuntimePermission</code>,
+ * {@code java.lang.RuntimePermission},
  * that don't need such a list; you either have the named permission (such
  * as "system.exit") or you don't.
  *
  * <p>An important method that must be implemented by each subclass is
- * the <code>implies</code> method to compare Permissions. Basically,
+ * the {@code implies} method to compare Permissions. Basically,
  * "permission p1 implies permission p2" means that
  * if one is granted permission p1, one is naturally granted permission p2.
  * Thus, this is not an equality test, but rather more of a
@@ -81,7 +81,7 @@
 
     /**
      * Implements the guard interface for a permission. The
-     * <code>SecurityManager.checkPermission</code> method is called,
+     * {@code SecurityManager.checkPermission} method is called,
      * passing this permission object as the permission to check.
      * Returns silently if access is granted. Otherwise, throws
      * a SecurityException.
@@ -90,7 +90,7 @@
      *
      * @throws SecurityException
      *        if a security manager exists and its
-     *        <code>checkPermission</code> method doesn't allow access.
+     *        {@code checkPermission} method doesn't allow access.
      *
      * @see Guard
      * @see GuardedObject
@@ -109,7 +109,7 @@
      * This must be implemented by subclasses of Permission, as they are the
      * only ones that can impose semantics on a Permission object.
      *
-     * <p>The <code>implies</code> method is used by the AccessController to determine
+     * <p>The {@code implies} method is used by the AccessController to determine
      * whether or not a requested permission is implied by another permission that
      * is known to be valid in the current execution context.
      *
@@ -124,8 +124,8 @@
     /**
      * Checks two Permission objects for equality.
      * <P>
-     * Do not use the <code>equals</code> method for making access control
-     * decisions; use the <code>implies</code> method.
+     * Do not use the {@code equals} method for making access control
+     * decisions; use the {@code implies} method.
      *
      * @param obj the object we are testing for equality with this object.
      *
@@ -137,18 +137,18 @@
     /**
      * Returns the hash code value for this Permission object.
      * <P>
-     * The required <code>hashCode</code> behavior for Permission Objects is
+     * The required {@code hashCode} behavior for Permission Objects is
      * the following: <p>
      * <ul>
      * <li>Whenever it is invoked on the same Permission object more than
      *     once during an execution of a Java application, the
-     *     <code>hashCode</code> method
+     *     {@code hashCode} method
      *     must consistently return the same integer. This integer need not
      *     remain consistent from one execution of an application to another
      *     execution of the same application. <p>
      * <li>If two Permission objects are equal according to the
-     *     <code>equals</code>
-     *     method, then calling the <code>hashCode</code> method on each of the
+     *     {@code equals}
+     *     method, then calling the {@code hashCode} method on each of the
      *     two Permission objects must produce the same integer result.
      * </ul>
      *
@@ -159,7 +159,7 @@
 
     /**
      * Returns the name of this Permission.
-     * For example, in the case of a <code>java.io.FilePermission</code>,
+     * For example, in the case of a {@code java.io.FilePermission},
      * the name will be a pathname.
      *
      * @return the name of this Permission.
@@ -184,7 +184,7 @@
      * </pre>
      *
      * both return
-     * "read,write" when the <code>getActions</code> method is invoked.
+     * "read,write" when the {@code getActions} method is invoked.
      *
      * @return the actions of this Permission.
      *
@@ -197,7 +197,7 @@
      * one is not defined. Subclasses of class Permission should
      * override this 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.
+     * when the {@code PermissionCollection.implies} method is called.
      * If null is returned,
      * then the caller of this method is free to store permissions of this
      * type in any PermissionCollection they choose (one that uses a Hashtable,