diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 0169f79eb0..11d474ea50 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -271,8 +271,10 @@ public class ClassicPluginStrategy implements PluginStrategy {
 
     /**
      * @see DetachedPluginsUtil#getImpliedDependencies(String, String)
+     *
+     * @deprecated since 2.163
      */
-    @Deprecated // since TODO
+    @Deprecated
     @NonNull
     public static List<PluginWrapper.Dependency> getImpliedDependencies(String pluginName, String jenkinsVersion) {
         return DetachedPluginsUtil.getImpliedDependencies(pluginName, jenkinsVersion);
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 25d485bf1d..1efaf6fa6d 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -1720,7 +1720,7 @@ public class Functions {
      */
     @Deprecated
     @Restricted(DoNotUse.class)
-    @RestrictedSince("since TODO")
+    @RestrictedSince("2.173")
     public static String toCCStatus(Item i) {
         return "Unknown";
     }
diff --git a/core/src/main/java/hudson/console/LineTransformationOutputStream.java b/core/src/main/java/hudson/console/LineTransformationOutputStream.java
index 37f760df20..78a7f17619 100644
--- a/core/src/main/java/hudson/console/LineTransformationOutputStream.java
+++ b/core/src/main/java/hudson/console/LineTransformationOutputStream.java
@@ -115,7 +115,7 @@ public abstract class LineTransformationOutputStream extends OutputStream {
      * Convenience subclass for cases where you wish to process lines being sent to an underlying stream.
      * {@link #eol} will typically {@link OutputStream#write(byte[], int, int)} to {@link #out}.
      * Flushing or closing the decorated stream will behave properly.
-     * @since FIXME
+     * @since 2.173
      */
     public static abstract class Delegating extends LineTransformationOutputStream {
 
diff --git a/core/src/main/java/hudson/console/ModelHyperlinkNote.java b/core/src/main/java/hudson/console/ModelHyperlinkNote.java
index a6e03015dc..5b4b8f514b 100644
--- a/core/src/main/java/hudson/console/ModelHyperlinkNote.java
+++ b/core/src/main/java/hudson/console/ModelHyperlinkNote.java
@@ -55,7 +55,7 @@ public class ModelHyperlinkNote extends HyperlinkNote {
     }
 
     /**
-     * @since TODO
+     * @since 2.230
      */
     public static String encodeTo(Label label) {
         return encodeTo("/" + label.getUrl(), label.getName());
diff --git a/core/src/main/java/hudson/model/AbstractCIBase.java b/core/src/main/java/hudson/model/AbstractCIBase.java
index ab158052fd..4545a32a6b 100644
--- a/core/src/main/java/hudson/model/AbstractCIBase.java
+++ b/core/src/main/java/hudson/model/AbstractCIBase.java
@@ -91,7 +91,7 @@ public abstract class AbstractCIBase extends Node implements ItemGroup<TopLevelI
     /**
      * Get the disabled administrative monitors
      *
-     * @since TODO
+     * @since 2.230
      */
     public Set<String> getDisabledAdministrativeMonitors(){
         synchronized (this.disabledAdministrativeMonitors) {
@@ -102,7 +102,7 @@ public abstract class AbstractCIBase extends Node implements ItemGroup<TopLevelI
     /**
      * Set the disabled administrative monitors
      *
-     * @since TODO
+     * @since 2.230
      */
     public void setDisabledAdministrativeMonitors(Set<String> disabledAdministrativeMonitors) {
         synchronized (this.disabledAdministrativeMonitors) {
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 388b6c2c55..3095b92a4f 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -159,7 +159,7 @@ public abstract class Slave extends Node implements Serializable {
 
     /**
      * Use {@link #Slave(String, String, ComputerLauncher)} and set the rest through setters.
-     * @deprecated since FIXME
+     * @deprecated since 2.184
      */
     @Deprecated
     public Slave(String name, String nodeDescription, String remoteFS, String numExecutors,
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index af3a7c966b..c1a79c9512 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -1042,7 +1042,7 @@ public class UpdateSite {
         /**
          * Popularity of this plugin.
          *
-         * @since TODO
+         * @since 2.233
          */
         @Restricted(NoExternalUse.class)
         public final Double popularity;
diff --git a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java
index 228832297f..ee8b9569ee 100644
--- a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java
+++ b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java
@@ -52,7 +52,7 @@ public abstract class AbstractCloudSlave extends Slave {
 
     /**
      * Use {@link #AbstractCloudSlave(java.lang.String, java.lang.String, hudson.slaves.ComputerLauncher)}
-     * @deprecated since FIXME
+     * @deprecated since 2.184
      */
     @Deprecated
     public AbstractCloudSlave(String name, String nodeDescription, String remoteFS, String numExecutors,
@@ -64,7 +64,7 @@ public abstract class AbstractCloudSlave extends Slave {
 
     /**
      * Use {@link #AbstractCloudSlave(java.lang.String, java.lang.String, hudson.slaves.ComputerLauncher)}
-     * @deprecated since FIXME
+     * @deprecated since 2.184
      */
     @Deprecated
     public AbstractCloudSlave(String name, String nodeDescription, String remoteFS, int numExecutors,
diff --git a/core/src/main/java/hudson/slaves/JNLPLauncher.java b/core/src/main/java/hudson/slaves/JNLPLauncher.java
index c15d125b5e..5d313824e0 100644
--- a/core/src/main/java/hudson/slaves/JNLPLauncher.java
+++ b/core/src/main/java/hudson/slaves/JNLPLauncher.java
@@ -243,7 +243,7 @@ public class JNLPLauncher extends ComputerLauncher {
      * This flag is checked in {@code config.jelly} before displaying the
      * Java Web Start button.
      * @return {@code true} if Java Web Start button should be displayed.
-     * @since FIXME
+     * @since 2.153
      */
     @Restricted(NoExternalUse.class) // Jelly use
     public boolean isJavaWebStartSupported() {
diff --git a/core/src/main/java/jenkins/agents/AgentComputerUtil.java b/core/src/main/java/jenkins/agents/AgentComputerUtil.java
index 3aa026124e..16ee658e24 100644
--- a/core/src/main/java/jenkins/agents/AgentComputerUtil.java
+++ b/core/src/main/java/jenkins/agents/AgentComputerUtil.java
@@ -41,7 +41,7 @@ public final class AgentComputerUtil {
      * separate thread on agents, that'll fail.)
      *
      * @return null if the calling thread doesn't have any trace of where its master is.
-     * @since TODO
+     * @since 2.235
      */
     @CheckForNull
     public static VirtualChannel getChannelToMaster() {
diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
index 2c211bdfb8..d631521f78 100644
--- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
+++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -133,7 +133,7 @@ public interface ModelObjectWithContextMenu extends ModelObject {
         /**
          * Add a header row (no icon, no URL, rendered in header style).
          *
-         * @since TODO
+         * @since 2.231
          */
         @Restricted(DoNotUse.class) // manage.jelly only
         public ContextMenu addHeader(String title) {
@@ -276,7 +276,7 @@ public interface ModelObjectWithContextMenu extends ModelObject {
 
         /**
          * True to display this item as a section header.
-         * @since TODO
+         * @since 2.231
          */
         @Exported public boolean header;
 
diff --git a/core/src/main/java/jenkins/util/xml/XMLUtils.java b/core/src/main/java/jenkins/util/xml/XMLUtils.java
index cc672bb8ee..2dd32fad1b 100644
--- a/core/src/main/java/jenkins/util/xml/XMLUtils.java
+++ b/core/src/main/java/jenkins/util/xml/XMLUtils.java
@@ -37,7 +37,7 @@ import javax.xml.xpath.XPathFactory;
 
 /**
   * Utilities useful when working with various XML types.
-  * @since 1.596.1 and 1.600, unrestricted since TODO
+  * @since 1.596.1 and 1.600, unrestricted since 2.179
  */
 public final class XMLUtils {
 
diff --git a/core/src/main/resources/lib/layout/helpIcon.jelly b/core/src/main/resources/lib/layout/helpIcon.jelly
index c7fe58c2fe..94212b1a42 100644
--- a/core/src/main/resources/lib/layout/helpIcon.jelly
+++ b/core/src/main/resources/lib/layout/helpIcon.jelly
@@ -5,7 +5,7 @@
 
     The help link is rendered as an SVG with an (?) icon.
     
-    @since TODO
+    @since 2.234
     <st:attribute name="iconSize">
       Icon size, available are: small, medium, large, xlarge
     </st:attribute>