From e5bbcac3dac2c65c217a7f54eddb4d4fa37dc53e Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 14 Dec 2013 17:42:13 +0000 Subject: [PATCH] Fix typos from https://svn.boost.org/trac/boost/ticket/9283 and update history. --- doc/basic_regex.qbk | 4 +- doc/character_class_names.qbk | 2 +- doc/concepts.qbk | 8 +-- doc/configuration.qbk | 4 +- doc/format_sed_syntax.qbk | 2 +- doc/history.qbk | 11 +++- .../boost_regex/background_information.html | 2 +- .../acknowledgements.html | 2 +- .../background_information/examples.html | 2 +- .../background_information/faq.html | 2 +- .../background_information/futher.html | 2 +- .../background_information/headers.html | 2 +- .../background_information/history.html | 51 ++++++++++++------- .../background_information/locale.html | 2 +- .../background_information/performance.html | 2 +- .../background_information/redist.html | 2 +- .../background_information/standards.html | 2 +- .../background_information/thread_safety.html | 2 +- doc/html/boost_regex/captures.html | 2 +- doc/html/boost_regex/configuration.html | 2 +- .../boost_regex/configuration/algorithm.html | 2 +- .../boost_regex/configuration/compiler.html | 2 +- .../boost_regex/configuration/linkage.html | 2 +- .../boost_regex/configuration/locale.html | 2 +- .../boost_regex/configuration/tuning.html | 6 +-- doc/html/boost_regex/format.html | 2 +- .../format/boost_format_syntax.html | 2 +- doc/html/boost_regex/format/perl_format.html | 2 +- doc/html/boost_regex/format/sed_format.html | 6 +-- doc/html/boost_regex/install.html | 2 +- .../introduction_and_overview.html | 4 +- doc/html/boost_regex/partial_matches.html | 2 +- doc/html/boost_regex/ref.html | 2 +- doc/html/boost_regex/ref/bad_expression.html | 2 +- doc/html/boost_regex/ref/basic_regex.html | 6 +-- doc/html/boost_regex/ref/concepts.html | 2 +- .../ref/concepts/charT_concept.html | 2 +- .../ref/concepts/iterator_concepts.html | 2 +- .../ref/concepts/traits_concept.html | 10 ++-- .../ref/deprecated_interfaces.html | 2 +- .../ref/deprecated_interfaces/old_regex.html | 4 +- .../deprecated_interfaces/regex_format.html | 2 +- .../ref/deprecated_interfaces/regex_grep.html | 2 +- .../deprecated_interfaces/regex_split.html | 2 +- doc/html/boost_regex/ref/error_type.html | 2 +- .../boost_regex/ref/internal_details.html | 2 +- .../ref/internal_details/uni_iter.html | 6 +-- doc/html/boost_regex/ref/match_flag_type.html | 2 +- doc/html/boost_regex/ref/match_results.html | 2 +- doc/html/boost_regex/ref/non_std_strings.html | 2 +- .../boost_regex/ref/non_std_strings/icu.html | 2 +- .../ref/non_std_strings/icu/intro.html | 2 +- .../ref/non_std_strings/icu/unicode_algo.html | 2 +- .../ref/non_std_strings/icu/unicode_iter.html | 2 +- .../non_std_strings/icu/unicode_types.html | 14 ++--- .../ref/non_std_strings/mfc_strings.html | 2 +- .../non_std_strings/mfc_strings/mfc_algo.html | 2 +- .../mfc_strings/mfc_intro.html | 2 +- .../non_std_strings/mfc_strings/mfc_iter.html | 2 +- .../mfc_strings/mfc_regex_create.html | 2 +- .../mfc_strings/mfc_regex_types.html | 2 +- doc/html/boost_regex/ref/posix.html | 2 +- doc/html/boost_regex/ref/regex_iterator.html | 7 +-- doc/html/boost_regex/ref/regex_match.html | 5 +- doc/html/boost_regex/ref/regex_replace.html | 14 ++--- doc/html/boost_regex/ref/regex_search.html | 5 +- .../boost_regex/ref/regex_token_iterator.html | 4 +- doc/html/boost_regex/ref/regex_traits.html | 4 +- doc/html/boost_regex/ref/sub_match.html | 2 +- .../boost_regex/ref/syntax_option_type.html | 2 +- .../syntax_option_type_basic.html | 2 +- .../syntax_option_type_extended.html | 2 +- .../syntax_option_type_literal.html | 2 +- .../syntax_option_type_overview.html | 2 +- .../syntax_option_type_perl.html | 2 +- .../syntax_option_type_synopsis.html | 2 +- doc/html/boost_regex/syntax.html | 4 +- .../boost_regex/syntax/basic_extended.html | 6 +-- doc/html/boost_regex/syntax/basic_syntax.html | 4 +- .../boost_regex/syntax/character_classes.html | 10 ++-- .../optional_char_class_names.html | 8 +-- .../boost_regex/syntax/collating_names.html | 2 +- .../syntax/collating_names/digraphs.html | 2 +- .../syntax/collating_names/named_unicode.html | 2 +- .../collating_names/posix_symbolic_names.html | 2 +- .../syntax/leftmost_longest_rule.html | 2 +- doc/html/boost_regex/syntax/perl_syntax.html | 12 ++--- doc/html/boost_regex/unicode.html | 2 +- doc/html/index.html | 4 +- doc/icu_strings.qbk | 8 +-- doc/introduction.qbk | 2 +- doc/old_regex.qbk | 2 +- doc/regex_iterator.qbk | 4 +- doc/regex_match.qbk | 2 +- doc/regex_replace.qbk | 10 ++-- doc/regex_search.qbk | 2 +- doc/regex_token_iterator.qbk | 2 +- doc/regex_traits.qbk | 2 +- doc/syntax_basic.qbk | 2 +- doc/syntax_extended.qbk | 4 +- doc/syntax_perl.qbk | 10 ++-- doc/unicode_iterators.qbk | 4 +- 102 files changed, 214 insertions(+), 187 deletions(-) diff --git a/doc/basic_regex.qbk b/doc/basic_regex.qbk index 73816a1d..2ef33014 100644 --- a/doc/basic_regex.qbk +++ b/doc/basic_regex.qbk @@ -447,7 +447,7 @@ The returned iterators are relative to `begin()` and `end()`. [*Requires]: The expression must have been compiled with the [syntax_option_type] save_subexpression_location set. Argument -/n/ must be in within the range `1 <= n < mark_count()`. +/n/ must be in within the range `0 <= n < mark_count()`. [#boost_regex.basic_regex.begin] @@ -487,7 +487,7 @@ otherwise false. size_type mark_count() const; -[*Effects]: Returns the number of marked sub-expressions within the regular expresion. +[*Effects]: Returns the number of marked sub-expressions within the regular expression. [#boost_regex.basic_regex.assign1] diff --git a/doc/character_class_names.qbk b/doc/character_class_names.qbk index e4771aa5..e640e1d4 100644 --- a/doc/character_class_names.qbk +++ b/doc/character_class_names.qbk @@ -8,7 +8,7 @@ [section:character_classes Character Class Names] -[section:std_char_clases Character Classes that are Always Supported] +[section:std_char_classes Character Classes that are Always Supported] The following character class names are always supported by Boost.Regex: diff --git a/doc/concepts.qbk b/doc/concepts.qbk index d6758967..d3f6d837 100644 --- a/doc/concepts.qbk +++ b/doc/concepts.qbk @@ -38,7 +38,7 @@ Note: type charT is not required to support this operation, if the traits class [section:traits_concept Traits Class Requirements] There are two sets of requirements for the `traits` template argument to -[basic_regex]: a mininal interface (which is part of the regex standardization proposal), +[basic_regex]: a minimal interface (which is part of the regex standardization proposal), and an optional Boost-specific enhanced interface. [h4 Minimal requirements.] @@ -77,7 +77,7 @@ an object of type `X::locale_type`. The following additional requirements are strictly optional, however in order for [basic_regex] to take advantage of these additional interfaces, all of the following requirements must be met; [basic_regex] -will detect the presence or absense of the member `boost_extensions_tag` and +will detect the presence or absence of the member `boost_extensions_tag` and configure itself appropriately. @@ -89,8 +89,8 @@ configure itself appropriately. [[v.translate(c, b)][X::char_type][Returns a character d such that: for any character d that is to be considered equivalent to c then `v.translate(c,false)==v.translate(d,false)`. Likewise for all characters C that are to be considered equivalent to c when comparisons are to be performed without regard to case, then `v.translate(c,true)==v.translate(C,true)`.]] [[v.toi(I1, I2, i)][An integer type capable of holding either a charT or an int.][Behaves as follows: if `p == q` or if `*p` is not a digit character then returns -1. Otherwise performs formatted numeric input on the sequence \[p,q) and returns the result as an int. Postcondition: either p == q or *p is a non-digit character.]] [[v.error_string(I)][std::string][Returns a human readable error string for the error condition i, where i is one of the values enumerated by type regex_constants::error_type. If the value /I/ is not recognized then returns the string "Unknown error" or a localized equivalent.]] -[[v.tolower(c)][X::char_type][Converts c to lower case, used for Perl-style \l and \L formating operations.]] -[[v.toupper(c)][X::char_type][Converts c to upper case, used for Perl-style \u and \U formating operations.]] +[[v.tolower(c)][X::char_type][Converts c to lower case, used for Perl-style \l and \L formatting operations.]] +[[v.toupper(c)][X::char_type][Converts c to upper case, used for Perl-style \u and \U formatting operations.]] ] [endsect] diff --git a/doc/configuration.qbk b/doc/configuration.qbk index 411f0722..080adf1c 100644 --- a/doc/configuration.qbk +++ b/doc/configuration.qbk @@ -68,10 +68,10 @@ The following options apply only if BOOST_REGEX_NON_RECURSIVE is set. [table [[macro][description]] [[BOOST_REGEX_BLOCKSIZE][In non-recursive mode, Boost.Regex uses largish blocks of memory to act as a stack for the state machine, the larger the block size then the fewer allocations that will take place. This defaults to 4096 bytes, which is large enough to match the vast majority of regular expressions without further allocations, however, you can choose smaller or larger values depending upon your platforms characteristics.]] -[[BOOST_REGEX_MAX_BLOCKS][Tells Boost.Regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is permitted to use. If this value is exceeded then Boost.Regex will stop trying to find a match and throw a std::runtime_error. Defaults to 1024, don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE by much.]] +[[BOOST_REGEX_MAX_BLOCKS][Tells Boost.Regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is permitted to use. If this value is exceeded then Boost.Regex will stop trying to find a match and throw a std::runtime_error. Defaults to 1024, don't forget to tweak this value if you alter BOOST_REGEX_BLOCKSIZE by much.]] [[BOOST_REGEX_MAX_CACHE_BLOCKS][Tells Boost.Regex how many memory blocks to store in it's internal cache - memory blocks are taken from this cache rather than by calling - ::operator new. Generally speeking this can be an order of magnitude faster than + ::operator new. Generally speaking this can be an order of magnitude faster than calling ::opertator new each time a memory block is required, but has the downside that Boost.Regex can end up caching a large chunk of memory (by default up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size). If memory is tight then try diff --git a/doc/format_sed_syntax.qbk b/doc/format_sed_syntax.qbk index 30706ebe..669b47f7 100644 --- a/doc/format_sed_syntax.qbk +++ b/doc/format_sed_syntax.qbk @@ -13,7 +13,7 @@ Sed-style format strings treat all characters as literals except: [table [[character][description]] [[&][The ampersand character is replaced in the output stream by - the the whole of what matched the regular expression. Use + the whole of what matched the regular expression. Use \\& to output a literal '&' character.]] [[\\][Specifies an escape sequence.]] ] diff --git a/doc/history.qbk b/doc/history.qbk index cd2c09af..e4d819a7 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -15,6 +15,13 @@ Currently open issues can be viewed [@https://svn.boost.org/trac/boost/query?sta All issues including closed ones can be viewed [@https://svn.boost.org/trac/boost/query?status=assigned&status=closed&status=new&status=reopened&component=regex&order=priority&col=id&col=summary&col=status&col=type&col=milestone&col=component here]. +[h4 Post 1.55] + +* [*Breaking change:] corrected behavior of `basic_regex<>::mark_count()` to match existing documentation, +`basic_regex<>::subexpression(n)` changed to match, see [@https://svn.boost.org/trac/boost/ticket/9227 #9227] +* Fixed issue [@https://svn.boost.org/trac/boost/ticket/8903 #8903]. +* Fixed documentation typos from [@https://svn.boost.org/trac/boost/ticket/9283 #9283]. + [h4 Boost-1.54] Fixed issue [@https://svn.boost.org/trac/boost/ticket/8569 #8569]. @@ -119,9 +126,9 @@ and * Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when using /Zc:wchar_t. * Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler can cope. * Added needed standard library #includes to fileiter.hpp, regex_workaround.hpp and cpp_regex_traits.hpp. -* Fixed a bug where non-greedy repeats could in certain strange curcumstances repeat more times than their maximum value. +* Fixed a bug where non-greedy repeats could in certain strange circumstances repeat more times than their maximum value. * Fixed the value returned by basic_regex<>::empty() from a default constructed object. -* Changed the deffinition of regex_error to make it backwards compatible with Boost-1.32.0. +* Changed the definition of regex_error to make it backwards compatible with Boost-1.32.0. * Disabled external templates for Intel C++ 8.0 and earlier - otherwise unresolved references can occur. * Rewritten extern template code for gcc so that only specific member functions are exported: otherwise strange unresolved references can occur when linking and mixing debug and non-debug code. * Initialise all the data members of the unicode_iterators: this keeps gcc from issuing needless warnings. diff --git a/doc/html/boost_regex/background_information.html b/doc/html/boost_regex/background_information.html index f64afd31..c8a3dbfc 100644 --- a/doc/html/boost_regex/background_information.html +++ b/doc/html/boost_regex/background_information.html @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
diff --git a/doc/html/boost_regex/background_information/acknowledgements.html b/doc/html/boost_regex/background_information/acknowledgements.html index 2bc2d380..c3f475b1 100644 --- a/doc/html/boost_regex/background_information/acknowledgements.html +++ b/doc/html/boost_regex/background_information/acknowledgements.html @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
diff --git a/doc/html/boost_regex/background_information/examples.html b/doc/html/boost_regex/background_information/examples.html index f1fe113f..d92bb730 100644 --- a/doc/html/boost_regex/background_information/examples.html +++ b/doc/html/boost_regex/background_information/examples.html @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+

