From d385d25a34e7e38f5adf7047edecaeac2b1a0871 Mon Sep 17 00:00:00 2001
From: Karmel Allison <karmel@arcaio.com>
Date: Mon, 22 Apr 2013 13:46:17 -0700
Subject: [PATCH] DOC: Adding parameters to frequencies, offsets (issue #2916)

---
 pandas/tseries/frequencies.py | 1 +
 pandas/tseries/offsets.py     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/pandas/tseries/frequencies.py b/pandas/tseries/frequencies.py
index e8dad6c85b2ac..3b66eba31fca1 100644
--- a/pandas/tseries/frequencies.py
+++ b/pandas/tseries/frequencies.py
@@ -746,6 +746,7 @@ def infer_freq(index, warn=True):
     Parameters
     ----------
     index : DatetimeIndex
+    warn : boolean, default True
 
     Returns
     -------
diff --git a/pandas/tseries/offsets.py b/pandas/tseries/offsets.py
index bd95a62c3f2ed..3bc801bd38695 100644
--- a/pandas/tseries/offsets.py
+++ b/pandas/tseries/offsets.py
@@ -1197,6 +1197,8 @@ def generate_range(start=None, end=None, periods=None,
     start : datetime (default None)
     end : datetime (default None)
     periods : int, optional
+    time_rule : (legacy) name of DateOffset object to be used, optional
+        Corresponds with names expected by tseries.frequencies.get_offset        
 
     Note
     ----
@@ -1204,6 +1206,7 @@ def generate_range(start=None, end=None, periods=None,
     * At least two of (start, end, periods) must be specified.
     * If both start and end are specified, the returned dates will
     satisfy start <= date <= end.
+    * If both time_rule and offset are specified, time_rule supersedes offset.
 
     Returns
     -------