diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
index 86d34c8ac7..e7d5565670 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
@@ -36,6 +36,8 @@ import com.google.inject.Module;
  * Implementation of {@link ApiMetadata} for Nova 1.0 API
  * 
  * @author Adrian Cole
+ * 
+ * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.NovaApiMetadata} in openstack-nova.
  */
 public class NovaApiMetadata extends BaseRestApiMetadata {
    
@@ -93,4 +95,4 @@ public class NovaApiMetadata extends BaseRestApiMetadata {
 
    }
 
-}
\ No newline at end of file
+}
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java
index 7836fbae7d..544c51fb33 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java
@@ -67,6 +67,8 @@ import com.google.common.util.concurrent.ListenableFuture;
  * @author Adrian Cole
  * @see NovaClient
  * @see <a href="http://wiki.openstack.org/OpenStackAPI_1-1" />
+ * 
+ * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See NovaAsyncApi.
  */
 @RequestFilters({AuthenticateRequest.class, AddTimestampQuery.class})
 @Endpoint(ServerManagement.class)
@@ -74,6 +76,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#listServers
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -85,6 +89,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#getServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -96,6 +102,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#getServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -107,6 +115,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#deleteServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova.
     */
    @DELETE
    @Consumes
@@ -116,6 +126,8 @@ public interface NovaAsyncClient {
 
     /**
      * @see NovaClient#deleteServer
+     * 
+     * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova.
      */
     @DELETE
     @Consumes
@@ -125,6 +137,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#rebootServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#reboot(String, RebootType)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -136,6 +150,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#resizeServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#resize(String, String)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -147,6 +163,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#confirmResizeServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#confirmResize(String)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -158,6 +176,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#revertResizeServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#revertResize(String)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -169,6 +189,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#createServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#create(String, String, String, CreateServerOptions)} in openstack-nova.
     */
    @POST
    @Unwrap
@@ -181,6 +203,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#rebuildServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rebuild(String, RebuildServerOptions)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -192,6 +216,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#changeAdminPass
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#changeAdminPass(String, String)} in openstack-nova.
     */
    @POST
    @Path("/servers/{id}/action")
@@ -202,6 +228,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#renameServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rename(String, String)} in openstack-nova.
     */
    @PUT
    @Path("/servers/{id}")
@@ -212,6 +240,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#listFlavors
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -223,6 +253,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#getFlavor
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -234,6 +266,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#getFlavor
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -245,6 +279,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#listImages
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -256,6 +292,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#getImage
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -267,6 +305,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#getImage
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -278,6 +318,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#deleteImage
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova.
     */
    @DELETE
    @ExceptionParser(ReturnFalseOnNotFoundOr404.class)
@@ -287,6 +329,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#deleteImage
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova.
     */
    @DELETE
    @ExceptionParser(ReturnFalseOnNotFoundOr404.class)
@@ -296,6 +340,8 @@ public interface NovaAsyncClient {
    
    /**
     * @see NovaClient#createImageFromServer
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#createImageFromServer(String, String)} in openstack-nova.
     */
    @POST
    @Unwrap
@@ -309,6 +355,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#getAddresses
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -319,6 +367,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#listPublicAddresses
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -330,6 +380,8 @@ public interface NovaAsyncClient {
 
    /**
     * @see NovaClient#listPrivateAddresses
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -339,6 +391,9 @@ public interface NovaAsyncClient {
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<? extends Set<String>> listPrivateAddresses(@PathParam("id") int serverId);
    
+   /**
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#addToServer(String, String)} in openstack-nova.
+    */
    @POST
    @Path("/servers/{id}/action")
    @Consumes
@@ -346,6 +401,9 @@ public interface NovaAsyncClient {
    @Payload("%7B\"addFloatingIp\":%7B\"address\":\"{address}\"%7D%7D")
    ListenableFuture<Void> addFloatingIP(@PathParam("id") int serverId, @PayloadParam("address") String ip);
 
+   /**
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#list()} in openstack-nova.
+    */
    @GET
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
@@ -354,6 +412,9 @@ public interface NovaAsyncClient {
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<? extends Set<FloatingIP>> listFloatingIPs();
    
+   /**
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#get(String)} in openstack-nova.
+    */
    @GET
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
@@ -362,6 +423,9 @@ public interface NovaAsyncClient {
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
    ListenableFuture<FloatingIP> getFloatingIP(@PathParam("id") int id);
 
+   /**
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#list()} in openstack-nova.
+    */
    @GET
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
@@ -370,6 +434,9 @@ public interface NovaAsyncClient {
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<? extends Set<SecurityGroup>> listSecurityGroups();
    
+   /**
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#get(String)} in openstack-nova.
+    */
    @GET
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java
index 9ce05aff95..053ac43adc 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java
@@ -46,6 +46,8 @@ import org.jclouds.rest.ResourceNotFoundException;
  * @see NovaAsyncClient
  * @see <a href="http://wiki.openstack.org/OpenStackAPI_1-1" />
  * @author Adrian Cole
+ * 
+ * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi} in openstack-nova.
  */
 @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
 public interface NovaClient {
@@ -59,6 +61,8 @@ public interface NovaClient {
     * <p/>
     * in order to retrieve all details, pass the option {@link ListOptions#withDetails()
     * withDetails()}
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#list()} in openstack-nova.
     */
    Set<Server> listServers(ListOptions... options);
 
@@ -68,6 +72,8 @@ public interface NovaClient {
     * 
     * @return null, if the server is not found
     * @see Server
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    Server getServer(int id);
    Server getServer(String uuid);
@@ -80,6 +86,8 @@ public interface NovaClient {
     * 
     * @return false if the server is not found
     * @see Server
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#delete(String)} in openstack-nova.
     */
    boolean deleteServer(int id);
    boolean deleteServer(String id);
@@ -97,6 +105,8 @@ public interface NovaClient {
     *           With a soft reboot, the operating system is signaled to restart, which allows for a
     *           graceful shutdown of all processes. A hard reboot is the equivalent of power cycling
     *           the server.
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#reboot(String, RebootType)} in openstack-nova.
     */
    void rebootServer(int id, RebootType rebootType);
 
@@ -112,6 +122,8 @@ public interface NovaClient {
     * ACTIVE - QUEUE_RESIZE - PREP_RESIZE - VERIFY_RESIZE
     * <p/>
     * ACTIVE - QUEUE_RESIZE - ACTIVE (on error)
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#resize(String, String)} in openstack-nova.
     */
    void resizeServer(int id, int flavorId);
 
@@ -125,6 +137,8 @@ public interface NovaClient {
     * Status Transition:
     * <p/>
     * VERIFY_RESIZE - ACTIVE
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#confirmResize(String)} in openstack-nova.
     */
    void confirmResizeServer(int id);
 
@@ -138,6 +152,8 @@ public interface NovaClient {
     * Status Transition:
     * <p/>
     * VERIFY_RESIZE - ACTIVE
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#revertResize(String)} in openstack-nova.
     */
    void revertResizeServer(int id);
 
@@ -151,6 +167,8 @@ public interface NovaClient {
     * 
     * @param options
     *           - used to specify extra files, metadata, or ip parameters during server creation.
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#create(String, String, String, CreateServerOptions)} in openstack-nova.
     */
    Server createServer(String name, String imageRef, String flavorRef, CreateServerOptions... options);
 
@@ -168,6 +186,8 @@ public interface NovaClient {
     * @param options
     *           - imageId is an optional argument. If it is not specified, the server is rebuilt
     *           with the original imageId.
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rebuild(String, RebuildServerOptions)} in openstack-nova.
     */
    void rebuildServer(int id, RebuildServerOptions... options);
 
@@ -176,6 +196,7 @@ public interface NovaClient {
     * <p/>
     * Status Transition: ACTIVE - PASSWORD - ACTIVE
     * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#changeAdminPass(String, String)} in openstack-nova.
     */
    void changeAdminPass(int id, String adminPass);
 
@@ -185,6 +206,7 @@ public interface NovaClient {
     * <p/>
     * Status Transition: ACTIVE - PASSWORD - ACTIVE
     * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rename(String, String)} in openstack-nova.
     */
    void renameServer(int id, String newName);
 
@@ -194,6 +216,8 @@ public interface NovaClient {
     * 
     * in order to retrieve all details, pass the option {@link ListOptions#withDetails()
     * withDetails()}
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#list()} in openstack-nova.
     */
    Set<Flavor> listFlavors(ListOptions... options);
 
@@ -203,6 +227,8 @@ public interface NovaClient {
     * 
     * @return null, if the flavor is not found
     * @see Flavor
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#get(String)} in openstack-nova.
     */
    Flavor getFlavor(int id);
    Flavor getFlavor(String uuid);
@@ -213,6 +239,8 @@ public interface NovaClient {
     * 
     * in order to retrieve all details, pass the option {@link ListOptions#withDetails()
     * withDetails()}
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#list()} in openstack-nova.
     */
    Set<Image> listImages(ListOptions... options);
 
@@ -223,6 +251,8 @@ public interface NovaClient {
     * @return null, if the image is not found
     * 
     * @see Image
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#get(String)} in openstack-nova.
     */
    Image getImage(int id);
    Image getImage(String id);
@@ -236,6 +266,8 @@ public interface NovaClient {
     * 
     * @return false if the image is not found
     * @see Image
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#delete(String)} in openstack-nova.
     */
    boolean deleteImage(int id);
    boolean deleteImage(String id);
@@ -259,6 +291,8 @@ public interface NovaClient {
     * @throws ResourceNotFoundException
     *            if the server is not found
     * @see Image
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#createImageFromServer(String, String)} in openstack-nova.
     */
    Image createImageFromServer(String imageName, int serverId);
 
@@ -266,6 +300,8 @@ public interface NovaClient {
     * List all server addresses
     * 
     * returns empty set if the server doesn't exist
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    Addresses getAddresses(int serverId);
 
@@ -273,6 +309,8 @@ public interface NovaClient {
     * List all public server addresses
     * 
     * returns empty set if the server doesn't exist
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    Set<String> listPublicAddresses(int serverId);
 
@@ -280,6 +318,8 @@ public interface NovaClient {
     * List all private server addresses
     * 
     * returns empty set if the server doesn't exist
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    Set<String> listPrivateAddresses(int serverId);
 
@@ -293,6 +333,8 @@ public interface NovaClient {
 	 * @since 2011.3 "Diablo" release, OpenStack API 1.1
 	 * @param serverId
 	 * @param ip
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#addToServer(String, String)} in openstack-nova.
 	 */
    void addFloatingIP(int serverId, String ip);
    
@@ -302,6 +344,8 @@ public interface NovaClient {
     * @see <a href="http://wiki.openstack.org/os_api_floating_ip">http://wiki.openstack.org/os_api_floating_ip</a>
 	* @since 2011.3 "Diablo" release, OpenStack API 1.1
     * @return all the available floating IP for the current tenant
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#list()} in openstack-nova.
     */
    Set<FloatingIP> listFloatingIPs();
 
@@ -312,6 +356,8 @@ public interface NovaClient {
 	* @since 2011.3 "Diablo" release, OpenStack API 1.1
     * @param id the floating IP id
     * @return the floating IP or null if not found
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#get(String)} in openstack-nova.
     */
    FloatingIP getFloatingIP(int id);
    
@@ -321,6 +367,8 @@ public interface NovaClient {
     * @see <a href="http://wiki.openstack.org/os-security-groups">http://wiki.openstack.org/os-security-groups</a>
     * @since OpenStack API v1.1
     * @return all the security groups for the current tenant
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#list()} in openstack-nova.
     */
    Set<SecurityGroup> listSecurityGroups();
    
@@ -331,6 +379,8 @@ public interface NovaClient {
     * @since OpenStack API v1.1
     * @param id the ID of the security group to get details from
     * @return the security group or null if not found
+    * 
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#get(String)} in openstack-nova.
     */
    SecurityGroup getSecurityGroup(int id);