Test and Example Programs diff --git a/doc/html/boost_regex/background_information/faq.html b/doc/html/boost_regex/background_information/faq.html index 8205d1e8..659d191b 100644 --- a/doc/html/boost_regex/background_information/faq.html +++ b/doc/html/boost_regex/background_information/faq.html @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+

FAQ

diff --git a/doc/html/boost_regex/background_information/futher.html b/doc/html/boost_regex/background_information/futher.html index a1c01ad7..80c4d3bd 100644 --- a/doc/html/boost_regex/background_information/futher.html +++ b/doc/html/boost_regex/background_information/futher.html @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+

References and Further Information diff --git a/doc/html/boost_regex/background_information/headers.html b/doc/html/boost_regex/background_information/headers.html index 0acff3e8..14f5dd1b 100644 --- a/doc/html/boost_regex/background_information/headers.html +++ b/doc/html/boost_regex/background_information/headers.html @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
diff --git a/doc/html/boost_regex/background_information/history.html b/doc/html/boost_regex/background_information/history.html index c40df050..989d5fe9 100644 --- a/doc/html/boost_regex/background_information/history.html +++ b/doc/html/boost_regex/background_information/history.html @@ -21,7 +21,7 @@
PrevUpHome
-
+
@@ -37,13 +37,30 @@

