From 146671e8d773a810a08ce0e67eda02c9b4d6e40c Mon Sep 17 00:00:00 2001 From: Steven Watanabe Date: Thu, 14 Feb 2013 19:06:34 +0000 Subject: [PATCH] Apply patch for documentation typos. Fixes #5955. [SVN r82888] --- doc/bimap_and_boost.qbk | 2 +- doc/compiler_specifics.qbk | 2 +- doc/history.qbk | 4 ++-- doc/html/boost_bimap/bimap_and_boost.html | 2 +- doc/html/boost_bimap/compiler_specifics.html | 6 +++--- doc/html/boost_bimap/history.html | 4 ++-- doc/html/boost_bimap/one_minute_tutorial.html | 4 ++-- .../the_tutorial/bimaps_with_user_defined_names.html | 2 +- .../the_tutorial/complete_instantiation_scheme.html | 2 +- .../the_tutorial/controlling_collection_types.html | 8 ++++---- doc/html/index.html | 2 +- doc/quick_tutorial.qbk | 4 ++-- doc/tutorial.qbk | 12 ++++++------ 13 files changed, 27 insertions(+), 27 deletions(-) mode change 100755 => 100644 doc/compiler_specifics.qbk mode change 100755 => 100644 doc/quick_tutorial.qbk mode change 100755 => 100644 doc/tutorial.qbk diff --git a/doc/bimap_and_boost.qbk b/doc/bimap_and_boost.qbk index d6d8929..8737cbf 100644 --- a/doc/bimap_and_boost.qbk +++ b/doc/bimap_and_boost.qbk @@ -36,7 +36,7 @@ With Boost.Bimap, you can build associative containers in which both types can be used as key. There is a library in Boost that already allows the creation of this kind of container: Boost.MultiIndex. It offers great flexibility and lets you construct almost any container -that you could dream of. The framework is very clean. You migh want to +that you could dream of. The framework is very clean. You might want to read this library's tutorial to learn about the power that has been achieved. diff --git a/doc/compiler_specifics.qbk b/doc/compiler_specifics.qbk old mode 100755 new mode 100644 index 55dfda0..844c151 --- a/doc/compiler_specifics.qbk +++ b/doc/compiler_specifics.qbk @@ -41,7 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt) [h2 VS 7.1] -If a .cpp file uses more than four differents bimaps the compiler will run +If a .cpp file uses more than four different bimaps the compiler will run out of symbols and issue an internal compiler error. The official solution in msdn is to split the .cpp in several files or upgrade your compiler. diff --git a/doc/history.qbk b/doc/history.qbk index ddcfd10..6358fe5 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -51,7 +51,7 @@ map should be coded in top of this container. [ Once in Boost, the library switched to the now familiar name "Boost.MultiIndex". Late in 2004, it formally became a member of Boost. -Joaquin continued to enchance the library and added new features such as +Joaquin continued to enhance the library and added new features such as composite keys and random-access indices. ]] @@ -71,7 +71,7 @@ the library was queued for a formal review. [[2007 - Boost.Bimap] [ -The formal review took place at the beggining of the year and Boost.Bimap +The formal review took place at the beginning of the year and Boost.Bimap was accepted in Boost. ]] ] diff --git a/doc/html/boost_bimap/bimap_and_boost.html b/doc/html/boost_bimap/bimap_and_boost.html index 5b2ed1b..1ad3e4d 100644 --- a/doc/html/boost_bimap/bimap_and_boost.html +++ b/doc/html/boost_bimap/bimap_and_boost.html @@ -74,7 +74,7 @@ can be used as key. There is a library in Boost that already allows the creation of this kind of container: Boost.MultiIndex. It offers great flexibility and lets you construct almost any container that you could dream of. The - framework is very clean. You migh want to read this library's tutorial to + framework is very clean. You might want to read this library's tutorial to learn about the power that has been achieved.

diff --git a/doc/html/boost_bimap/compiler_specifics.html b/doc/html/boost_bimap/compiler_specifics.html index 22bc58d..0e0e404 100644 --- a/doc/html/boost_bimap/compiler_specifics.html +++ b/doc/html/boost_bimap/compiler_specifics.html @@ -330,9 +330,9 @@ 7.1

- If a .cpp file uses more than four differents bimaps the compiler will run - out of symbols and issue an internal compiler error. The official solution - in msdn is to split the .cpp in several files or upgrade your compiler. + If a .cpp file uses more than four different bimaps the compiler will run out + of symbols and issue an internal compiler error. The official solution in msdn + is to split the .cpp in several files or upgrade your compiler.

diff --git a/doc/html/boost_bimap/history.html b/doc/html/boost_bimap/history.html index 8809bff..ddb270f 100644 --- a/doc/html/boost_bimap/history.html +++ b/doc/html/boost_bimap/history.html @@ -70,7 +70,7 @@

Once in Boost, the library switched to the now familiar name "Boost.MultiIndex". Late in 2004, it formally became a member of Boost. Joaquin continued - to enchance the library and added new features such as composite keys + to enhance the library and added new features such as composite keys and random-access indices.

2006 - Multi Index Specialized Containers SoC project
@@ -88,7 +88,7 @@

