diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 49f6037655..5f5cddd6ab 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -907,7 +907,7 @@ public final class FilePath implements Serializable {
     /**
      * Copies the content of a URL to a remote file.
      * Unlike {@link #copyFrom} this will not transfer content over a Remoting channel.
-     * @since FIXME
+     * @since 2.119
      */
     @Restricted(Beta.class)
     public void copyFromRemotely(URL url) throws IOException, InterruptedException {
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index ffc627405d..9740880c0d 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -240,7 +240,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
      * @return whether {@link #name} can be modified by a user
      * @see #checkRename
      * @see #renameTo
-     * @since FIXME
+     * @since 2.110
      */
     public boolean isNameEditable() {
         return false;
@@ -335,7 +335,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
      *
      * @param newName the new name for the item
      * @throws Failure if the rename should be blocked
-     * @since FIXME
+     * @since 2.110
      * @see Job#checkRename
      */
     protected void checkRename(@Nonnull String newName) throws Failure {
diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
index d5b6000591..9ea1415362 100644
--- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
@@ -61,7 +61,7 @@ public class ChoiceParameterDefinition extends SimpleParameterDefinition {
      * @param name parameter name
      * @param description parameter description
      *
-     * @since TODO
+     * @since 2.112
      */
     @DataBoundConstructor
     @Restricted(NoExternalUse.class) // there are specific constructors with String and List arguments for 'choices'
@@ -82,7 +82,7 @@ public class ChoiceParameterDefinition extends SimpleParameterDefinition {
      *
      * @param choices String or Collection representing this parameter definition's possible values.
      *
-     * @since TODO
+     * @since 2.112
      *
      */
     @DataBoundSetter
diff --git a/core/src/main/java/hudson/security/ACL.java b/core/src/main/java/hudson/security/ACL.java
index 95b3f8fc46..1f39620c66 100644
--- a/core/src/main/java/hudson/security/ACL.java
+++ b/core/src/main/java/hudson/security/ACL.java
@@ -100,7 +100,7 @@ public abstract class ACL {
      * Creates a simple {@link ACL} implementation based on a “single-abstract-method” easily implemented via lambda syntax.
      * @param impl the implementation of {@link ACL#hasPermission(Authentication, Permission)}
      * @return an adapter to that lambda
-     * @since FIXME
+     * @since 2.105
      */
     public static ACL lambda(final BiFunction<Authentication, Permission, Boolean> impl) {
         return new ACL() {
diff --git a/core/src/main/java/hudson/tools/ToolDescriptor.java b/core/src/main/java/hudson/tools/ToolDescriptor.java
index ad4ac1734a..1e1f9788a5 100644
--- a/core/src/main/java/hudson/tools/ToolDescriptor.java
+++ b/core/src/main/java/hudson/tools/ToolDescriptor.java
@@ -57,7 +57,7 @@ public abstract class ToolDescriptor<T extends ToolInstallation> extends Descrip
     protected ToolDescriptor() { }
 
     /**
-     * @since FIXME
+     * @since 2.102
      */
     protected ToolDescriptor(Class<T> clazz) {
         super(clazz);
diff --git a/core/src/main/java/hudson/triggers/SafeTimerTask.java b/core/src/main/java/hudson/triggers/SafeTimerTask.java
index e2cc7eb8b0..7e6f89236c 100644
--- a/core/src/main/java/hudson/triggers/SafeTimerTask.java
+++ b/core/src/main/java/hudson/triggers/SafeTimerTask.java
@@ -86,7 +86,7 @@ public abstract class SafeTimerTask extends TimerTask {
      * @see AsyncAperiodicWork#getLogFile()
      * @see AsyncPeriodicWork#getLogFile()
      * @return the path where the logs should be put.
-     * @since TODO
+     * @since 2.114
      */
     public static File getLogsRoot() {
         String tagsLogsPath = SystemProperties.getString(LOGS_ROOT_PATH_PROPERTY);
diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java
index b8964811a2..3009e16253 100644
--- a/core/src/main/java/hudson/util/FormValidation.java
+++ b/core/src/main/java/hudson/util/FormValidation.java
@@ -400,7 +400,7 @@ public abstract class FormValidation extends IOException implements HttpResponse
      * @param lower the lower bound (inclusive)
      * @param upper the upper bound (inclusive)
      *
-     * @since TODO
+     * @since 2.104
      */
     public static FormValidation validateIntegerInRange(String value, int lower, int upper) {
         try {
diff --git a/core/src/main/java/hudson/util/HttpResponses.java b/core/src/main/java/hudson/util/HttpResponses.java
index 8c4bdeda9a..0766f73328 100644
--- a/core/src/main/java/hudson/util/HttpResponses.java
+++ b/core/src/main/java/hudson/util/HttpResponses.java
@@ -106,7 +106,7 @@ public class HttpResponses extends org.kohsuke.stapler.HttpResponses {
      * @param data The data.
      * @return {@code this} object.
      *
-     * @since TODO
+     * @since 2.115
      */
     public static HttpResponse errorJSON(@Nonnull String message, @Nonnull JSONObject data) {
         return new JSONObjectResponse(data).error(message);
@@ -118,7 +118,7 @@ public class HttpResponses extends org.kohsuke.stapler.HttpResponses {
      * @param data The data.
      * @return {@code this} object.
      *
-     * @since TODO
+     * @since 2.115
      */
     public static HttpResponse errorJSON(@Nonnull String message, @Nonnull JSONArray data) {
         return new JSONObjectResponse(data).error(message);
diff --git a/core/src/main/java/hudson/util/TextFile.java b/core/src/main/java/hudson/util/TextFile.java
index e9bb0c8b5a..bd6904add0 100644
--- a/core/src/main/java/hudson/util/TextFile.java
+++ b/core/src/main/java/hudson/util/TextFile.java
@@ -101,7 +101,7 @@ public class TextFile {
      * <code>LinesStream</code>.
      * @throws IOException if the file cannot be converted to a
      * {@link java.nio.file.Path} or if the file cannot be opened for reading
-     * @since TODO
+     * @since 2.111
      */
     @CreatesObligation
     public @Nonnull LinesStream linesStream() throws IOException {
diff --git a/core/src/main/java/jenkins/security/s2m/ConfigFile.java b/core/src/main/java/jenkins/security/s2m/ConfigFile.java
index f52b64d370..99b8c5f975 100644
--- a/core/src/main/java/jenkins/security/s2m/ConfigFile.java
+++ b/core/src/main/java/jenkins/security/s2m/ConfigFile.java
@@ -50,7 +50,7 @@ abstract class ConfigFile<T,COL extends Collection<T>> extends TextFile {
     /**
      * Loads the configuration from the configuration file.
      * @throws IOException if the configuration file could not be read.
-     * @since TODO
+     * @since 2.111
      */
     public synchronized void load2() throws IOException {
         COL result = create();
diff --git a/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java b/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java
index 2c89ec136e..d1e0c06e4b 100644
--- a/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java
+++ b/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java
@@ -32,11 +32,10 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-// TODO: Make the API public (JENKINS-48766)
 /**
  * Provides information about Remoting versions used within the core.
  * @author Oleg Nenashev
- * @since TODO
+ * @since unrestricted since 2.104, initially added in 2.100.
  */
 public class RemotingVersionInfo {
 
diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java
index e59ad888bd..c1ea07d536 100644
--- a/core/src/main/java/jenkins/util/VirtualFile.java
+++ b/core/src/main/java/jenkins/util/VirtualFile.java
@@ -148,7 +148,7 @@ public abstract class VirtualFile implements Comparable<VirtualFile>, Serializab
      * Some implementations may not support symlinks under any conditions.
      * @return a target (typically a relative path in some format), or null if this is not a link
      * @throws IOException if reading the link, or even determining whether this file is a link, failed
-     * @since FIXME
+     * @since 2.118
      */
     @Restricted(Beta.class)
     public @CheckForNull String readLink() throws IOException {
@@ -188,7 +188,7 @@ public abstract class VirtualFile implements Comparable<VirtualFile>, Serializab
      * @param useDefaultExcludes as per {@link AbstractFileSet#setDefaultexcludes}
      * @return a list of {@code /}-separated relative names of children (files directly inside or in subdirectories)
      * @throws IOException if this is not a directory, or listing was not possible for some other reason
-     * @since FIXME
+     * @since 2.118
      */
     @Restricted(Beta.class)
     public @Nonnull Collection<String> list(@Nonnull String includes, @CheckForNull String excludes, boolean useDefaultExcludes) throws IOException {
@@ -266,7 +266,7 @@ public abstract class VirtualFile implements Comparable<VirtualFile>, Serializab
      * If the file is symlink (see {@link #readLink}), the mode is that of the link target, not the link itself.
      * @return for example, 0644 ~ {@code rw-r--r--}; -1 by default, meaning unknown or inapplicable
      * @throws IOException if checking the mode failed
-     * @since FIXME
+     * @since 2.118
      */
     @Restricted(Beta.class)
     public int mode() throws IOException {
@@ -345,7 +345,7 @@ public abstract class VirtualFile implements Comparable<VirtualFile>, Serializab
      * <p>The URL might be valid for only a limited amount of time or even only a single use;
      * this method should be called anew every time an external URL is required.
      * @return an externally usable URL like {@code https://gist.githubusercontent.com/ACCT/GISTID/raw/COMMITHASH/FILE}, or null if there is no such support
-     * @since FIXME
+     * @since 2.118
      * @see #toURI
      */
     @Restricted(Beta.class)
diff --git a/core/src/main/java/jenkins/util/io/LinesStream.java b/core/src/main/java/jenkins/util/io/LinesStream.java
index d0296ddf0a..92931c4ccd 100644
--- a/core/src/main/java/jenkins/util/io/LinesStream.java
+++ b/core/src/main/java/jenkins/util/io/LinesStream.java
@@ -58,7 +58,7 @@ import javax.annotation.Nullable;
  * obtain a second or subsequent <code>Iterator</code> throws
  * <code>IllegalStateException</code>.
  *
- * @since TODO
+ * @since 2.111
  */
 @CleanupObligation
 public class LinesStream implements Closeable, Iterable<String> {
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 623380cfdf..e06c32b7f3 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
       (The permission will be checked against the "it" object.)
     </st:attribute>
     <st:attribute name="type" use="optional">
-      Available values: two-column (by default), one-column (full-width size) or full-screen (since TODO).
+      Available values: two-column (by default), one-column (full-width size) or full-screen (since 2.53).
     </st:attribute>
   </st:documentation>
 <st:setHeader name="Expires" value="0" />
diff --git a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java
index 2051c1a26a..54e494dce2 100644
--- a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java
+++ b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java
@@ -41,8 +41,6 @@ import static org.junit.Assume.assumeFalse;
  * <p>
  * So this test class uses a {@link RestartableJenkinsRule} to check the behaviour of this sysprop being
  * present or not between two restarts.
- *
- * @since TODO
  */
 public class JenkinsBuildsAndWorkspacesDirectoriesTest {