+ Post 1.55 +
+
    +
  • + Breaking change: corrected behavior + of basic_regex<>::mark_count() + to match existing documentation, basic_regex<>::subexpression(n) changed to match, see #9227 +
    • +
  • + Fixed issue #8903. +
    • +
  • + Fixed documentation typos from #9283. +
    • +
+
+ Boost-1.54

Fixed issue #8569.

- + Boost-1.53

@@ -51,7 +68,7 @@ #7644.

- + Boost-1.51

@@ -61,7 +78,7 @@ #6346.

- + Boost-1.50

@@ -70,7 +87,7 @@ expression.

- + Boost-1.48

@@ -80,7 +97,7 @@ #5736.

- + Boost 1.47

@@ -92,7 +109,7 @@ #5504.

- + Boost 1.44

@@ -110,7 +127,7 @@ #3890

- + Boost 1.42
    @@ -138,7 +155,7 @@
- + Boost 1.40
  • @@ -146,7 +163,7 @@ branch resets and recursive regular expressions.
- + Boost 1.38
    @@ -173,7 +190,7 @@
- + Boost 1.34
    @@ -195,7 +212,7 @@
- + Boost 1.33.1
    @@ -215,7 +232,7 @@ and cpp_regex_traits.hpp.
  • - Fixed a bug where non-greedy repeats could in certain strange curcumstances + Fixed a bug where non-greedy repeats could in certain strange circumstances repeat more times than their maximum value.
  • @@ -223,7 +240,7 @@ constructed object.
  • - Changed the deffinition of regex_error to make it backwards compatible + Changed the definition of regex_error to make it backwards compatible with Boost-1.32.0.
  • @@ -264,7 +281,7 @@
- + Boost 1.33.0
    @@ -318,14 +335,14 @@
- + Boost 1.32.1
  • Fixed bug in partial matches of bounded repeats of '.'.
- + Boost 1.31.0
    diff --git a/doc/html/boost_regex/background_information/locale.html b/doc/html/boost_regex/background_information/locale.html index 27f3c937..f0213dfe 100644 --- a/doc/html/boost_regex/background_information/locale.html +++ b/doc/html/boost_regex/background_information/locale.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/background_information/performance.html b/doc/html/boost_regex/background_information/performance.html index c633f4ab..a290cbb0 100644 --- a/doc/html/boost_regex/background_information/performance.html +++ b/doc/html/boost_regex/background_information/performance.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/background_information/redist.html b/doc/html/boost_regex/background_information/redist.html index e9f27e4f..9536ebfc 100644 --- a/doc/html/boost_regex/background_information/redist.html +++ b/doc/html/boost_regex/background_information/redist.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/background_information/standards.html b/doc/html/boost_regex/background_information/standards.html index b96d6c90..da39de62 100644 --- a/doc/html/boost_regex/background_information/standards.html +++ b/doc/html/boost_regex/background_information/standards.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Standards Conformance diff --git a/doc/html/boost_regex/background_information/thread_safety.html b/doc/html/boost_regex/background_information/thread_safety.html index ec4ba372..7c24f280 100644 --- a/doc/html/boost_regex/background_information/thread_safety.html +++ b/doc/html/boost_regex/background_information/thread_safety.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Thread Safety diff --git a/doc/html/boost_regex/captures.html b/doc/html/boost_regex/captures.html index f940c23f..e30dacbf 100644 --- a/doc/html/boost_regex/captures.html +++ b/doc/html/boost_regex/captures.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Understanding Marked Sub-Expressions and Captures diff --git a/doc/html/boost_regex/configuration.html b/doc/html/boost_regex/configuration.html index d6d7ed63..ca70564d 100644 --- a/doc/html/boost_regex/configuration.html +++ b/doc/html/boost_regex/configuration.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/configuration/algorithm.html b/doc/html/boost_regex/configuration/algorithm.html index f07caec7..d177ebe3 100644 --- a/doc/html/boost_regex/configuration/algorithm.html +++ b/doc/html/boost_regex/configuration/algorithm.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/configuration/compiler.html b/doc/html/boost_regex/configuration/compiler.html index 067a2bae..fb160382 100644 --- a/doc/html/boost_regex/configuration/compiler.html +++ b/doc/html/boost_regex/configuration/compiler.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/configuration/linkage.html b/doc/html/boost_regex/configuration/linkage.html index ff1e8d75..525636bf 100644 --- a/doc/html/boost_regex/configuration/linkage.html +++ b/doc/html/boost_regex/configuration/linkage.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/configuration/locale.html b/doc/html/boost_regex/configuration/locale.html index 5d48f518..8536bb3e 100644 --- a/doc/html/boost_regex/configuration/locale.html +++ b/doc/html/boost_regex/configuration/locale.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Locale and traits class selection diff --git a/doc/html/boost_regex/configuration/tuning.html b/doc/html/boost_regex/configuration/tuning.html index 86249a66..3ebeec8e 100644 --- a/doc/html/boost_regex/configuration/tuning.html +++ b/doc/html/boost_regex/configuration/tuning.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -110,7 +110,7 @@ Tells Boost.Regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is permitted to use. If this value is exceeded then Boost.Regex will stop trying to find a match and throw a std::runtime_error. - Defaults to 1024, don't forget to tweek this value if you alter + Defaults to 1024, don't forget to tweak this value if you alter BOOST_REGEX_BLOCKSIZE by much.

    @@ -125,7 +125,7 @@

    Tells Boost.Regex how many memory blocks to store in it's internal cache - memory blocks are taken from this cache rather than by - calling ::operator new. Generally speeking this can be an order + calling ::operator new. Generally speaking this can be an order of magnitude faster than calling ::opertator new each time a memory block is required, but has the downside that Boost.Regex can end up caching a large chunk of memory (by default up to 16 blocks diff --git a/doc/html/boost_regex/format.html b/doc/html/boost_regex/format.html index 794b2b08..d3894ded 100644 --- a/doc/html/boost_regex/format.html +++ b/doc/html/boost_regex/format.html @@ -22,7 +22,7 @@

    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/format/boost_format_syntax.html b/doc/html/boost_regex/format/boost_format_syntax.html index 09e55997..5d6ce0d4 100644 --- a/doc/html/boost_regex/format/boost_format_syntax.html +++ b/doc/html/boost_regex/format/boost_format_syntax.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Boost-Extended Format String Syntax diff --git a/doc/html/boost_regex/format/perl_format.html b/doc/html/boost_regex/format/perl_format.html index 5ea16d08..3c1b698b 100644 --- a/doc/html/boost_regex/format/perl_format.html +++ b/doc/html/boost_regex/format/perl_format.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/format/sed_format.html b/doc/html/boost_regex/format/sed_format.html index 91e00ce6..94c0bcbb 100644 --- a/doc/html/boost_regex/format/sed_format.html +++ b/doc/html/boost_regex/format/sed_format.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -56,8 +56,8 @@

    The ampersand character is replaced in the output stream by the - the whole of what matched the regular expression. Use \& to - output a literal '&' character. + whole of what matched the regular expression. Use \& to output + a literal '&' character.

    diff --git a/doc/html/boost_regex/install.html b/doc/html/boost_regex/install.html index 0e3b1bb4..5f775948 100644 --- a/doc/html/boost_regex/install.html +++ b/doc/html/boost_regex/install.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/introduction_and_overview.html b/doc/html/boost_regex/introduction_and_overview.html index 14b67995..fe149354 100644 --- a/doc/html/boost_regex/introduction_and_overview.html +++ b/doc/html/boost_regex/introduction_and_overview.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Introduction and Overview @@ -172,7 +172,7 @@ by merging the two.

    - For iterating through all occurences of an expression within a text, there + For iterating through all occurrences of an expression within a text, there are two iterator types: regex_iterator will enumerate over the match_results objects found, while regex_token_iterator will enumerate diff --git a/doc/html/boost_regex/partial_matches.html b/doc/html/boost_regex/partial_matches.html index 251bec81..ce372a89 100644 --- a/doc/html/boost_regex/partial_matches.html +++ b/doc/html/boost_regex/partial_matches.html @@ -22,7 +22,7 @@

    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/ref.html b/doc/html/boost_regex/ref.html index 300febed..ba471f0b 100644 --- a/doc/html/boost_regex/ref.html +++ b/doc/html/boost_regex/ref.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/ref/bad_expression.html b/doc/html/boost_regex/ref/bad_expression.html index b5847cbe..1f236d06 100644 --- a/doc/html/boost_regex/ref/bad_expression.html +++ b/doc/html/boost_regex/ref/bad_expression.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/ref/basic_regex.html b/doc/html/boost_regex/ref/basic_regex.html index 45c29948..c75ebff7 100644 --- a/doc/html/boost_regex/ref/basic_regex.html +++ b/doc/html/boost_regex/ref/basic_regex.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -929,7 +929,7 @@

    Requires: The expression must have been compiled with the syntax_option_type save_subexpression_location - set. Argument n must be in within the range 1 <= n + set. Argument n must be in within the range 0 <= n < mark_count(). 

    const_iterator begin() const;
