11 files changed, 48 insertions, 48 deletions
diff --git a/docs/doxygen/other/pfb_intro.dox b/docs/doxygen/other/pfb_intro.dox
index 01d08b0fad..429e8fe5b6 100644
--- a/docs/doxygen/other/pfb_intro.dox
+++ b/docs/doxygen/other/pfb_intro.dox
@@ -91,6 +91,6 @@ channels.
 NOTE: you need the Scipy and Matplotlib Python modules installed to
 run this example.
 
-\include gnuradio-core/src/examples/pfb/channelize.py
+\include gr-filter/examples/channelize.py
 
 */
diff --git a/docs/sphinx/source/digital/blocks.rst b/docs/sphinx/source/digital/blocks.rst
index 68ec8dad1c..32eb25608b 100644
--- a/docs/sphinx/source/digital/blocks.rst
+++ b/docs/sphinx/source/digital/blocks.rst
@@ -17,6 +17,25 @@ gnuradio.digital: Signal Processing Blocks
 .. autooldblock:: gnuradio.digital.gmskmod_bc
 .. autooldblock:: gnuradio.digital.probe_mpsk_snr_est_c
 .. autooldblock:: gnuradio.digital.cpmmod_bc
+.. autooldblock:: gnuradio.digital.glfsr_source_b
+.. autooldblock:: gnuradio.digital.glfsr_source_f
+.. autooldblock:: gnuradio.digital.framer_sink_1
+.. autooldblock:: gnuradio.digital.framer_sink_1
+.. autooldblock:: gnuradio.digital.additive_scrambler_bb
+.. autooldblock:: gnuradio.digital.descrambler_bb
+.. autooldblock:: gnuradio.digital.diff_decoder_bb
+.. autooldblock:: gnuradio.digital.diff_encoder_bb
+.. autooldblock:: gnuradio.digital.map_bb
+.. autooldblock:: gnuradio.digital.scrambler_bb
+.. autooldblock:: gnuradio.digital.pn_correlator_cc
+.. autooldblock:: gnuradio.digital.simple_framer
+.. autooldblock:: gnuradio.digital.bytes_to_syms
+.. autooldblock:: gnuradio.digital.chunks_to_symbols_bc
+.. autooldblock:: gnuradio.digital.chunks_to_symbols_bf
+.. autooldblock:: gnuradio.digital.chunks_to_symbols_ic
+.. autooldblock:: gnuradio.digital.chunks_to_symbols_if
+.. autooldblock:: gnuradio.digital.chunks_to_symbols_sc
+.. autooldblock:: gnuradio.digital.chunks_to_symbols_sf
 .. autopyblock:: gnuradio.digital.generic_demod
 .. autopyblock:: gnuradio.digital.generic_mod
 .. autopyblock:: gnuradio.digital.bpsk.dbpsk_demod
diff --git a/docs/sphinx/source/digital/index.rst b/docs/sphinx/source/digital/index.rst
index da5227e455..14c84fe4bb 100644
--- a/docs/sphinx/source/digital/index.rst
+++ b/docs/sphinx/source/digital/index.rst
@@ -25,6 +25,24 @@ Signal Processing Blocks
    gnuradio.digital.gmskmod_bc
    gnuradio.digital.probe_mpsk_snr_est_c
    gnuradio.digital.cpmmod_bc
+   gnuradio.digital.glfsr_source_b
+   gnuradio.digital.glfsr_source_f
+   gnuradio.digital.framer_sink_1
+   gnuradio.digital.additive_scrambler_bb
+   gnuradio.digital.descrambler_bb
+   gnuradio.digital.diff_decoder_bb
+   gnuradio.digital.diff_encoder_bb
+   gnuradio.digital.map_bb
+   gnuradio.digital.scrambler_bb
+   gnuradio.digital.pn_correlator_cc
+   gnuradio.digital.simple_framer
+   gnuradio.digital.bytes_to_syms
+   gnuradio.digital.chunks_to_symbols_bc
+   gnuradio.digital.chunks_to_symbols_bf
+   gnuradio.digital.chunks_to_symbols_ic
+   gnuradio.digital.chunks_to_symbols_if
+   gnuradio.digital.chunks_to_symbols_sc
+   gnuradio.digital.chunks_to_symbols_sf
    gnuradio.digital.generic_demod
    gnuradio.digital.generic_mod
    gnuradio.digital.bpsk.dbpsk_demod