2007 - Boost.Bimap

- The formal review took place at the beggining of the year and Boost.Bimap + The formal review took place at the beginning of the year and Boost.Bimap was accepted in Boost.

diff --git a/doc/html/boost_bimap/one_minute_tutorial.html b/doc/html/boost_bimap/one_minute_tutorial.html index c654937..c9ddbb3 100644 --- a/doc/html/boost_bimap/one_minute_tutorial.html +++ b/doc/html/boost_bimap/one_minute_tutorial.html @@ -124,7 +124,7 @@ by step

- A convinience header is avaiable in the boost directory: + A convenience header is available in the boost directory: 

#include <boost/bimap.hpp>
@@ -275,7 +275,7 @@

If you insert (1,"one") and (1,"1") in a std::map<int,std::string> the second insertion will have no effect. In a bimap<X,Y> both keys have to remain unique. The insertion - may fail in other situtions too. Lets see an example + may fail in other situations too. Lets see an example 

bm.clear();
 
diff --git a/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html b/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html
index c79d16e..7a3c52b 100644
--- a/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html
+++ b/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html
@@ -85,7 +85,7 @@
       

 

         In Boost.Bimap there is a better way to document the code and in the meantime
-        helping you to write more mantainable and readable code. You can tag the
+        helping you to write more maintainable and readable code. You can tag the
         two collections of the bimap so they can be accessed by more descriptive
         names.
       

diff --git a/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html b/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html
index 4fdeeb4..3599adc 100644
--- a/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html
+++ b/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html
@@ -47,7 +47,7 @@
         to specify user defined names instead of the usual member_at::-Side- tags.
       

 

-        The possibles way to use the first parameter are:
+        The possible way to use the first parameter are:
       

 
bimap< Type, R >
 

diff --git a/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html b/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html
index be21c3d..10741f9 100644
--- a/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html
+++ b/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html
@@ -358,18 +358,18 @@
           Populations
         
 

-          We want to store countries populations. The requeriments are:
+          We want to store countries populations. The requirements are:
         

 
    
 
  1. 
-              Get a list of countries in decresing order of their populations.
+              Get a list of countries in decreasing order of their populations.
             
    2. 
 
  2. 
-              Given a countrie, get their population.
+              Given a country, get their population.
             
    3. 
 

 

-          Lets create the appropiate bimap.
+          Lets create the appropriate bimap.
         

 
typedef bimap<
 
diff --git a/doc/html/index.html b/doc/html/index.html
index b24b4a6..9cccc2f 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -149,7 +149,7 @@
 
 
 
-
+
Last revised: December 10, 2012 at 13:07:47 GMT
Last revised: February 14, 2013 at 18:55:19 GMT

 

 

 

diff --git a/doc/quick_tutorial.qbk b/doc/quick_tutorial.qbk
old mode 100755
new mode 100644
index bc14fcd..67b1276
--- a/doc/quick_tutorial.qbk
+++ b/doc/quick_tutorial.qbk
@@ -80,7 +80,7 @@ __RELATION_AND_PAIR__
 
 [import ../example/step_by_step.cpp]
 
-A convinience header is avaiable in the boost directory:
+A convenience header is available in the boost directory:
 
     #include 
 
@@ -123,7 +123,7 @@ However dereferencing a `bimap::left_iterator` returns a type that is
 
     bm.left.find(1)->second = "1"; // Compilation error
 
-If you insert `(1,"one")` and `(1,"1")` in a `std::map` the second insertion will have no effect. In a `bimap` both keys have to remain unique. The insertion may fail in other situtions too. Lets see an example
+If you insert `(1,"one")` and `(1,"1")` in a `std::map` the second insertion will have no effect. In a `bimap` both keys have to remain unique. The insertion may fail in other situations too. Lets see an example
 
     bm.clear();
 
diff --git a/doc/tutorial.qbk b/doc/tutorial.qbk
old mode 100755
new mode 100644
index 3d661ff..88bd462
--- a/doc/tutorial.qbk
+++ b/doc/tutorial.qbk
@@ -246,12 +246,12 @@ equality operator is `std::equal_to`. ]]
 [heading Countries Populations]
 
 We want to store countries populations.
-The requeriments are:
+The requirements are:
 
-# Get a list of countries in decresing order of their populations.
-# Given a countrie, get their population.
+# Get a list of countries in decreasing order of their populations.
+# Given a country, get their population.
 
-Lets create the appropiate bimap.
+Lets create the appropriate bimap.
 
     typedef bimap<
 
@@ -768,7 +768,7 @@ future programmers:
 [code_user_defined_names_untagged_version]
 
 In Boost.Bimap there is a better way to document the code and
-in the meantime helping you to write more mantainable and readable code.
+in the meantime helping you to write more maintainable and readable code.
 You can tag the two collections of the bimap so they can be 
 accessed by more descriptive names.
 
@@ -954,7 +954,7 @@ To summarize, this is the complete instantiation scheme.
 Additionally, the type of this two parameters can be tagged to specify 
 user defined names instead of the usual `member_at::-Side-` tags. 
 
-The possibles way to use the first parameter are:
+The possible way to use the first parameter are:
 
     bimap< Type, R >