diff --git a/README.md b/README.md index d456127a..6aa7ed19 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ run (context switching). A context switch between threads costs usally thousends of CPU cycles on x86 compared to a fiber switch with less than 100 cycles. A fiber can only run on a single thread at any point in time. -Buiding: Detailed instructions can be found at https://svn.boost.org/trac/boost/wiki/TryModBoost. +Building: Detailed instructions can be found at https://svn.boost.org/trac/boost/wiki/TryModBoost. diff --git a/doc/attributes.qbk b/doc/attributes.qbk index 09c55eda..1a687a25 100644 --- a/doc/attributes.qbk +++ b/doc/attributes.qbk @@ -7,7 +7,7 @@ [section:attributes Attributes] -Class `attributes` is used to transfers parameters required to setup a +Class `attributes` is used to transfer parameters required to setup a fibers's context. struct attributes @@ -56,7 +56,7 @@ and FPU registers are preserved.]] [heading `attributes( flag_fpu_t preserve_fpu)`] [variablelist -[[Effects:] [Argument `preserve_fpu` determines if FPU register have to be +[[Effects:] [Argument `preserve_fpu` determines if FPU registers have to be preserved if a `context` switches. The default stacksize is used for the inner `context` and the stack will be unwound after termination.]] [[Throws:] [Nothing.]] diff --git a/doc/future.qbk b/doc/future.qbk index 86628ac4..74a52427 100644 --- a/doc/future.qbk +++ b/doc/future.qbk @@ -28,7 +28,7 @@ Timed wait-operations (__wait_for__ and __wait_until__) return the state of the [heading `timeout`] [variablelist -[[Effects:] [The shared state did not become ready before timout has passed.]] +[[Effects:] [The shared state did not become ready before timeout has passed.]] ] [heading `deferred`] @@ -158,7 +158,7 @@ After construction is `false == other.valid()`]] [variablelist [[Effects:] [Move the state to a __shared_future__.]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [member_heading future..get] @@ -169,7 +169,7 @@ After construction is `false == other.valid()`]] [[Precondition:] [`true == valid()`]] [[Effects:] [Returns the result.]] [[Postcondition:] [`false == valid()`]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [member_heading future..wait] @@ -178,7 +178,7 @@ After construction is `false == other.valid()`]] [variablelist [[Effects:] [Waits for the result will become available.]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [template_member_heading future..wait_for] @@ -189,7 +189,7 @@ After construction is `false == other.valid()`]] [variablelist [[Effects:] [Waits for the result will become available or `timeout_duration` has passed.]] [[Result:] [A `future_status` is returned indicating the reason for returning.]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [member_heading future..wait_until] @@ -199,7 +199,7 @@ After construction is `false == other.valid()`]] [variablelist [[Effects:] [Waits for the result will become available or `timeout_time` has passed.]] [[Result:] [A `future_status` is returned indicating the reason for returning.]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] @@ -345,7 +345,7 @@ return * this; [[Precondition:] [`true == valid()`]] [[Effects:] [Returns the result.]] [[Postcondition:] [`false == valid()`]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [member_heading shared_future..wait] @@ -354,7 +354,7 @@ return * this; [variablelist [[Effects:] [Waits for the result will become available.]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [template_member_heading shared_future..wait_for] @@ -365,7 +365,7 @@ return * this; [variablelist [[Effects:] [Waits for the result will become available or `timeout_duration` has passed.]] [[Result:] [A `future_status` is returned indicating the reason for returning.]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [member_heading shared_future..wait_until] @@ -375,7 +375,7 @@ return * this; [variablelist [[Effects:] [Waits for the result will become available or `timeout_time` has passed.]] [[Result:] [A `future_status` is returned indicating the reason for returning.]] -[[Throws:] [__future_error__ with error condtion __no_state__.]] +[[Throws:] [__future_error__ with error condition __no_state__.]] ] [endsect] diff --git a/examples/asio/publish_subscribe/server.cpp b/examples/asio/publish_subscribe/server.cpp index 91496264..5c93a23b 100644 --- a/examples/asio/publish_subscribe/server.cpp +++ b/examples/asio/publish_subscribe/server.cpp @@ -87,7 +87,7 @@ private: if ( channels_.end() == channels_.find( channel) ) throw std::runtime_error("channel does not exist"); channels_.find( channel)->second->subscribe( s); - std::cout << "new subscribtion to channel '" << channel << "'" << std::endl; + std::cout << "new subscription to channel '" << channel << "'" << std::endl; } void unsubscribe_( std::string const& channel, boost::shared_ptr< subscriber_session > s) diff --git a/examples/asio/publish_subscribe/subscriber.cpp b/examples/asio/publish_subscribe/subscriber.cpp index 9aa1c5eb..34373a9f 100644 --- a/examples/asio/publish_subscribe/subscriber.cpp +++ b/examples/asio/publish_subscribe/subscriber.cpp @@ -26,7 +26,7 @@ int main(int argc, char* argv[]) { if (argc != 3) { - std::cerr << "Usage: subscriper \n"; + std::cerr << "Usage: subscriber \n"; return 1; } diff --git a/include/boost/fiber/asio/spawn.hpp b/include/boost/fiber/asio/spawn.hpp index cf1340a8..01ada7ef 100644 --- a/include/boost/fiber/asio/spawn.hpp +++ b/include/boost/fiber/asio/spawn.hpp @@ -151,7 +151,7 @@ typedef basic_yield_context< * This function is used to launch a new fiber. * * @param handler A handler to be called when the fiber exits. More - * importantly, the handler provides an execution context (via the the handler + * importantly, the handler provides an execution context (via the handler * invocation hook) for the fiber. The handler must have the signature: * @code void handler(); @endcode *