Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master

16 files changed, 44 insertions, 29 deletions

diff --git a/libs/bimap/doc/bimap_and_boost.qbk b/libs/bimap/doc/bimap_and_boost.qbk
index d6d8929c4..8737cbf6d 100644
--- a/libs/bimap/doc/bimap_and_boost.qbk
+++ b/libs/bimap/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/libs/bimap/doc/compiler_specifics.qbk b/libs/bimap/doc/compiler_specifics.qbk
index 55dfda039..844c1518b 100755..100644
--- a/libs/bimap/doc/compiler_specifics.qbk
+++ b/libs/bimap/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/libs/bimap/doc/history.qbk b/libs/bimap/doc/history.qbk
index ddcfd1013..6358fe5db 100644
--- a/libs/bimap/doc/history.qbk
+++ b/libs/bimap/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/libs/bimap/doc/html/boost_bimap/bimap_and_boost.html b/libs/bimap/doc/html/boost_bimap/bimap_and_boost.html
index 5b2ed1b32..1ad3e4d3a 100644
--- a/libs/bimap/doc/html/boost_bimap/bimap_and_boost.html
+++ b/libs/bimap/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.
       </p>
 <p>
diff --git a/libs/bimap/doc/html/boost_bimap/compiler_specifics.html b/libs/bimap/doc/html/boost_bimap/compiler_specifics.html
index 22bc58daf..0e0e404ab 100644
--- a/libs/bimap/doc/html/boost_bimap/compiler_specifics.html
+++ b/libs/bimap/doc/html/boost_bimap/compiler_specifics.html
@@ -330,9 +330,9 @@
       7.1</a>
     </h3>
 <p>
-      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.
     </p>
 <h3>
 <a name="boost_bimap.compiler_specifics.h1"></a>
diff --git a/libs/bimap/doc/html/boost_bimap/history.html b/libs/bimap/doc/html/boost_bimap/history.html
index 8809bff64..ddb270f44 100644
--- a/libs/bimap/doc/html/boost_bimap/history.html
+++ b/libs/bimap/doc/html/boost_bimap/history.html
@@ -70,7 +70,7 @@
 <dd><p>
               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.
             </p></dd>
 <dt><span class="term">2006 - Multi Index Specialized Containers SoC project</span></dt>
@@ -88,7 +88,7 @@
             </p></dd>
 <dt><span class="term">2007 - Boost.Bimap</span></dt>
 <dd><p>
-              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.
             </p></dd>
 </dl>
diff --git a/libs/bimap/doc/html/boost_bimap/one_minute_tutorial.html b/libs/bimap/doc/html/boost_bimap/one_minute_tutorial.html
index c654937d7..c9ddbb31c 100644
--- a/libs/bimap/doc/html/boost_bimap/one_minute_tutorial.html
+++ b/libs/bimap/doc/html/boost_bimap/one_minute_tutorial.html
@@ -124,7 +124,7 @@
       by step</a>
     </h4>
 <p>
-      A convinience header is avaiable in the boost directory:
+      A convenience header is available in the boost directory:
     </p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bimap</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
@@ -275,7 +275,7 @@
 <p>
       If you insert <code class="computeroutput"><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="string">"one"</span><span class="special">)</span></code> and <code class="computeroutput"><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="string">"1"</span><span class="special">)</span></code> in a <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span></code> the second insertion will have no effect.
       In a <code class="computeroutput"><span class="identifier">bimap</span><span class="special">&lt;</span><span class="identifier">X</span><span class="special">,</span><span class="identifier">Y</span><span class="special">&gt;</span></code> 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
     </p>
 <pre class="programlisting"><span class="identifier">bm</span><span class="special">.</span><span class="identifier">clear</span><span class="special">();</span>
 
diff --git a/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html b/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html
index c79d16e18..7a3c52b33 100644
--- a/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html
+++ b/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html
@@ -85,7 +85,7 @@
       </p>
 <p>
         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.
       </p>
diff --git a/libs/bimap/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html b/libs/bimap/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html
index 4fdeeb488..3599adc60 100644
--- a/libs/bimap/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html
+++ b/libs/bimap/doc/html/boost_bimap/the_tutorial/complete_instantiation_scheme.html
@@ -47,7 +47,7 @@
         to specify user defined names instead of the usual <code class="computeroutput"><span class="identifier">member_at</span><span class="special">::-</span><span class="identifier">Side</span><span class="special">-</span></code> tags.
       </p>
 <p>
