From bbd5fc6f3569a088b619ba55f149e2d21f585207 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 30 Oct 2012 22:13:04 -0700 Subject: [PATCH] Backport "Polish Javadoc for @Import" Issue: SPR-9925 Backport-Commit: e6c4840356a9e92661e84178db3de554600ca6c8 Conflicts: spring-context/src/main/java/org/springframework/context/annotation/Import.java --- .../java/org/springframework/context/annotation/Import.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java index 4a2fe947ca8..db173a1892f 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,8 @@ import java.lang.annotation.Target; public @interface Import { /** - * The @{@link Configuration} and/or {@link ImportSelector} classes to import. + * The @{@link Configuration}, {@link ImportSelector} and/or + * {@link ImportBeanDefinitionRegistrar} classes to import. */ Class[] value(); }