5 files changed, 24 insertions, 16 deletions
diff --git a/docs/sphinx/source/blocks/index.rst b/docs/sphinx/source/blocks/index.rst
index 751092b8b6..f89c9c5df5 100644
--- a/docs/sphinx/source/blocks/index.rst
+++ b/docs/sphinx/source/blocks/index.rst
@@ -185,10 +185,14 @@ Measurement Tools
    gnuradio.blocks.probe_signal_vi
    gnuradio.blocks.probe_signal_vs
    gnuradio.blocks.ctrlport_probe2_c
+      :noindex:
    gnuradio.blocks.ctrlport_probe_c
+      :noindex:
    gnuradio.blocks.message_debug
+      :noindex:
    gnuradio.blocks.probe_rate
    gnuradio.blocks.tag_debug
+      :noindex:
 
 Message Tools
 -------------
@@ -198,11 +202,13 @@ Message Tools
 
    gnuradio.blocks.message_burst_source
    gnuradio.blocks.message_debug
+      :noindex:
    gnuradio.blocks.message_sink
    gnuradio.blocks.message_source
    gnuradio.blocks.message_strobe
    gnuradio.blocks.pdu_to_tagged_stream
    gnuradio.blocks.random_pdu
+      :noindex:
    gnuradio.blocks.tagged_stream_to_pdu
 
 Miscellaneous
@@ -236,7 +242,7 @@ Modulators and Demodulators
 
    gnuradio.blocks.vco_f
 
-Netwroking Tools
+Networking Tools
 ----------------
 
 .. autosummary::
@@ -260,8 +266,8 @@ Peak Detectors
    gnuradio.blocks.peak_detector2_fb
    gnuradio.blocks.plateau_detector_fb
 
-Streams Operators
------------------
+Stream Operators
+----------------
 
 .. autosummary::
    :nosignatures:
@@ -297,8 +303,11 @@ Stream Tag Tools
    :nosignatures:
 
    gnuradio.blocks.burst_tagger
+      :noindex:
    gnuradio.blocks.tag_debug
+      :noindex:
    gnuradio.blocks.tagged_file_sink
+      :noindex:
 
 Data Type Converters
 --------------------
@@ -326,11 +335,3 @@ Data Type Converters
    gnuradio.blocks.short_to_float
    gnuradio.blocks.uchar_to_float
 
-Waveform Generators
--------------------
-
-.. autosummary::
-   :nosignatures:
-
-   gnuradio.blocks.vco_f
-
diff --git a/docs/sphinx/source/filter/filter_blk.rst b/docs/sphinx/source/filter/filter_blk.rst
index 4fa3c8b058..5c85c6d00a 100644
--- a/docs/sphinx/source/filter/filter_blk.rst
+++ b/docs/sphinx/source/filter/filter_blk.rst
@@ -10,6 +10,7 @@ gnuradio.filter: Filters
 .. autoblock:: gnuradio.filter.filter_delay_fc
 .. autoblock:: gnuradio.filter.hilbert_fc
 .. autoblock:: gnuradio.filter.iir_filter_ffd
-.. autoblock:: gnuradio.filter.polyphase_filterbank
+.. autopyblock:: gnuradio.filter.analysis_filterbank
+.. autopyblock:: gnuradio.filter.synthesis_filterbank
 .. autoblock:: gnuradio.filter.single_pole_iir_filter_cc
 .. autoblock:: gnuradio.filter.single_pole_iir_filter_ff
diff --git a/docs/sphinx/source/filter/filter_design.rst b/docs/sphinx/source/filter/filter_design.rst
index ad1cd252da..4a78156c5d 100644
--- a/docs/sphinx/source/filter/filter_design.rst
+++ b/docs/sphinx/source/filter/filter_design.rst
@@ -1,4 +1,4 @@
 gnuradio.filter: Digital Filter Design
 ======================================
 
-.. autoblock:: gnuradio.filter.firdes
-\ No newline at end of file
+.. autoclass:: gnuradio.filter.firdes
diff --git a/docs/sphinx/source/filter/index.rst b/docs/sphinx/source/filter/index.rst
index 1b8649bd72..2f1be277ad 100644
--- a/docs/sphinx/source/filter/index.rst
+++ b/docs/sphinx/source/filter/index.rst
@@ -29,7 +29,8 @@ Filters
    gnuradio.filter.filter_delay_fc
    gnuradio.filter.hilbert_fc
    gnuradio.filter.iir_filter_ffd
-   gnuradio.filter.polyphase_filterbank
+   gnuradio.filter.analysis_filterbank
+   gnuradio.filter.synthesis_filterbank
    gnuradio.filter.single_pole_iir_filter_cc
    gnuradio.filter.single_pole_iir_filter_ff
 
diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst
index a4cd3dd7c6..ceafe7e80e 100644
--- a/docs/sphinx/source/index.rst
+++ b/docs/sphinx/source/index.rst
@@ -30,7 +30,7 @@ Core Framework
    :hidden:   
 
    gnuradio.gr <gr/index>
-   pmt <pmt>
+   pmt <pmt/index>
    gnuradio.blocks <blocks/index>
    gnuradio.analog <analog/index>
    gnuradio.digital <digital/index>
@@ -38,7 +38,7 @@ Core Framework
    gnuradio.channels <channels>
    gnuradio.comedi <comedi>
    gnuradio.fec <fec>
-   gnuradio.filter <filter>
+   gnuradio.filter <filter/index>
    gnuradio.gr_unittest <gr_unittest/index>
    gnuradio.trellis <trellis/index>
    gnuradio.wavelet <wavelet>
@@ -145,3 +145,8 @@ Framework Extensions
    analog_measurement <analog/measurement_tools_blk>
    analog_synchronizers <analog/synchronizers_blk>
    analog_modulators <analog/modulators_blk>
+   filter_channelizers <filter/channelizers_blk>
+   filter_resamplers <filter/resamplers_blk>
+   filter_blocks <filter/filter_blk>
+   filter_design <filter/filter_design>
+