-        The possibles way to use the first parameter are:
+        The possible way to use the first parameter are:
       </p>
 <pre class="programlisting"><span class="identifier">bimap</span><span class="special">&lt;</span> <span class="identifier">Type</span><span class="special">,</span> <span class="identifier">R</span> <span class="special">&gt;</span>
 </pre>
diff --git a/libs/bimap/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html b/libs/bimap/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html
index be21c3dc6..10741f946 100644
--- a/libs/bimap/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html
+++ b/libs/bimap/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html
@@ -358,18 +358,18 @@
           Populations</a>
         </h6>
 <p>
-          We want to store countries populations. The requeriments are:
+          We want to store countries populations. The requirements are:
         </p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-              Get a list of countries in decresing order of their populations.
+              Get a list of countries in decreasing order of their populations.
             </li>
 <li class="listitem">
-              Given a countrie, get their population.
+              Given a country, get their population.
             </li>
 </ol></div>
 <p>
-          Lets create the appropiate bimap.
+          Lets create the appropriate bimap.
         </p>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">bimap</span><span class="special">&lt;</span>
 
diff --git a/libs/bimap/doc/html/index.html b/libs/bimap/doc/html/index.html
index b24b4a60e..9cccc2f77 100644
--- a/libs/bimap/doc/html/index.html
+++ b/libs/bimap/doc/html/index.html
@@ -149,7 +149,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: December 10, 2012 at 13:07:47 GMT</small></p></td>
+<td align="left"><p><small>Last revised: February 14, 2013 at 18:55:19 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/libs/bimap/doc/quick_tutorial.qbk b/libs/bimap/doc/quick_tutorial.qbk
index bc14fcd2e..67b127695 100755..100644
--- a/libs/bimap/doc/quick_tutorial.qbk
+++ b/libs/bimap/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 <boost/bimap.hpp>
 
@@ -123,7 +123,7 @@ However dereferencing a `bimap<X,Y>::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<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
+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 situations too. Lets see an example
 
     bm.clear();
 
diff --git a/libs/bimap/doc/tutorial.qbk b/libs/bimap/doc/tutorial.qbk
index 3d661ff3c..88bd46205 100755..100644
--- a/libs/bimap/doc/tutorial.qbk
+++ b/libs/bimap/doc/tutorial.qbk
@@ -246,12 +246,12 @@ equality operator is `std::equal_to<T>`. ]]
 [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 >
 
diff --git a/libs/bimap/meta/libraries.json b/libs/bimap/meta/libraries.json
new file mode 100644
index 000000000..5956ae6f0
--- /dev/null
+++ b/libs/bimap/meta/libraries.json
@@ -0,0 +1,15 @@
+{
+    "key": "bimap",
+    "name": "Bimap",
+    "authors": [
+        "Matias Capeletto"
+    ],
+    "description": "Bidirectional maps library for C++. With Boost.Bimap you can create associative containers in which both types can be used as key.",
+    "category": [
+        "Containers",
+        "Data"
+    ],
+    "maintainers": [
+        "Matias Capeletto <matias.capeletto -at- gmail.com>"
+    ]
+}
diff --git a/libs/bimap/test/test_bimap.hpp b/libs/bimap/test/test_bimap.hpp
index 5622b606e..de718e057 100644
--- a/libs/bimap/test/test_bimap.hpp
+++ b/libs/bimap/test/test_bimap.hpp
@@ -9,7 +9,7 @@
 #ifndef LIBS_BIMAP_TEST_BIMAP_TEST_HPP
 #define LIBS_BIMAP_TEST_BIMAP_TEST_HPP
 
-#if defined(_MSC_VER) && (_MSC_VER>=1200)
+#if defined(_MSC_VER)
 #pragma once
 #endif
 
diff --git a/libs/bimap/test/test_relation.hpp b/libs/bimap/test/test_relation.hpp
index 65da6b9e5..d42135a21 100755..100644
--- a/libs/bimap/test/test_relation.hpp
+++ b/libs/bimap/test/test_relation.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_BIMAP_TEST_TEST_RELATION_HPP
 #define BOOST_BIMAP_TEST_TEST_RELATION_HPP
 
-#if defined(_MSC_VER) && (_MSC_VER>=1200)
+#if defined(_MSC_VER)
 #pragma once
 #endif