@@ -83,8 +101,6 @@ Modulation Utilties
    :nosignatures:
 
    gnuradio.digital.utils.gray_code.gray_code
-   gnuradio.digital.utils.mod_codes.GRAY_CODE
-   gnuradio.digital.utils.mod_codes.NO_CODE
    gnuradio.digital.modulation_utils.add_type_1_constellation
    gnuradio.digital.modulation_utils.add_type_1_demod
    gnuradio.digital.modulation_utils.add_type_1_mod
@@ -92,6 +108,9 @@ Modulation Utilties
    gnuradio.digital.modulation_utils.type_1_demods
    gnuradio.digital.modulation_utils.type_1_mods
 
+.. gnuradio.digital.utils.mod_codes.GRAY_CODE
+.. gnuradio.digital.utils.mod_codes.NO_CODE
+
 Packet Utilities
 ----------------
 
diff --git a/docs/sphinx/source/gr/coding_blk.rst b/docs/sphinx/source/gr/coding_blk.rst
index e50b990bcd..da8cacf2b4 100644
--- a/docs/sphinx/source/gr/coding_blk.rst
+++ b/docs/sphinx/source/gr/coding_blk.rst
@@ -1,11 +1,5 @@
 gnuradio.gr: Information Coding and Decoding
 ============================================
 
-.. autooldblock:: gnuradio.gr.additive_scrambler_bb
-.. autooldblock:: gnuradio.gr.descrambler_bb
-.. autooldblock:: gnuradio.gr.diff_decoder_bb
-.. autooldblock:: gnuradio.gr.diff_encoder_bb
 .. autooldblock:: gnuradio.gr.fake_channel_encoder_pp
 .. autooldblock:: gnuradio.gr.fake_channel_decoder_pp
-.. autooldblock:: gnuradio.gr.map_bb
-.. autooldblock:: gnuradio.gr.scrambler_bb
diff --git a/docs/sphinx/source/gr/converter_blk.rst b/docs/sphinx/source/gr/converter_blk.rst
index 790109a94f..4ae469c2ac 100644
--- a/docs/sphinx/source/gr/converter_blk.rst
+++ b/docs/sphinx/source/gr/converter_blk.rst
@@ -1,7 +1,6 @@
 gnuradio.gr: Type Conversions
 =============================
 
-.. autooldblock:: gnuradio.gr.bytes_to_syms
 .. autooldblock:: gnuradio.gr.char_to_float
 .. autooldblock:: gnuradio.gr.complex_to_interleaved_short
 .. autooldblock:: gnuradio.gr.complex_to_float
@@ -18,12 +17,6 @@ gnuradio.gr: Type Conversions
 .. autooldblock:: gnuradio.gr.short_to_float
 .. autooldblock:: gnuradio.gr.uchar_to_float
 .. autooldblock:: gnuradio.gr.unpack_k_bits_bb
-.. autooldblock:: gnuradio.gr.chunks_to_symbols_bc
-.. autooldblock:: gnuradio.gr.chunks_to_symbols_bf
-.. autooldblock:: gnuradio.gr.chunks_to_symbols_ic
-.. autooldblock:: gnuradio.gr.chunks_to_symbols_if
-.. autooldblock:: gnuradio.gr.chunks_to_symbols_sc
-.. autooldblock:: gnuradio.gr.chunks_to_symbols_sf
 .. autooldblock:: gnuradio.gr.packed_to_unpacked_bb
 .. autooldblock:: gnuradio.gr.packed_to_unpacked_ii
 .. autooldblock:: gnuradio.gr.packed_to_unpacked_ss
