diff --git a/java/java-psi-api/src/com/intellij/psi/PsiVariable.java b/java/java-psi-api/src/com/intellij/psi/PsiVariable.java
index 3256893e2a76..e9e099445aa7 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiVariable.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiVariable.java
@@ -31,7 +31,7 @@ public interface PsiVariable extends PsiModifierListOwner, PsiNameIdentifierOwne
    * Returns the initializer for the variable.
    *
    * @return the initializer expression, or null if it has no initializer.
-   * @see {@link #hasInitializer()}
+   * @see #hasInitializer()
    */
   @Nullable
   PsiExpression getInitializer();
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfile.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfile.java
index c82ef054cde2..13ee6cf4b67f 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfile.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfile.java
@@ -80,7 +80,7 @@ public interface InspectionProfile extends Comparable {
   boolean isExecutable(@Nullable Project project);
 
   /**
-   * @see {@link InspectionProfileImpl#setSingleTool(String)}
+   * @see com.intellij.codeInspection.ex.InspectionProfileImpl#setSingleTool(String)
    *
    * @return tool short name when inspection profile corresponds to synthetic profile for single inspection run
    */
diff --git a/platform/core-api/src/com/intellij/patterns/ElementPattern.java b/platform/core-api/src/com/intellij/patterns/ElementPattern.java
index 00e5396cf60b..a58aa1a173b4 100644
--- a/platform/core-api/src/com/intellij/patterns/ElementPattern.java
+++ b/platform/core-api/src/com/intellij/patterns/ElementPattern.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
 import com.intellij.util.ProcessingContext;
 
 /**
- * @see {@link com.intellij.patterns.StandardPatterns} and its extenders
+ * @see com.intellij.patterns.StandardPatterns and its extenders
  *
  * @author peter
  */
diff --git a/platform/core-api/src/com/intellij/psi/PsiElement.java b/platform/core-api/src/com/intellij/psi/PsiElement.java
index 7cb9b7a12984..7f8c32ac0667 100644
--- a/platform/core-api/src/com/intellij/psi/PsiElement.java
+++ b/platform/core-api/src/com/intellij/psi/PsiElement.java
@@ -531,7 +531,7 @@ public interface PsiElement extends UserDataHolder, Iconable {
    * Returns the scope in which references to this element are searched.
    *
    * @return the search scope instance.
-   * @see {@link com.intellij.psi.search.PsiSearchHelper#getUseScope(PsiElement)}
+   * @see com.intellij.psi.search.PsiSearchHelper#getUseScope(PsiElement)
    */
   @NotNull
   @Contract(pure=true)
diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
index 98aed241e318..7fb05d18485b 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
@@ -82,7 +82,7 @@ public final class LanguageConsoleBuilder {
   }
 
   /**
-   * @see {@link com.intellij.psi.PsiCodeFragment}
+   * @see com.intellij.psi.PsiCodeFragment
    */
   public LanguageConsoleBuilder psiFileFactory(@NotNull PairFunction<VirtualFile, Project, PsiFile> value) {
     psiFileFactory = value;
@@ -134,7 +134,7 @@ public final class LanguageConsoleBuilder {
   }
 
   /**
-   * @see {@link com.intellij.openapi.editor.ex.EditorEx#setOneLineMode(boolean)}
+   * @see com.intellij.openapi.editor.ex.EditorEx#setOneLineMode(boolean)
    */
   @SuppressWarnings("UnusedDeclaration")
   public LanguageConsoleBuilder oneLineInput() {
@@ -143,7 +143,7 @@ public final class LanguageConsoleBuilder {
   }
 
   /**
-   * @see {@link com.intellij.openapi.editor.ex.EditorEx#setOneLineMode(boolean)}
+   * @see com.intellij.openapi.editor.ex.EditorEx#setOneLineMode(boolean)
    */
   public LanguageConsoleBuilder oneLineInput(boolean value) {
     oneLineInput = value;
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/AdjustingTabSettingsEditor.java b/platform/lang-impl/src/com/intellij/execution/ui/AdjustingTabSettingsEditor.java
index e5b465d1fb2f..ebf652c9f317 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/AdjustingTabSettingsEditor.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/AdjustingTabSettingsEditor.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.options.SettingsEditor;
  * represented by this {@code SettingsEditor} instance is not selected.
  * As a result, no empty space or scrollbars when smaller tab component selected.
  *
- * @see {@link com.intellij.openapi.options.SettingsEditorGroup}
+ * @see com.intellij.openapi.options.SettingsEditorGroup
  */
 public interface AdjustingTabSettingsEditor {
 }
diff --git a/platform/util/src/com/intellij/execution/process/ProcessOutputType.java b/platform/util/src/com/intellij/execution/process/ProcessOutputType.java
index 25a51c3bc6a1..9d9ca0205b34 100644
--- a/platform/util/src/com/intellij/execution/process/ProcessOutputType.java
+++ b/platform/util/src/com/intellij/execution/process/ProcessOutputType.java
@@ -29,8 +29,8 @@ import org.jetbrains.annotations.Nullable;
  * Use {@link com.intellij.execution.ui.ConsoleViewContentType#getConsoleViewType} to get TextAttributes for an instance
  * of this class.
  * <p/>
- * @see {@link com.intellij.execution.process.ColoredOutputTypeRegistry}
- * @see {@link com.intellij.execution.ui.ConsoleViewContentType#registerNewConsoleViewType}
+ * @see com.intellij.execution.process.ColoredOutputTypeRegistry
+ * @see com.intellij.execution.ui.ConsoleViewContentType#registerNewConsoleViewType
  */
 @SuppressWarnings({"JavaDoc", "JavadocReference"})
 public class ProcessOutputType extends Key {
diff --git a/platform/util/src/com/intellij/util/ui/accessibility/ScreenReader.java b/platform/util/src/com/intellij/util/ui/accessibility/ScreenReader.java
index d56d7c37958c..199d2d2c3761 100644
--- a/platform/util/src/com/intellij/util/ui/accessibility/ScreenReader.java
+++ b/platform/util/src/com/intellij/util/ui/accessibility/ScreenReader.java
@@ -51,8 +51,8 @@ public class ScreenReader {
    * 2) in the prop. file: <user home>/.accessibility.properties
    * 3) in the prop. file: <jre>/lib/accessibility.properties
    *
-   * @see {@link #ACCESS_BRIDGE}
-   * @see {@link #ATK_WRAPPER}
+   * @see #ACCESS_BRIDGE
+   * @see #ATK_WRAPPER
    * @param a11yClassName the full class name representing the a11y technology
    * @return true if enabled, otherwise false
    */
diff --git a/python/src/com/jetbrains/python/codeInsight/PyLineMarkerNavigator.java b/python/src/com/jetbrains/python/codeInsight/PyLineMarkerNavigator.java
index d25868cdcc81..b1e3d1ad5984 100644
--- a/python/src/com/jetbrains/python/codeInsight/PyLineMarkerNavigator.java
+++ b/python/src/com/jetbrains/python/codeInsight/PyLineMarkerNavigator.java
@@ -54,7 +54,8 @@ abstract class PyLineMarkerNavigator<T extends PsiElement> implements GutterIcon
   }
 
   /**
-   * @see {@link #navigate(MouseEvent, PsiElement)} and {@link #MARKERS}
+   * @see #navigate(MouseEvent, PsiElement)
+   * @see #MARKERS
    */
   @TestOnly
   @Nullable
diff --git a/python/src/com/jetbrains/python/hierarchy/call/PyStaticCallHierarchyUtil.java b/python/src/com/jetbrains/python/hierarchy/call/PyStaticCallHierarchyUtil.java
index e5f3276b5ed0..210fcc177ed9 100644
--- a/python/src/com/jetbrains/python/hierarchy/call/PyStaticCallHierarchyUtil.java
+++ b/python/src/com/jetbrains/python/hierarchy/call/PyStaticCallHierarchyUtil.java
@@ -126,7 +126,7 @@ public class PyStaticCallHierarchyUtil {
   }
 
   /**
-   * @see {@link com.jetbrains.python.findUsages.PyFindUsagesHandlerFactory#createFindUsagesHandler(com.intellij.psi.PsiElement, boolean) createFindUsagesHandler}
+   * @see com.jetbrains.python.findUsages.PyFindUsagesHandlerFactory#createFindUsagesHandler(com.intellij.psi.PsiElement, boolean)
    */
   @Nullable
   private static FindUsagesHandler createFindUsageHandler(@NotNull final PsiElement element) {
@@ -152,7 +152,7 @@ public class PyStaticCallHierarchyUtil {
   }
 
   /**
-   * @see {@link com.jetbrains.python.findUsages.PyFindUsagesHandlerFactory#isInObject(com.jetbrains.python.psi.PyFunction) isInObject}
+   * @see com.jetbrains.python.findUsages.PyFindUsagesHandlerFactory#isInObject(PyFunction)
    */
   private static boolean isInObject(PyFunction fun) {
     final PyClass containingClass = fun.getContainingClass();
diff --git a/python/src/com/jetbrains/python/psi/PyUtil.java b/python/src/com/jetbrains/python/psi/PyUtil.java
index 7a9c455d1164..470b204d40f9 100644
--- a/python/src/com/jetbrains/python/psi/PyUtil.java
+++ b/python/src/com/jetbrains/python/psi/PyUtil.java
@@ -626,7 +626,7 @@ public class PyUtil {
   /**
    * Returns Python language level for a virtual file.
    *
-   * @see {@link LanguageLevel#forElement}
+   * @see LanguageLevel#forElement
    */
   @NotNull
   public static LanguageLevel getLanguageLevelForVirtualFile(@NotNull Project project,
diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
index f385ad4c79b4..29544a391343 100644
--- a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
+++ b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
@@ -229,7 +229,7 @@ public class PythonSdkUpdater implements StartupActivity {
   /**
    * Updates the paths of an SDK and regenerates its skeletons as a background task. Shows an error message if the update fails.
    *
-   * @see {@link #update(Sdk, SdkModificator, Project, Component)}
+   * @see #update(Sdk, SdkModificator, Project, Component)
    */
   public static void updateOrShowError(@NotNull Sdk sdk, @Nullable SdkModificator sdkModificator, @Nullable Project project,
                                        @Nullable Component ownerComponent) {