@@ -966,7 +966,7 @@

    Effects: Returns the number of marked sub-expressions - within the regular expresion. + within the regular expression. 

    basic_regex& assign(const basic_regex& that);
    diff --git a/doc/html/boost_regex/ref/concepts.html b/doc/html/boost_regex/ref/concepts.html index db0b840a..0d186485 100644 --- a/doc/html/boost_regex/ref/concepts.html +++ b/doc/html/boost_regex/ref/concepts.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/ref/concepts/charT_concept.html b/doc/html/boost_regex/ref/concepts/charT_concept.html index 0df26f0d..672efac9 100644 --- a/doc/html/boost_regex/ref/concepts/charT_concept.html +++ b/doc/html/boost_regex/ref/concepts/charT_concept.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/ref/concepts/iterator_concepts.html b/doc/html/boost_regex/ref/concepts/iterator_concepts.html index b058b525..b8e5a6df 100644 --- a/doc/html/boost_regex/ref/concepts/iterator_concepts.html +++ b/doc/html/boost_regex/ref/concepts/iterator_concepts.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Iterator Requirements diff --git a/doc/html/boost_regex/ref/concepts/traits_concept.html b/doc/html/boost_regex/ref/concepts/traits_concept.html index d21da07d..4db441bb 100644 --- a/doc/html/boost_regex/ref/concepts/traits_concept.html +++ b/doc/html/boost_regex/ref/concepts/traits_concept.html @@ -22,14 +22,14 @@
    PrevUpHomeNext
    -
    +

    There are two sets of requirements for the traits - template argument to basic_regex: a mininal interface + template argument to basic_regex: a minimal interface (which is part of the regex standardization proposal), and an optional Boost-specific enhanced interface.

    @@ -387,7 +387,7 @@ order for basic_regex to take advantage of these additional interfaces, all of the following requirements must be met; basic_regex will detect the presence - or absense of the member boost_extensions_tag + or absence of the member boost_extensions_tag and configure itself appropriately.

    @@ -549,7 +549,7 @@ @@ -567,7 +567,7 @@ diff --git a/doc/html/boost_regex/ref/deprecated_interfaces.html b/doc/html/boost_regex/ref/deprecated_interfaces.html index 1dfa7328..717aa073 100644 --- a/doc/html/boost_regex/ref/deprecated_interfaces.html +++ b/doc/html/boost_regex/ref/deprecated_interfaces.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html index fbb2cc78..dab9ef4a 100644 --- a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html +++ b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    High Level Class RegEx (Deprecated) @@ -39,7 +39,7 @@ The class RegEx provides a high level simplified interface to the regular expression library, this class only handles narrow character strings, and regular expressions always follow the "normal" syntax - that - is the same as the perl / ECMAScript synatx. + is the same as the perl / ECMAScript syntax. 

    typedef bool (*GrepCallback)(const RegEx& expression);
 typedef bool (*GrepFileCallback)(const char* file, const RegEx& expression);
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
index 06a2d099..caf05c70 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 regex_format
         (Deprecated)
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
index 87ea0856..39e164a7 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 regex_grep
         (Deprecated)
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
index 8ef9a927..1b0d61ee 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 regex_split
         (deprecated)
diff --git a/doc/html/boost_regex/ref/error_type.html b/doc/html/boost_regex/ref/error_type.html
index 9de62d0b..96e68b55 100644
--- a/doc/html/boost_regex/ref/error_type.html
+++ b/doc/html/boost_regex/ref/error_type.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
diff --git a/doc/html/boost_regex/ref/internal_details.html b/doc/html/boost_regex/ref/internal_details.html
index 6b861994..e47e5f31 100644
--- a/doc/html/boost_regex/ref/internal_details.html
+++ b/doc/html/boost_regex/ref/internal_details.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
diff --git a/doc/html/boost_regex/ref/internal_details/uni_iter.html b/doc/html/boost_regex/ref/internal_details/uni_iter.html
index 33b07a2a..7726eb09 100644
--- a/doc/html/boost_regex/ref/internal_details/uni_iter.html
+++ b/doc/html/boost_regex/ref/internal_details/uni_iter.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Unicode
         Iterators
