Merge branch 'maint'

Author: jmcorgan

docs/doxygen/other/stream_tags.dox

@@ -201,7 +201,7 @@ would have to use the TPP_DONT tag propagation policy and handle the
 propagation internally.
 
 In no case is the value of the tag modified when propagating through a
-block. This becomes relevent when using \ref page_tagged_stream_blocks.
+block. This becomes relevant when using \ref page_tagged_stream_blocks.
 
 \section stream_tags_issues Notes on How to Use Tags
 

gnuradio-runtime/include/gnuradio/block.h

@@ -171,7 +171,7 @@ namespace gr {
      * \brief Called to enable drivers, etc for i/o devices.
      *
      * This allows a block to enable an associated driver to begin
-     * transfering data just before we start to execute the scheduler.
+     * transferring data just before we start to execute the scheduler.
      * The end result is that this reduces latency in the pipeline
      * when dealing with audio devices, usrps, etc.
      */
@@ -343,7 +343,7 @@ namespace gr {
      *
      * Use this value to clear the 'is_set' flag so the scheduler will
      * ignore this. Use the set_max_noutput_items(m) call to both set
-     * a new value for max_noutput_items and to reenable its use in
+     * a new value for max_noutput_items and to re-enable its use in
      * the scheduler.
      */
     void unset_max_noutput_items();
@@ -411,7 +411,7 @@ namespace gr {
     long min_output_buffer(size_t i);
 
     /*!
-     * \brief Request limit on the mininum buffer size on all output
+     * \brief Request limit on the minimum buffer size on all output
      * ports.
      *
      * \details

gnuradio-runtime/lib/tpb_thread_body.cc

@@ -152,7 +152,7 @@ namespace gr {
           while(!d->d_tpb.input_changed && block->empty_handled_p()){
             boost::system_time const timeout=boost::get_system_time()+ boost::posix_time::milliseconds(250);
             if(!d->d_tpb.input_cond.timed_wait(guard, timeout)){
-              goto tpb_loop_top; // timeout occured (perform sanity checks up top)
+              goto tpb_loop_top; // timeout occurred (perform sanity checks up top)
             }
           }
 

gr-analog/include/gnuradio/analog/phase_modulator_fc.h

@@ -37,7 +37,7 @@ namespace gr {
      * output = complex(cos(in*sensitivity), sin(in*sensitivity))
      *
      * Input stream 0: floats
-     * Ouput stream 0: complex
+     * Output stream 0: complex
      */
     class ANALOG_API phase_modulator_fc : virtual public sync_block
     {

gr-atsc/lib/qa_atsci_fake_single_viterbi.cc

@@ -82,7 +82,7 @@ qa_atsci_fake_single_viterbi::t0 ()
 
   // printf ("  Delay is %d.\n", delay);
 
-  srandom (27);		// reproducable sequence of "random" values
+  srandom (27);		// reproducible sequence of "random" values
 
   for (int nt = 0; nt < NTRIALS; nt++){
 
@@ -143,4 +143,3 @@ qa_atsci_fake_single_viterbi::t0 ()
 
   CPPUNIT_ASSERT (decoder_errors == 0);
 }
-

gr-atsc/lib/qa_atsci_single_viterbi.cc

@@ -79,7 +79,7 @@ qa_atsci_single_viterbi::t0 ()
 
   // printf ("  Delay is %d.\n", delay);
 
-  srandom (27);		// reproducable sequence of "random" values
+  srandom (27);		// reproducible sequence of "random" values
 
   for (int nt = 0; nt < NTRIALS; nt++){
 
@@ -157,7 +157,7 @@ qa_atsci_single_viterbi::t1 ()
 
   // printf ("  Delay is %d.\n", delay);
 
-  srandom (1);		// reproducable sequence of "random" values
+  srandom (1);		// reproducible sequence of "random" values
 
   for (int nt = 0; nt < NTRIALS; nt++){
 

gr-audio/lib/osx/osx_source.cc

@@ -436,7 +436,7 @@ namespace gr {
 	 kAudioUnitScope_Output, 1,
 	 &d_asbd_client, prop_size);
       check_error_and_throw
-	(err, "Set Device Ouput Stream Format failed",
+	(err, "Set Device Output Stream Format failed",
 	 "audio_osx_source::setup");
 
       // Get the Stream Format (client side), again

gr-blocks/include/gnuradio/blocks/endian_swap.h

@@ -30,7 +30,7 @@ namespace gr {
   namespace blocks {
 
     /*!
-     * \brief Convert stream of items into thier byte swapped version
+     * \brief Convert stream of items into their byte swapped version
      * \ingroup stream_operators_blk
      */
     class BLOCKS_API endian_swap : virtual public sync_block

gr-blocks/include/gnuradio/blocks/pack_k_bits.h

@@ -32,7 +32,7 @@ namespace gr {
 
       /*!
        * \brief Converts a vector of bytes with 1 bit in the LSB to a
-       * byte with k relevent bits.
+       * byte with k relevant bits.
        *
        * Example:
        * k = 4

gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h

@@ -31,7 +31,7 @@ namespace gr {
 
     /*!
      * \brief Converts a stream of bytes with 1 bit in the LSB to a
-     * byte with k relevent bits.
+     * byte with k relevant bits.
      *
      * This block takes in K bytes at a time, and uses the least significant
      * bit to form a new byte.

gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t

@@ -56,7 +56,7 @@ namespace gr {
        * \param threshold_factor_fall The threshold factor determins
        *        when a peak has ended. An average of the signal is
        *        calculated and when the value of the signal goes
-       *        bellow threshold_factor_fall*average, we stop looking
+       *        below threshold_factor_fall*average, we stop looking
        *        for a peak.
        * \param look_ahead The look-ahead value is used when the
        *        threshold is found to look if there another peak

gr-blocks/include/gnuradio/blocks/unpack_k_bits.h

@@ -31,7 +31,7 @@ namespace gr {
     namespace kernel {
 
       /*!
-       * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
+       * \brief Converts a byte with k relevant bits to k output bytes with 1 bit in the LSB.
        *
        * This is the algorithm kernel for the gr::blocks::unpack_k_bits_bb block.
        *

gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h

@@ -30,7 +30,7 @@ namespace gr {
   namespace blocks {
 
     /*!
-     * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
+     * \brief Converts a byte with k relevant bits to k output bytes with 1 bit in the LSB.
      *
      * This block picks the K least significant bits from a byte, and expands
      * them into K bytes of 0 or 1.

gr-blocks/lib/tagged_file_sink_impl.cc

@@ -137,7 +137,7 @@ namespace gr {
 		double tfrac = pmt::to_double(pmt::tuple_ref(time, 1));
 
 		// Get new time from last time tag + difference in time to when
-		// burst tag occured based on the sample rate
+		// burst tag occurred based on the sample rate
 		double delta = (double)(N - time_nitems) / d_sample_rate;
 		d_timeval = (double)tsecs + tfrac + delta;
 

gr-channels/include/gnuradio/channels/channel_model.h

@@ -42,7 +42,7 @@ namespace gr {
      * This model allows the user to set the voltage of an AWGN noise
      * source (\p noise_voltage), a (normalized) frequency offset (\p
      * frequency_offset), a sample timing offset (\p epsilon), and a
-     * seed (\p noise_seed) to randomize or make reproducable the AWGN
+     * seed (\p noise_seed) to randomize or make reproducible the AWGN
      * noise source.
      *
      * Multipath can be approximated in this model by using a FIR

gr-digital/include/gnuradio/digital/fll_band_edge_cc.h

@@ -107,7 +107,7 @@ namespace gr {
        * \brief Set the number of samples per symbol
        *
        * Set's the number of samples per symbol the system should
-       * use. This value is uesd to calculate the filter taps and will
+       * use. This value is used to calculate the filter taps and will
        * force a recalculation.
        *
        * \param sps    (float) new samples per symbol

gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h

@@ -45,7 +45,7 @@ namespace gr {
      * e[n] = d[n] - y[n]
      * w[n+1] = w[n] + mu u[n] conj(e[n])
      *
-     * Where mu is a gain value (between 0 and 1 and usualy small,
+     * Where mu is a gain value (between 0 and 1 and usually small,
      * around 0.001 - 0.01.
      *
      * This block uses the digital_constellation object for making the

gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h

@@ -196,7 +196,7 @@ namespace gr {
        * differential filterbank.
        *
        * WARNING: this should not be used externally and will be moved
-       * to a private funtion in the next API.
+       * to a private function in the next API.
        */
       virtual void set_taps(const std::vector<float> &taps,
 			    std::vector< std::vector<float> > &ourtaps,

gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h

@@ -196,7 +196,7 @@ namespace gr {
        * differential filterbank.
        *
        * WARNING: this should not be used externally and will be moved
-       * to a private funtion in the next API.
+       * to a private function in the next API.
        */
       virtual void set_taps(const std::vector<float> &taps,
 			    std::vector< std::vector<float> > &ourtaps,

gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h

@@ -54,7 +54,7 @@ namespace gr {
        * \brief Create an Inner coder with Puncturing.
        *
        * \param ninput length of input. \n
-       * \param noutput lenght of output. \n
+       * \param noutput length of output. \n
        * \param constellation type of constellation. \n
        * \param hierarchy type of hierarchy used. \n
        * \param coderate coderate used.

gr-fec/include/gnuradio/fec/async_decoder.h

@@ -87,7 +87,7 @@ namespace gr {
        * \param my_decoder An FECAPI decoder object child of the generic_decoder class.
        * \param packed Sets output to packed bytes if true; otherwise, 1 bit per byte.
        * \param rev_pack If packing bits, should they be reversed?
-       * \param mtu The Maxium Transmission Unit (MTU) of the output
+       * \param mtu The Maximum Transmission Unit (MTU) of the output
        *            frame that the block will be able to
        *            process. Specified in bytes and defaults to 1500.
        */

gr-fec/include/gnuradio/fec/async_encoder.h

@@ -82,7 +82,7 @@ namespace gr {
        * \param packed True if working on packed bytes (like PDUs).
        * \param rev_unpack Reverse the unpacking order from input bytes to bits.
        * \param rev_pack Reverse the packing order from bits to output bytes.
-       * \param mtu The Maxium Transmission Unit (MTU) of the input
+       * \param mtu The Maximum Transmission Unit (MTU) of the input
        *            frame that the block will be able to
        *            process. Specified in bytes and defaults to 1500.
        */

gr-fec/include/gnuradio/fec/ber_bf.h

@@ -53,7 +53,7 @@ namespace gr {
      * berminerrors are observed and then produces a BER
      * calculation. The parameter \p ber_limit helps make sure that
      * the simulation is controlled. If the BER calculation drops
-     * bellow the \p ber_limit setting, the block will exit and simply
+     * below the \p ber_limit setting, the block will exit and simply
      * return the set limit; the real BER is therefore some amount
      * lower than this.
      *

gr-fec/include/gnuradio/fec/tagged_decoder.h

@@ -76,7 +76,7 @@ namespace gr {
        * \param input_item_size The size of the input items (often the my_decoder object can tell us this).
        * \param output_item_size The size of the output items (often the my_decoder object can tell us this).
        * \param lengthtagname Key name of the tagged stream frame size.
-       * \param mtu The Maxium Transmission Unit (MTU) of the output
+       * \param mtu The Maximum Transmission Unit (MTU) of the output
        *            frame that the block will be able to
        *            process. Specified in bytes and defaults to 1500.
        */

gr-fec/include/gnuradio/fec/tagged_encoder.h

@@ -56,7 +56,7 @@ namespace gr {
        * \param input_item_size size of a block of data for the encoder.
        * \param output_item_size size of a block of data the encoder will produce.
        * \param lengthtagname Key name of the tagged stream frame size.
-       * \param mtu The Maxium Transmission Unit (MTU) of the input
+       * \param mtu The Maximum Transmission Unit (MTU) of the input
        *            frame that the block will be able to
        *            process. Specified in bytes and defaults to 1500.
        */

gr-filter/include/gnuradio/filter/fft_filter_ccc.h

@@ -36,7 +36,7 @@ namespace gr {
      * \details
      * This block implements a complex decimating filter using the
      * fast convolution method via an FFT. The decimation factor is an
-     * interger that is greater than or equal to 1.
+     * integer that is greater than or equal to 1.
      *
      * The filter takes a set of complex (or real) taps to use in the
      * filtering operation. These taps can be defined as anything that

gr-filter/include/gnuradio/filter/fft_filter_ccf.h

@@ -36,7 +36,7 @@ namespace gr {
      * \details
      * This block implements a complex decimating filter using the
      * fast convolution method via an FFT. The decimation factor is an
-     * interger that is greater than or equal to 1.
+     * integer that is greater than or equal to 1.
      *
      * The filter takes a set of complex (or real) taps to use in the
      * filtering operation. These taps can be defined as anything that

gr-filter/include/gnuradio/filter/fft_filter_fff.h

@@ -36,7 +36,7 @@ namespace gr {
      * \details
      * This block implements a real-value decimating filter using the
      * fast convolution method via an FFT. The decimation factor is an
-     * interger that is greater than or equal to 1.
+     * integer that is greater than or equal to 1.
      *
      * The filter takes a set of real-valued taps to use in the
      * filtering operation. These taps can be defined as anything that

gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h

@@ -50,7 +50,7 @@ namespace gr {
       typedef boost::shared_ptr<pfb_arb_resampler_ccc> sptr;
 
       /*!
-       * Build the polyphase filterbank arbitray resampler.
+       * Build the polyphase filterbank arbitrary resampler.
        * \param rate  (float) Specifies the resampling rate to use
        * \param taps  (vector/list of complex) The prototype filter to populate the filterbank. The taps
        *              should be generated at the filter_size sampling rate.

gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h

@@ -50,7 +50,7 @@ namespace gr {
       typedef boost::shared_ptr<pfb_arb_resampler_ccf> sptr;
 
       /*!
-       * Build the polyphase filterbank arbitray resampler.
+       * Build the polyphase filterbank arbitrary resampler.
        * \param rate  (float) Specifies the resampling rate to use
        * \param taps  (vector/list of floats) The prototype filter to populate the filterbank. The taps
        *              should be generated at the filter_size sampling rate.

gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h

@@ -99,7 +99,7 @@ namespace gr {
       typedef boost::shared_ptr<pfb_arb_resampler_fff> sptr;
 
       /*!
-       * Build the polyphase filterbank arbitray resampler.
+       * Build the polyphase filterbank arbitrary resampler.
        * \param rate  (float) Specifies the resampling rate to use
        * \param taps  (vector/list of floats) The prototype filter to populate the filterbank. The taps
        *                                      should be generated at the filter_size sampling rate.

gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h

@@ -50,7 +50,7 @@ namespace gr {
      * filter has the same number of taps.
      *
      * Each filter operates using the gr::blocks::fir_filter_XXX
-     * classs of GNU Radio, which takes the input stream at <EM>i</EM>
+     * class of GNU Radio, which takes the input stream at <EM>i</EM>
      * and performs the inner product calculation to <EM>i+(n-1)</EM>
      * where <EM>n</EM> is the number of filter taps. To efficiently
      * handle this in the GNU Radio structure, each filter input must

gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h

@@ -36,7 +36,7 @@ namespace gr {
      * \ingroup channelizers_blk
      *
      * \details
-     * This block takes in a signal stream and performs interger down-
+     * This block takes in a signal stream and performs integer down-
      * sampling (decimation) with a polyphase filterbank. The first
      * input is the integer specifying how much to decimate by. The
      * second input is a vector (Python list) of floating-point taps

gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h

@@ -36,7 +36,7 @@ namespace gr {
      * \ingroup channelizers_blk
      *
      * \details
-     * This block takes in a signal stream and performs interger up-
+     * This block takes in a signal stream and performs integer up-
      * sampling (interpolation) with a polyphase filterbank. The first
      * input is the integer specifying how much to interpolate by. The
      * second input is a vector (Python list) of floating-point taps

gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h

@@ -37,7 +37,7 @@ namespace gr {
      *
      * \details
      *
-     * The PFB sythesis filterbank combines multiple baseband signals
+     * The PFB synthesis filterbank combines multiple baseband signals
      * into a single channelized signal. Each input stream is,
      * essentially, modulated onto an output channel according the the
      * channel mapping (see set_channel_map for details).

gr-filter/include/gnuradio/filter/pm_remez.h

@@ -36,8 +36,8 @@ namespace gr {
      *
      * \details
      * Calculates the optimal (in the Chebyshev/minimax sense) FIR
-     * filter inpulse reponse given a set of band edges, the desired
-     * reponse on those bands, and the weight given to the error in
+     * filter inpulse response given a set of band edges, the desired
+     * response on those bands, and the weight given to the error in
      * those bands.
      *
      * \param order         filter order (number of taps in the returned filter - 1)

gr-filter/include/gnuradio/filter/polyphase_filterbank.h

@@ -55,7 +55,7 @@ namespace gr {
        * number of taps.
        *
        * Each filter operates using the gr::filter::fir_filter_XXX
-       * classs of GNU Radio, which takes the input stream at
+       * class of GNU Radio, which takes the input stream at
        * <EM>i</EM> and performs the inner product calculation to
        * <EM>i+(n-1)</EM> where <EM>n</EM> is the number of filter
        * taps. To efficiently handle this in the GNU Radio structure,

gr-filter/lib/pm_remez.cc

@@ -575,7 +575,7 @@ namespace gr {
      *=======
      * Calculates the optimal (in the Chebyshev/minimax sense)
      * FIR filter impulse response given a set of band edges,
-     * the desired reponse on those bands, and the weight given to
+     * the desired response on those bands, and the weight given to
      * the error in those bands.
      *
      * INPUT:

gr-uhd/include/gnuradio/uhd/usrp_block.h

@@ -393,7 +393,7 @@ namespace gr {
       virtual ::uhd::time_spec_t get_time_now(size_t mboard = 0) = 0;
 
       /*!
-       * Get the time when the last pps pulse occured.
+       * Get the time when the last pps pulse occurred.
        * \param mboard the motherboard index 0 to M-1
        * \return the current usrp time
        */

gr-utils/python/utils/gr_plot_qt

@@ -26,7 +26,7 @@ except ImportError:
     raise SystemExit, 1
 
 try:
-    # FIXME: reenable this before committing
+    # FIXME: re-enable this before committing
     #from gnuradio.pyqt_plot import Ui_MainWindow
     from gnuradio.pyqt_plot import Ui_MainWindow
 except ImportError: