Index: conf/nutch-default.xml
===================================================================
--- conf/nutch-default.xml	(revision 1352851)
+++ conf/nutch-default.xml	(working copy)
@@ -332,13 +332,6 @@
 <!-- web db properties -->
 
 <property>
-  <name>db.default.fetch.interval</name>
-  <value>30</value>
-  <description>(DEPRECATED) The default number of days between re-fetches of a page.
-  </description>
-</property>
-
-<property>
   <name>db.fetch.interval.default</name>
   <value>2592000</value>
   <description>The default number of seconds between re-fetches of a page (30 days).
@@ -601,14 +594,6 @@
 </property>
 
 <property>
-  <name>generate.max.per.host</name>
-  <value>-1</value>
-  <description>(Deprecated). Use generate.max.count and generate.count.mode instead.
-  The maximum number of urls per host in a single
-  fetchlist.  -1 if unlimited.</description>
-</property>
-
-<property>
   <name>generate.min.score</name>
   <value>0</value>
   <description>Select only entries with a score larger than
@@ -657,7 +642,7 @@
   <value>0.0</value>
   <description>The minimum number of seconds the fetcher will delay between 
   successive requests to the same server. This value is applicable ONLY
-  if fetcher.threads.per.host is greater than 1 (i.e. the host blocking
+  if fetcher.threads.per.queue is greater than 1 (i.e. the host blocking
   is turned off).</description>
 </property>
 
Index: src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
===================================================================
--- src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java	(revision 1352851)
+++ src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java	(working copy)
@@ -48,11 +48,15 @@
     super.setConf(conf);
     if (conf == null) return;
     int oldDefaultInterval = conf.getInt("db.default.fetch.interval", 0);
+    if (oldDefaultInterval>0){
+    	LOG.warn("Generator: db.default.fetch.interval will be ignored, use db.fetch.interval.default instead");
+    }
     defaultInterval = conf.getInt("db.fetch.interval.default", 0);
-    if (oldDefaultInterval > 0 && defaultInterval == 0) defaultInterval = oldDefaultInterval * SECONDS_PER_DAY;
     int oldMaxInterval = conf.getInt("db.max.fetch.interval", 0);
+    if (oldMaxInterval>0) {
+    	LOG.warn("Generator: db.max.fetch.interval will be ignored, use db.fetch.interval.max instead");
+    }
     maxInterval = conf.getInt("db.fetch.interval.max", 0 );
-    if (oldMaxInterval > 0 && maxInterval == 0) maxInterval = oldMaxInterval * FetchSchedule.SECONDS_PER_DAY;
     LOG.info("defaultInterval=" + defaultInterval);
     LOG.info("maxInterval=" + maxInterval);
   }
Index: src/java/org/apache/nutch/crawl/CrawlDbReducer.java
===================================================================
--- src/java/org/apache/nutch/crawl/CrawlDbReducer.java	(revision 1352851)
+++ src/java/org/apache/nutch/crawl/CrawlDbReducer.java	(working copy)
@@ -52,7 +52,8 @@
     additionsAllowed = job.getBoolean(CrawlDb.CRAWLDB_ADDITIONS_ALLOWED, true);
     int oldMaxInterval = job.getInt("db.max.fetch.interval", 0);
     maxInterval = job.getInt("db.fetch.interval.max", 0 );
-    if (oldMaxInterval > 0 && maxInterval == 0) maxInterval = oldMaxInterval * FetchSchedule.SECONDS_PER_DAY;
+    if (oldMaxInterval > 0) 
+    	LOG.warn("Generator: db.max.fetch.interval will be ignored, use db.fetch.interval.max instead");
     schedule = FetchScheduleFactory.getFetchSchedule(job);
     int maxLinks = job.getInt("db.update.max.inlinks", 10000);
     linked = new InlinkPriorityQueue(maxLinks);
Index: src/java/org/apache/nutch/crawl/Generator.java
===================================================================
--- src/java/org/apache/nutch/crawl/Generator.java	(revision 1352851)
+++ src/java/org/apache/nutch/crawl/Generator.java	(working copy)
@@ -140,12 +140,7 @@
       curTime = job.getLong(GENERATOR_CUR_TIME, System.currentTimeMillis());
       limit = job.getLong(GENERATOR_TOP_N, Long.MAX_VALUE) / job.getNumReduceTasks();
       maxCount = job.getInt(GENERATOR_MAX_COUNT, -1);
-      // back compatibility with old param
-      int oldMaxPerHost = job.getInt(GENERATE_MAX_PER_HOST, -1);
-      if (maxCount==-1 && oldMaxPerHost!=-1){
-        maxCount = oldMaxPerHost;
-        byDomain = false;
-      }
+
       if (GENERATOR_COUNT_VALUE_DOMAIN.equals(job.get(GENERATOR_COUNT_MODE))) byDomain = true;
       filters = new URLFilters(job);
       normalise = job.getBoolean(GENERATOR_NORMALISE, true);
@@ -509,8 +504,11 @@
     }
     
     if ("true".equals(getConf().get(GENERATE_MAX_PER_HOST_BY_IP))){
-      LOG.info("Generator: GENERATE_MAX_PER_HOST_BY_IP will be ignored, use partition.url.mode instead");
+      LOG.warn("Generator: generate.max.per.host.by.ip will be ignored, use partition.url.mode instead");
     }
+    if (getConf().get(GENERATE_MAX_PER_HOST) != null){
+      LOG.warn("Generator: generate.max.per.host will be ignored, use generate.max.count and generate.count.mode instead");
+    }    
 
     // map to inverted subset due for fetch, sort by score
     JobConf job = new NutchJob(getConf());