@@ -96,7 +96,7 @@
           The three-arg constructor of this class takes the start and end of the
           underlying sequence as well as the position to start iteration from. This
           constructor validates that the underlying sequence has validly encoded
-          endpoints: this prevents accidently incrementing/decrementing past the
+          endpoints: this prevents accidentally incrementing/decrementing past the
           end of the underlying sequence as a result of invalid UTF16 code sequences
           at the endpoints of the underlying range.
         
    
@@ -131,7 +131,7 @@
           The three-arg constructor of this class takes the start and end of the
           underlying sequence as well as the position to start iteration from. This
           constructor validates that the underlying sequence has validly encoded
-          endpoints: this prevents accidently incrementing/decrementing past the
+          endpoints: this prevents accidentally incrementing/decrementing past the
           end of the underlying sequence as a result of invalid UTF8 code sequences
           at the endpoints of the underlying range.
         
    
diff --git a/doc/html/boost_regex/ref/match_flag_type.html b/doc/html/boost_regex/ref/match_flag_type.html
index f8ad6e71..f28bf937 100644
--- a/doc/html/boost_regex/ref/match_flag_type.html
+++ b/doc/html/boost_regex/ref/match_flag_type.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
diff --git a/doc/html/boost_regex/ref/match_results.html b/doc/html/boost_regex/ref/match_results.html
index 951d22d2..24eda7cb 100644
--- a/doc/html/boost_regex/ref/match_results.html
+++ b/doc/html/boost_regex/ref/match_results.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
diff --git a/doc/html/boost_regex/ref/non_std_strings.html b/doc/html/boost_regex/ref/non_std_strings.html
index 1ce7cc57..8199c626 100644
--- a/doc/html/boost_regex/ref/non_std_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Interfacing With Non-Standard
       String Types
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu.html b/doc/html/boost_regex/ref/non_std_strings/icu.html
index a649ef9c..d6de5f53 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Working With Unicode
         and ICU String Types
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/intro.html b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
index 14810d35..01c60754 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Introduction
           to using Regex with ICU
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
index 114ee7af..fd352bb0 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Unicode
           Regular Expression Algorithms
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
index 2ee8179c..3144029f 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Unicode
           Aware Regex Iterators
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
index d4758101..3ad57f11 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+

    Effects: Creates a regular expression - object from the Null-terminated UTF-8 characater sequence p. + object from the Null-terminated UTF-8 character sequence p. 

    u32regex make_u32regex(const unsigned char* p,
                        boost::regex_constants::syntax_option_type opt
@@ -76,7 +76,7 @@

    Effects: Creates a regular expression - object from the Null-terminated UTF-8 characater sequence p. + object from the Null-terminated UTF-8 character sequence p. 

    u32regex make_u32regex(const wchar_t* p,
                        boost::regex_constants::syntax_option_type opt
@@ -84,9 +84,9 @@

    Effects: Creates a regular expression - object from the Null-terminated characater sequence p. The character - encoding of the sequence is determined based upon sizeof(wchar_t): 1 - implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32. + object from the Null-terminated character sequence p. The character encoding + of the sequence is determined based upon sizeof(wchar_t): 1 implies UTF-8, + 2 implies UTF-16, and 4 implies UTF-32. 

    u32regex make_u32regex(const UChar* p,
                        boost::regex_constants::syntax_option_type opt
@@ -94,7 +94,7 @@

    Effects: Creates a regular expression - object from the Null-terminated UTF-16 characater sequence p. + object from the Null-terminated UTF-16 character sequence p. 

    template<class C, class T, class A>
 u32regex make_u32regex(const std::basic_string<C, T, A>& s,
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
index 7f75d0e7..fe6b43d2 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Using
         Boost Regex With MFC Strings
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
index 9c5a7ead..41520942 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Overloaded
           Algorithms For MFC String Types
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
index 489b9db5..53115d45 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Introduction
           to Boost.Regex and MFC Strings
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
index e5073dd8..a201d136 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Iterating
           Over the Matches Within An MFC String
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
index efb6de66..6bf28929 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Regular
           Expression Creation From an MFC String
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
index ea426392..5f25a5a2 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
 Regex
           Types Used With MFC Strings
diff --git a/doc/html/boost_regex/ref/posix.html b/doc/html/boost_regex/ref/posix.html
index ee9e15c4..f9d97b8a 100644
--- a/doc/html/boost_regex/ref/posix.html
+++ b/doc/html/boost_regex/ref/posix.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
diff --git a/doc/html/boost_regex/ref/regex_iterator.html b/doc/html/boost_regex/ref/regex_iterator.html
index a58fbd4f..8b8e2ca3 100644
--- a/doc/html/boost_regex/ref/regex_iterator.html
+++ b/doc/html/boost_regex/ref/regex_iterator.html
@@ -22,7 +22,7 @@
 
    
 PrevUpHomeNext
 
    
-
    
+
    
 
    
@@ -170,7 +170,8 @@

    @@ -410,7 +411,7 @@

    Effects: returns an iterator that enumerates - all occurences of expression e in text p + all occurrences of expression e in text p using match_flag_type m.

    diff --git a/doc/html/boost_regex/ref/regex_match.html b/doc/html/boost_regex/ref/regex_match.html index e0de4b9d..1902a204 100644 --- a/doc/html/boost_regex/ref/regex_match.html +++ b/doc/html/boost_regex/ref/regex_match.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -141,7 +141,8 @@
    diff --git a/doc/html/boost_regex/ref/regex_replace.html b/doc/html/boost_regex/ref/regex_replace.html index 2027b93e..d8f14e47 100644 --- a/doc/html/boost_regex/ref/regex_replace.html +++ b/doc/html/boost_regex/ref/regex_replace.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -65,8 +65,8 @@ match_flag_type flags = match_default);

    - Enumerates all the occurences of expression e in the - sequence [first, last), replacing each occurence with the string that results + Enumerates all the occurrences of expression e in the + sequence [first, last), replacing each occurrence with the string that results by merging the match found with the format string fmt, and copies the resulting string to out. In the case that fmt is a unary, binary or ternary function object, @@ -80,11 +80,11 @@

    If the flag format_first_only - is set in flags then only the first occurence of e is - replaced. + is set in flags then only the first occurrence of e + is replaced.

    - The manner in which the format string fmt is interpretted, + The manner in which the format string fmt is interpreted, along with the rules used for finding matches, are determined by the flags set in flags: see match_flag_type.

    @@ -307,7 +307,7 @@ const char* header_text = "<HTML>\n<HEAD>\n" - "<TITLE>Auto-generated html formated source</TITLE>\n" + "<TITLE>Auto-generated html formatted source</TITLE>\n" "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=windows-1252\">\n" "</HEAD>\n" "<BODY LINK=\"#0000ff\" VLINK=\"#800080\" BGCOLOR=\"#ffffff\">\n" diff --git a/doc/html/boost_regex/ref/regex_search.html b/doc/html/boost_regex/ref/regex_search.html index 1df187d5..c71571e9 100644 --- a/doc/html/boost_regex/ref/regex_search.html +++ b/doc/html/boost_regex/ref/regex_search.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -133,7 +133,8 @@
    diff --git a/doc/html/boost_regex/ref/regex_token_iterator.html b/doc/html/boost_regex/ref/regex_token_iterator.html index efa66df7..b22a36df 100644 --- a/doc/html/boost_regex/ref/regex_token_iterator.html +++ b/doc/html/boost_regex/ref/regex_token_iterator.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -419,7 +419,7 @@ char c; while(is.get(c)) { - // use logarithmic growth stategy, in case + // use logarithmic growth strategy, in case // in_avail (above) returned zero: if(s.capacity() == s.size()) s.reserve(s.capacity() * 3); diff --git a/doc/html/boost_regex/ref/regex_traits.html b/doc/html/boost_regex/ref/regex_traits.html index 6fefe195..c2c8f5c0 100644 --- a/doc/html/boost_regex/ref/regex_traits.html +++ b/doc/html/boost_regex/ref/regex_traits.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    @@ -51,7 +51,7 @@

    The class regex_traits is - just a thin wrapper around an actual implemention class, which may be one + just a thin wrapper around an actual implementation class, which may be one of:

      diff --git a/doc/html/boost_regex/ref/sub_match.html b/doc/html/boost_regex/ref/sub_match.html index ef360eaf..73d12430 100644 --- a/doc/html/boost_regex/ref/sub_match.html +++ b/doc/html/boost_regex/ref/sub_match.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +
      diff --git a/doc/html/boost_regex/ref/syntax_option_type.html b/doc/html/boost_regex/ref/syntax_option_type.html index 41e2ae86..b43e731c 100644 --- a/doc/html/boost_regex/ref/syntax_option_type.html +++ b/doc/html/boost_regex/ref/syntax_option_type.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +
      diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html index 8fa96988..c4e40877 100644 --- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html +++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      Options for POSIX Basic Regular Expressions diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html index 44ae9bac..01bb4a9c 100644 --- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html +++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      Options for POSIX Extended Regular Expressions diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html index 38cab78b..b601c6a0 100644 --- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html +++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      Options for Literal Strings diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html index 00438d33..4662512b 100644 --- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html +++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      Overview of syntax_option_type diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html index 37bf2e86..3b9f0a3b 100644 --- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html +++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      Options for Perl Regular Expressions diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html index 923014f0..60d50d96 100644 --- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html +++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      syntax_option_type Synopsis diff --git a/doc/html/boost_regex/syntax.html b/doc/html/boost_regex/syntax.html index 0d6a9b98..90211001 100644 --- a/doc/html/boost_regex/syntax.html +++ b/doc/html/boost_regex/syntax.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +
      @@ -36,7 +36,7 @@
      Character Class Names
      -
      Character +
      Character Classes that are Always Supported
      Character classes that are supported by Unicode Regular Expressions
      diff --git a/doc/html/boost_regex/syntax/basic_extended.html b/doc/html/boost_regex/syntax/basic_extended.html index 8f1d76a8..739b7ed0 100644 --- a/doc/html/boost_regex/syntax/basic_extended.html +++ b/doc/html/boost_regex/syntax/basic_extended.html @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      POSIX Extended Regular Expression Syntax @@ -317,7 +317,7 @@ cab

      An expression of the form [[=col=]], matches any character or collating element whose primary sort key is the - same as that for collating element col, as with colating + same as that for collating element col, as with collating elements the name col may be a symbolic name. A primary sort key is one that ignores case, accentation, or locale-specific tailorings; so for example [[=a=]] matches @@ -542,7 +542,7 @@ cab

    diff --git a/doc/html/boost_regex/syntax/basic_syntax.html b/doc/html/boost_regex/syntax/basic_syntax.html index c52cedf5..684dedbf 100644 --- a/doc/html/boost_regex/syntax/basic_syntax.html +++ b/doc/html/boost_regex/syntax/basic_syntax.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    POSIX Basic Regular Expression Syntax @@ -263,7 +263,7 @@ aaaa classes:

    - An expression of theform [[=col=]], + An expression of the form [[=col=]], matches any character or collating element whose primary sort key is the same as that for collating element col, as with collating elements the name col may be a collating diff --git a/doc/html/boost_regex/syntax/character_classes.html b/doc/html/boost_regex/syntax/character_classes.html index 565a174c..d821b466 100644 --- a/doc/html/boost_regex/syntax/character_classes.html +++ b/doc/html/boost_regex/syntax/character_classes.html @@ -7,7 +7,7 @@ - +

    - Converts c to lower case, used for Perl-style \l and \L formating + Converts c to lower case, used for Perl-style \l and \L formatting operations.

    - Converts c to upper case, used for Perl-style \u and \U formating + Converts c to upper case, used for Perl-style \u and \U formatting operations.

    - re.mark_count() + 1 + + re.mark_count()

    - e.mark_count() + 1 + + e.mark_count()

    - e.mark_count() + 1 + + e.mark_count()

    - Matches the single character which has the symbolic name name. + Matches the single character which has the symbolic name Name. For example \\N{newline} matches the single character \n.

    @@ -20,15 +20,15 @@
    -PrevUpHomeNext +PrevUpHomeNext
    -
    +
    -
    Character +
    Character Classes that are Always Supported
    Character classes that are supported by Unicode Regular Expressions
    @@ -44,7 +44,7 @@
    -PrevUpHomeNext +PrevUpHomeNext
    diff --git a/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html index 4b1cb492..6c2481ea 100644 --- a/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html +++ b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html @@ -6,7 +6,7 @@ - + @@ -20,9 +20,9 @@
    -PrevUpHomeNext +PrevUpHomeNext
    -
    +

    Character classes that are supported by Unicode Regular Expressions @@ -535,7 +535,7 @@
    -PrevUpHomeNext +PrevUpHomeNext
    diff --git a/doc/html/boost_regex/syntax/collating_names.html b/doc/html/boost_regex/syntax/collating_names.html index 60a0985b..facecfc6 100644 --- a/doc/html/boost_regex/syntax/collating_names.html +++ b/doc/html/boost_regex/syntax/collating_names.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/syntax/collating_names/digraphs.html b/doc/html/boost_regex/syntax/collating_names/digraphs.html index 88e98250..97c07669 100644 --- a/doc/html/boost_regex/syntax/collating_names/digraphs.html +++ b/doc/html/boost_regex/syntax/collating_names/digraphs.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +
    diff --git a/doc/html/boost_regex/syntax/collating_names/named_unicode.html b/doc/html/boost_regex/syntax/collating_names/named_unicode.html index 242f26a1..e8e05b85 100644 --- a/doc/html/boost_regex/syntax/collating_names/named_unicode.html +++ b/doc/html/boost_regex/syntax/collating_names/named_unicode.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Named Unicode Characters diff --git a/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html index 4c4e64cf..52384717 100644 --- a/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html +++ b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    POSIX Symbolic Names diff --git a/doc/html/boost_regex/syntax/leftmost_longest_rule.html b/doc/html/boost_regex/syntax/leftmost_longest_rule.html index d6145d03..6cc5e3fc 100644 --- a/doc/html/boost_regex/syntax/leftmost_longest_rule.html +++ b/doc/html/boost_regex/syntax/leftmost_longest_rule.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    The Leftmost Longest Rule diff --git a/doc/html/boost_regex/syntax/perl_syntax.html b/doc/html/boost_regex/syntax/perl_syntax.html index 5ef2986d..f6489948 100644 --- a/doc/html/boost_regex/syntax/perl_syntax.html +++ b/doc/html/boost_regex/syntax/perl_syntax.html @@ -22,7 +22,7 @@
    PrevUpHomeNext
    -
    +

    Perl Regular Expression Syntax @@ -223,7 +223,7 @@

    By default when a repeated pattern does not match then the engine will backtrack - until a match is found. However, this behaviour can sometime be undesireable + until a match is found. However, this behaviour can sometime be undesireble so there are also "possessive" repeats: these match as much as possible and do not then allow backtracking if the rest of the expression fails to match. @@ -1141,15 +1141,15 @@ 

    (?<NAME>expression)

    - Which can be then be refered to by the name NAME. Alternatively + Which can be then be referred to by the name NAME. Alternatively you can delimit the name using 'NAME' as in: 

    (?'NAME'expression)

    - These named subexpressions can be refered to in a backreference using either + These named subexpressions can be referred to in a backreference using either \g{NAME} or \k<NAME> and can - also be refered to by name in a Perl + also be referred to by name in a Perl format string for search and replace operations, or in the match_results member functions.

    @@ -1350,7 +1350,7 @@
  • (?(DEFINE)never-exectuted-pattern) Defines a block of code that is never executed and matches no characters: this is usually - used to define one or more named sub-expressions which are refered to + used to define one or more named sub-expressions which are referred to from elsewhere in the pattern.

diff --git a/doc/html/boost_regex/unicode.html b/doc/html/boost_regex/unicode.html index 6beee57f..48ae30e9 100644 --- a/doc/html/boost_regex/unicode.html +++ b/doc/html/boost_regex/unicode.html @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
diff --git a/doc/html/index.html b/doc/html/index.html index 7667d1fe..6f848eda 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -66,7 +66,7 @@
Character Class Names
-
Character +
Character Classes that are Always Supported
Character classes that are supported by Unicode Regular Expressions
@@ -198,7 +198,7 @@

- +

Last revised: May 24, 2013 at 12:05:31 GMT

Last revised: December 14, 2013 at 17:38:02 GMT
diff --git a/doc/icu_strings.qbk b/doc/icu_strings.qbk index 758f1d25..c3e3b873 100644 --- a/doc/icu_strings.qbk +++ b/doc/icu_strings.qbk @@ -65,25 +65,25 @@ The character encoding of the sequence is determined based upon sizeof(*i): = boost::regex_constants::perl); [*Effects]: Creates a regular expression object from the Null-terminated -UTF-8 characater sequence /p/. +UTF-8 character sequence /p/. u32regex make_u32regex(const unsigned char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl); -[*Effects]: Creates a regular expression object from the Null-terminated UTF-8 characater sequence p. +[*Effects]: Creates a regular expression object from the Null-terminated UTF-8 character sequence p. u32regex make_u32regex(const wchar_t* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl); -[*Effects]: Creates a regular expression object from the Null-terminated characater sequence p. The character encoding of the sequence is determined based upon sizeof(wchar_t): 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32. +[*Effects]: Creates a regular expression object from the Null-terminated character sequence p. The character encoding of the sequence is determined based upon sizeof(wchar_t): 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32. u32regex make_u32regex(const UChar* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl); -[*Effects]: Creates a regular expression object from the Null-terminated UTF-16 characater sequence p. +[*Effects]: Creates a regular expression object from the Null-terminated UTF-16 character sequence p. template u32regex make_u32regex(const std::basic_string& s, diff --git a/doc/introduction.qbk b/doc/introduction.qbk index fb8c0bbf..c48c5796 100644 --- a/doc/introduction.qbk +++ b/doc/introduction.qbk @@ -135,7 +135,7 @@ that we have already seen, the [match_results] class has a `format` member that takes the result of a match and a format string, and produces a new string by merging the two. -For iterating through all occurences of an expression within a text, +For iterating through all occurrences of an expression within a text, there are two iterator types: [regex_iterator] will enumerate over the [match_results] objects found, while [regex_token_iterator] will enumerate a series of strings (similar to perl style split operations). diff --git a/doc/old_regex.qbk b/doc/old_regex.qbk index 7e1e1ca8..f9e258b1 100644 --- a/doc/old_regex.qbk +++ b/doc/old_regex.qbk @@ -18,7 +18,7 @@ documentation is unlikely to be further updated. The class RegEx provides a high level simplified interface to the regular expression library, this class only handles narrow character strings, and regular expressions always follow the "normal" syntax - that is the -same as the perl / ECMAScript synatx. +same as the perl / ECMAScript syntax. typedef bool (*GrepCallback)(const RegEx& expression); typedef bool (*GrepFileCallback)(const char* file, const RegEx& expression); diff --git a/doc/regex_iterator.qbk b/doc/regex_iterator.qbk index 9789bcae..d3c966ba 100644 --- a/doc/regex_iterator.qbk +++ b/doc/regex_iterator.qbk @@ -126,7 +126,7 @@ to a [match_results] object, whose members are set as follows: [table [[Element][Value]] -[[`(*it).size()`][`re.mark_count()`]] +[[`(*it).size()`][`1 + re.mark_count()`]] [[`(*it).empty()`][`false`]] [[`(*it).prefix().first`][The end of the last match found, or the start of the underlying sequence if this is the first match enumerated]] @@ -203,7 +203,7 @@ memory allocation (if Boost.Regex is configured in non-recursive mode). const basic_regex& e, regex_constants::match_flag_type m = regex_constants::match_default); -[*Effects]: returns an iterator that enumerates all occurences of expression /e/ +[*Effects]: returns an iterator that enumerates all occurrences of expression /e/ in text /p/ using [match_flag_type] /m/. [h4 Examples] diff --git a/doc/regex_match.qbk b/doc/regex_match.qbk index 55856c41..d5039bfc 100644 --- a/doc/regex_match.qbk +++ b/doc/regex_match.qbk @@ -82,7 +82,7 @@ given in the table: [table [[Element][Value]] -[[`m.size()`][`e.mark_count()`]] +[[`m.size()`][`1 + e.mark_count()`]] [[`m.empty()`][`false`]] [[`m.prefix().first`][`first`]] [[`m.prefix().last`][`first`]] diff --git a/doc/regex_replace.qbk b/doc/regex_replace.qbk index 43e0760f..7228ba59 100644 --- a/doc/regex_replace.qbk +++ b/doc/regex_replace.qbk @@ -43,8 +43,8 @@ only the first occurrence is replaced rather than all occurrences. Formatter fmt, match_flag_type flags = match_default); -Enumerates all the occurences of expression /e/ in the sequence \[first, last), -replacing each occurence with the string that results by merging the +Enumerates all the occurrences of expression /e/ in the sequence \[first, last), +replacing each occurrence with the string that results by merging the match found with the format string /fmt/, and copies the resulting string to /out/. In the case that /fmt/ is a unary, binary or ternary function object, then the character sequence generated by that object is copied unchanged to the output when performing @@ -54,9 +54,9 @@ If the flag `format_no_copy` is set in /flags/ then unmatched sections of text are not copied to output. If the flag `format_first_only` is set in flags then only the first -occurence of /e/ is replaced. +occurrence of /e/ is replaced. -The manner in which the format string /fmt/ is interpretted, along with the +The manner in which the format string /fmt/ is interpreted, along with the rules used for finding matches, are determined by the flags set in /flags/: see [match_flag_type]. @@ -251,7 +251,7 @@ syntax highlighted HTML code. const char* header_text = "\n\n" - "Auto-generated html formated source\n" + "Auto-generated html formatted source\n" "\n" "\n" "\n" diff --git a/doc/regex_search.qbk b/doc/regex_search.qbk index 3b712d0c..2f8b7e5c 100644 --- a/doc/regex_search.qbk +++ b/doc/regex_search.qbk @@ -80,7 +80,7 @@ are given in the table: [table [[Element][Value]] -[[`m.size()`][`e.mark_count()`]] +[[`m.size()`][`1 + e.mark_count()`]] [[`m.empty()`][`false`]] [[`m.prefix().first`][`first`]] [[`m.prefix().last`][`m[0].first`]] diff --git a/doc/regex_token_iterator.qbk b/doc/regex_token_iterator.qbk index c975c5af..f97ce68a 100644 --- a/doc/regex_token_iterator.qbk +++ b/doc/regex_token_iterator.qbk @@ -378,7 +378,7 @@ The following example takes a html file and outputs a list of all the linked fil char c; while(is.get(c)) { - // use logarithmic growth stategy, in case + // use logarithmic growth strategy, in case // in_avail (above) returned zero: if(s.capacity() == s.size()) s.reserve(s.capacity() * 3); diff --git a/doc/regex_traits.qbk b/doc/regex_traits.qbk index 7faae830..4b5273c3 100644 --- a/doc/regex_traits.qbk +++ b/doc/regex_traits.qbk @@ -29,7 +29,7 @@ [h4 Description] -The class `regex_traits` is just a thin wrapper around an actual implemention +The class `regex_traits` is just a thin wrapper around an actual implementation class, which may be one of: * `c_regex_traits`: this class is deprecated, it wraps the C locale, and is used as the default implementation when the platform is not Win32, and the C++ locale is not available. diff --git a/doc/syntax_basic.qbk b/doc/syntax_basic.qbk index 75f7ce5f..019d731a 100644 --- a/doc/syntax_basic.qbk +++ b/doc/syntax_basic.qbk @@ -173,7 +173,7 @@ See [link boost_regex.syntax.collating_names collating element names]. [h5 Equivalence classes:] -An expression of theform `[[=col=]]`, matches any character or collating +An expression of the form `[[=col=]]`, matches any character or collating element whose primary sort key is the same as that for collating element /col/, as with collating elements the name /col/ may be a [link boost_regex.syntax.collating_names collating symbolic name]. diff --git a/doc/syntax_extended.qbk b/doc/syntax_extended.qbk index 3548dba6..2b3ab31a 100644 --- a/doc/syntax_extended.qbk +++ b/doc/syntax_extended.qbk @@ -209,7 +209,7 @@ matches a NUL character. An expression of the form `[[=col=]]`, matches any character or collating element whose primary sort key is the same as that for collating element /col/, -as with colating elements the name /col/ may be a +as with collating elements the name /col/ may be a [link boost_regex.syntax.collating_names symbolic name]. A primary sort key is one that ignores case, accentation, or locale-specific tailorings; so for example `[[=a=]]` matches any of the characters: @@ -257,7 +257,7 @@ The following escape sequences are all synonyms for single characters: [[\\xdd][A hexadecimal escape sequence - matches the single character whose code point is 0xdd.]] [[\\x{dddd}][A hexadecimal escape sequence - matches the single character whose code point is 0xdddd.]] [[\\0ddd][An octal escape sequence - matches the single character whose code point is 0ddd.]] -[[\\N{Name}][Matches the single character which has the symbolic name name. For example `\\N{newline}` matches the single character \\n.]] +[[\\N{Name}][Matches the single character which has the symbolic name ['Name]. For example `\\N{newline}` matches the single character \\n.]] ] [h5 "Single character" character classes:] diff --git a/doc/syntax_perl.qbk b/doc/syntax_perl.qbk index 570c0b6d..73fa2814 100644 --- a/doc/syntax_perl.qbk +++ b/doc/syntax_perl.qbk @@ -146,7 +146,7 @@ consume as little input as possible while still producing a match. [h4 Possessive repeats] By default when a repeated pattern does not match then the engine will backtrack until -a match is found. However, this behaviour can sometime be undesireable so there are +a match is found. However, this behaviour can sometime be undesireble so there are also "possessive" repeats: these match as much as possible and do not then allow backtracking if the rest of the expression fails to match. @@ -436,13 +436,13 @@ You can create a named subexpression using: (?expression) -Which can be then be refered to by the name /NAME/. Alternatively you can delimit the name +Which can be then be referred to by the name /NAME/. Alternatively you can delimit the name using 'NAME' as in: (?'NAME'expression) -These named subexpressions can be refered to in a backreference using either [^\g{NAME}] or [^\k] -and can also be refered to by name in a [perl_format] format string for search and replace operations, or in the +These named subexpressions can be referred to in a backreference using either [^\g{NAME}] or [^\k] +and can also be referred to by name in a [perl_format] format string for search and replace operations, or in the [match_results] member functions. [h5 Comments] @@ -557,7 +557,7 @@ executes /no-pattern/. * [^(?(R&['name])yes-pattern|no-pattern)] Executes /yes-pattern/ if we are executing inside a recursion to named sub-expression /name/, otherwise executes /no-pattern/. * [^(?(DEFINE)never-exectuted-pattern)] Defines a block of code that is never executed and matches no characters: -this is usually used to define one or more named sub-expressions which are refered to from elsewhere in the pattern. +this is usually used to define one or more named sub-expressions which are referred to from elsewhere in the pattern. [h4 Operator precedence] diff --git a/doc/unicode_iterators.qbk b/doc/unicode_iterators.qbk index e5962bd2..9974f4c8 100644 --- a/doc/unicode_iterators.qbk +++ b/doc/unicode_iterators.qbk @@ -63,7 +63,7 @@ A Bidirectional iterator adapter that makes an underlying sequence of UTF16 char The three-arg constructor of this class takes the start and end of the underlying sequence as well as the position to start iteration from. This constructor validates that the -underlying sequence has validly encoded endpoints: this prevents accidently incrementing/decrementing +underlying sequence has validly encoded endpoints: this prevents accidentally incrementing/decrementing past the end of the underlying sequence as a result of invalid UTF16 code sequences at the endpoints of the underlying range. @@ -94,7 +94,7 @@ look like a (read-only) sequence of UTF32 characters. The three-arg constructor of this class takes the start and end of the underlying sequence as well as the position to start iteration from. This constructor validates that the -underlying sequence has validly encoded endpoints: this prevents accidently incrementing/decrementing +underlying sequence has validly encoded endpoints: this prevents accidentally incrementing/decrementing past the end of the underlying sequence as a result of invalid UTF8 code sequences at the endpoints of the underlying range.