merged documentation fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-02-17 22:56:39 +00:00
parent 71522f7f08
commit 907eca9ac3
2 changed files with 7 additions and 7 deletions

View File

@ -226,9 +226,9 @@ The ``session`` class has the following synopsis::
size_t queue_size_limit_); size_t queue_size_limit_);
void set_alert_dispatch(boost::function<void(std::auto_ptr<alert>)> const& fun); void set_alert_dispatch(boost::function<void(std::auto_ptr<alert>)> const& fun);
feed_handle session::add_feed(feed_settings const& feed); feed_handle add_feed(feed_settings const& feed);
void session::remove_feed(feed_handle h); void remove_feed(feed_handle h);
void session::get_feeds(std::vector<feed_handle>& f) const; void get_feeds(std::vector<feed_handle>& f) const;
void add_extension(boost::function< void add_extension(boost::function<
boost::shared_ptr<torrent_plugin>(torrent*)> ext); boost::shared_ptr<torrent_plugin>(torrent*)> ext);
@ -1208,7 +1208,7 @@ add_feed()
:: ::
feed_handle session::add_feed(feed_settings const& feed); feed_handle add_feed(feed_settings const& feed);
This adds an RSS feed to the session. The feed will be refreshed This adds an RSS feed to the session. The feed will be refreshed
regularly and optionally add all torrents from the feed, as they regularly and optionally add all torrents from the feed, as they
@ -1267,7 +1267,7 @@ remove_feed()
:: ::
void session::remove_feed(feed_handle h); void remove_feed(feed_handle h);
Removes a feed from being watched by the session. When this Removes a feed from being watched by the session. When this
call returns, the feed handle is invalid and won't refer call returns, the feed handle is invalid and won't refer
@ -1279,7 +1279,7 @@ get_feeds()
:: ::
void session::get_feeds(std::vector<feed_handle>& f) const; void get_feeds(std::vector<feed_handle>& f) const;
Returns a list of all RSS feeds that are being watched by the session. Returns a list of all RSS feeds that are being watched by the session.

View File

@ -1314,7 +1314,7 @@ namespace aux {
void session_impl::trigger_auto_manage() void session_impl::trigger_auto_manage()
{ {
if (m_pending_auto_manage) return; if (m_pending_auto_manage || m_abort) return;
m_pending_auto_manage = true; m_pending_auto_manage = true;
m_need_auto_manage = true; m_need_auto_manage = true;