diff --git a/docs/sphinx/source/gr/index.rst b/docs/sphinx/source/gr/index.rst
index 3d32599f1d..53ceba08e7 100644
--- a/docs/sphinx/source/gr/index.rst
+++ b/docs/sphinx/source/gr/index.rst
@@ -21,8 +21,6 @@ Signal Sources
 .. autosummary::
    :nosignatures:
 
-   gnuradio.gr.glfsr_source_b
-   gnuradio.gr.glfsr_source_f
    gnuradio.gr.lfsr_32k_source_s
    gnuradio.gr.null_source
    gnuradio.gr.noise_source_c
@@ -53,9 +51,7 @@ Signal Sinks
    gnuradio.gr.bin_statistics_f
    gnuradio.gr.check_counting_s
    gnuradio.gr.check_lfsr_32k_s
-   gnuradio.gr.framer_sink_1
    gnuradio.gr.null_sink
-   gnuradio.gr.packet_sink
    gnuradio.gr.probe_avg_mag_sqrd_c
    gnuradio.gr.probe_avg_mag_sqrd_cf
    gnuradio.gr.probe_avg_mag_sqrd_f
@@ -210,14 +206,8 @@ Information Coding and Decoding
 .. autosummary::
    :nosignatures:
 
-   gnuradio.gr.additive_scrambler_bb
-   gnuradio.gr.descrambler_bb
-   gnuradio.gr.diff_decoder_bb
-   gnuradio.gr.diff_encoder_bb
    gnuradio.gr.fake_channel_encoder_pp
    gnuradio.gr.fake_channel_decoder_pp
-   gnuradio.gr.map_bb
-   gnuradio.gr.scrambler_bb
 
 Synchronization
 ^^^^^^^^^^^^^^^
@@ -228,9 +218,7 @@ Synchronization
    gnuradio.gr.pll_carriertracking_cc
    gnuradio.gr.pll_freqdet_cf
    gnuradio.gr.pll_refout_cc
-   gnuradio.gr.pn_correlator_cc
    gnuradio.gr.simple_correlator
-   gnuradio.gr.simple_framer
 
 Type Conversions
 ^^^^^^^^^^^^^^^^
@@ -238,7 +226,6 @@ Type Conversions
 .. autosummary::
    :nosignatures:
 
-   gnuradio.gr.bytes_to_syms
    gnuradio.gr.char_to_float
    gnuradio.gr.complex_to_interleaved_short
    gnuradio.gr.complex_to_float
@@ -255,12 +242,6 @@ Type Conversions
    gnuradio.gr.short_to_float
    gnuradio.gr.uchar_to_float
    gnuradio.gr.unpack_k_bits_bb
-   gnuradio.gr.chunks_to_symbols_bc
-   gnuradio.gr.chunks_to_symbols_bf
-   gnuradio.gr.chunks_to_symbols_ic
-   gnuradio.gr.chunks_to_symbols_if
-   gnuradio.gr.chunks_to_symbols_sc
-   gnuradio.gr.chunks_to_symbols_sf
    gnuradio.gr.packed_to_unpacked_bb
    gnuradio.gr.packed_to_unpacked_ii
    gnuradio.gr.packed_to_unpacked_ss
diff --git a/docs/sphinx/source/gr/sink_blk.rst b/docs/sphinx/source/gr/sink_blk.rst
index 7608ff09b0..80b66370c5 100644
--- a/docs/sphinx/source/gr/sink_blk.rst
+++ b/docs/sphinx/source/gr/sink_blk.rst
@@ -4,9 +4,7 @@ gnuradio.gr: Signal Sinks
 .. autooldblock:: gnuradio.gr.bin_statistics_f
 .. autooldblock:: gnuradio.gr.check_counting_s
 .. autooldblock:: gnuradio.gr.check_lfsr_32k_s
-.. autooldblock:: gnuradio.gr.framer_sink_1
 .. autooldblock:: gnuradio.gr.null_sink
-.. autooldblock:: gnuradio.gr.packet_sink
 .. autooldblock:: gnuradio.gr.probe_avg_mag_sqrd_c
 .. autooldblock:: gnuradio.gr.probe_avg_mag_sqrd_cf
 .. autooldblock:: gnuradio.gr.probe_avg_mag_sqrd_f
diff --git a/docs/sphinx/source/gr/source_blk.rst b/docs/sphinx/source/gr/source_blk.rst
index df873bcf74..c3e30c17b7 100644
--- a/docs/sphinx/source/gr/source_blk.rst
+++ b/docs/sphinx/source/gr/source_blk.rst
@@ -1,8 +1,6 @@
 gnuradio.gr: Signal Sources
 ===========================
 
-.. autooldblock:: gnuradio.gr.glfsr_source_b
-.. autooldblock:: gnuradio.gr.glfsr_source_f
 .. autooldblock:: gnuradio.gr.lfsr_32k_source_s
 .. autooldblock:: gnuradio.gr.null_source
 .. autooldblock:: gnuradio.gr.noise_source_c
diff --git a/docs/sphinx/source/gr/sync_blk.rst b/docs/sphinx/source/gr/sync_blk.rst
index be9f908f73..b4875bdbdc 100644
--- a/docs/sphinx/source/gr/sync_blk.rst
+++ b/docs/sphinx/source/gr/sync_blk.rst
@@ -4,6 +4,4 @@ gnuradio.gr: Synchronization
 .. autooldblock:: gnuradio.gr.pll_carriertracking_cc
 .. autooldblock:: gnuradio.gr.pll_freqdet_cf
 .. autooldblock:: gnuradio.gr.pll_refout_cc
-.. autooldblock:: gnuradio.gr.pn_correlator_cc
 .. autooldblock:: gnuradio.gr.simple_correlator
-.. autooldblock:: gnuradio.gr.simple_framer
diff --git a/docs/sphinx/source/qtgui/index.rst b/docs/sphinx/source/qtgui/index.rst
index 83bdedca89..c6311d381a 100644
--- a/docs/sphinx/source/qtgui/index.rst
+++ b/docs/sphinx/source/qtgui/index.rst
@@ -3,7 +3,7 @@ gnuradio.qtgui
 
 .. automodule:: gnuradio.qtgui
 
-.. autooldblock:: gnuradio.qtgui.sink_c
-.. autooldblock:: gnuradio.qtgui.sink_f
-.. autooldblock:: gnuradio.qtgui.time_sink_c
-.. autooldblock:: gnuradio.qtgui.time_sink_f
+.. autoblock:: gnuradio.qtgui.sink_c
+.. autoblock:: gnuradio.qtgui.sink_f
+.. autoblock:: gnuradio.qtgui.time_sink_c
+.. autoblock:: gnuradio.qtgui.time_sink_f
diff --git a/docs/sphinx/source/wavelet.rst b/docs/sphinx/source/wavelet.rst
index 5236c4dbb2..679bab70c0 100644
--- a/docs/sphinx/source/wavelet.rst
+++ b/docs/sphinx/source/wavelet.rst
@@ -3,6 +3,6 @@ gnuradio.wavelet
 
 .. automodule:: gnuradio.wavelet
 
-.. autooldblock:: gnuradio.wavelet.squash_ff
-.. autooldblock:: gnuradio.wavelet.wavelet_ff
-.. autooldblock:: gnuradio.wavelet.wvps_ff
+.. autoblock:: gnuradio.wavelet.squash_ff
+.. autoblock:: gnuradio.wavelet.wavelet_ff
+.. autoblock:: gnuradio.wavelet.wvps_ff