Skip to content

Commit 7a7b02b

Browse files
authored
Merge pull request #127 from ivanpanch/patch-1
Fix documentation mistakes
2 parents 2048b5a + f71f1fe commit 7a7b02b

8 files changed

Lines changed: 34 additions & 34 deletions

File tree

doc/property_tree.qbk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ these three basic patterns of usage:
102102
assignments. Or when tomorrow is final deadline for your project.
103103
* ['Get the data and revert to default value if it cannot be done.] Used when
104104
you want to allow omitting the key in question. Implemented by some similar
105-
tools (windows INI file access functions).
105+
tools (Windows INI file access functions).
106106
* ['Get the data, but I care more whether you succeeded than I do for the data
107107
itself.] Used when you want to vary control flow depending on get
108108
success/failure. Or to check for presence of a key.

doc/xml_parser.qbk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RapidXML does not fully support the XML standard; it is not capable of parsing
1818
DTDs and therefore cannot do full entity substitution.
1919

2020
By default, the parser will preserve most whitespace, but remove element content
21-
that consists only of whitespace. Encoded whitespaces (e.g.  ) does not
21+
that consists only of whitespace. Encoded whitespaces (e.g.  ) do not
2222
count as whitespace in this regard. You can pass the trim_whitespace flag if you
2323
want all leading and trailing whitespace trimmed and all continuous whitespace
2424
collapsed into a single space.

include/boost/property_tree/info_parser.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace boost { namespace property_tree { namespace info_parser
2121
{
2222

2323
/**
24-
* Read INFO from a the given stream and translate it to a property tree.
24+
* Read INFO from the given stream and translate it to a property tree.
2525
* @note Replaces the existing contents. Strong exception guarantee.
2626
* @throw info_parser_error If the stream cannot be read, doesn't contain
2727
* valid INFO, or a conversion fails.
@@ -35,7 +35,7 @@ namespace boost { namespace property_tree { namespace info_parser
3535
}
3636

3737
/**
38-
* Read INFO from a the given stream and translate it to a property tree.
38+
* Read INFO from the given stream and translate it to a property tree.
3939
* @note Replaces the existing contents. Strong exception guarantee.
4040
* @param default_ptree If parsing fails, pt is set to a copy of this tree.
4141
*/
@@ -51,7 +51,7 @@ namespace boost { namespace property_tree { namespace info_parser
5151
}
5252

5353
/**
54-
* Read INFO from a the given file and translate it to a property tree. The
54+
* Read INFO from the given file and translate it to a property tree. The
5555
* tree's key type must be a string type, i.e. it must have a nested
5656
* value_type typedef that is a valid parameter for basic_ifstream.
5757
* @note Replaces the existing contents. Strong exception guarantee.
@@ -75,7 +75,7 @@ namespace boost { namespace property_tree { namespace info_parser
7575
}
7676

7777
/**
78-
* Read INFO from a the given file and translate it to a property tree. The
78+
* Read INFO from the given file and translate it to a property tree. The
7979
* tree's key type must be a string type, i.e. it must have a nested
8080
* value_type typedef that is a valid parameter for basic_ifstream.
8181
* @note Replaces the existing contents. Strong exception guarantee.

include/boost/property_tree/ini_parser.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace boost { namespace property_tree { namespace ini_parser
5454
};
5555

5656
/**
57-
* Read INI from a the given stream and translate it to a property tree.
57+
* Read INI from the given stream and translate it to a property tree.
5858
* @note Clears existing contents of property tree. In case of error
5959
* the property tree is not modified.
6060
* @throw ini_parser_error If a format violation is found.
@@ -146,9 +146,9 @@ namespace boost { namespace property_tree { namespace ini_parser
146146
}
147147

148148
/**
149-
* Read INI from a the given file and translate it to a property tree.
149+
* Read INI from the given file and translate it to a property tree.
150150
* @note Clears existing contents of property tree. In case of error the
151-
* property tree unmodified.
151+
* property tree is not modified.
152152
* @throw ini_parser_error In case of error deserializing the property tree.
153153
* @param filename Name of file from which to read in the property tree.
154154
* @param[out] pt The property tree to populate.
@@ -250,7 +250,7 @@ namespace boost { namespace property_tree { namespace ini_parser
250250
}
251251

252252
/**
253-
* Translates the property tree to INI and writes it the given output
253+
* Translates the property tree to INI and writes it to the given output
254254
* stream.
255255
* @pre @e pt cannot have data in its root.
256256
* @pre @e pt cannot have keys both data and children.
@@ -260,7 +260,7 @@ namespace boost { namespace property_tree { namespace ini_parser
260260
* INI or writing to the output stream.
261261
* @param stream The stream to which to write the INI representation of the
262262
* property tree.
263-
* @param pt The property tree to tranlsate to INI and output.
263+
* @param pt The property tree to translate to INI and output.
264264
* @param flags The flags to use when writing the INI file.
265265
* No flags are currently supported.
266266
*/
@@ -284,7 +284,7 @@ namespace boost { namespace property_tree { namespace ini_parser
284284
}
285285

286286
/**
287-
* Translates the property tree to INI and writes it the given file.
287+
* Translates the property tree to INI and writes it to the given file.
288288
* @pre @e pt cannot have data in its root.
289289
* @pre @e pt cannot have keys both data and children.
290290
* @pre @e pt cannot be deeper than two levels.
@@ -293,7 +293,7 @@ namespace boost { namespace property_tree { namespace ini_parser
293293
* to INI or writing to the file.
294294
* @param filename The name of the file to which to write the INI
295295
* representation of the property tree.
296-
* @param pt The property tree to tranlsate to INI and output.
296+
* @param pt The property tree to translate to INI and output.
297297
* @param flags The flags to use when writing the INI file.
298298
* The following flags are supported:
299299
* @li @c skip_ini_validity_check -- Skip check if ptree is a valid ini. The

include/boost/property_tree/json_parser.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ namespace boost { namespace property_tree { namespace json_parser
2424
{
2525

2626
/**
27-
* Read JSON from a the given stream and translate it to a property tree.
27+
* Read JSON from the given stream and translate it to a property tree.
2828
* @note Clears existing contents of property tree. In case of error the
29-
* property tree unmodified.
29+
* property tree is not modified.
3030
* @note Items of JSON arrays are translated into ptree keys with empty
3131
* names. Members of objects are translated into named keys.
3232
* @note JSON data can be a string, a numeric value, or one of literals
@@ -47,9 +47,9 @@ namespace boost { namespace property_tree { namespace json_parser
4747
}
4848

4949
/**
50-
* Read JSON from a the given file and translate it to a property tree.
50+
* Read JSON from the given file and translate it to a property tree.
5151
* @note Clears existing contents of property tree. In case of error the
52-
* property tree unmodified.
52+
* property tree is not modified.
5353
* @note Items of JSON arrays are translated into ptree keys with empty
5454
* names. Members of objects are translated into named keys.
5555
* @note JSON data can be a string, a numeric value, or one of literals
@@ -76,7 +76,7 @@ namespace boost { namespace property_tree { namespace json_parser
7676
}
7777

7878
/**
79-
* Translates the property tree to JSON and writes it the given output
79+
* Translates the property tree to JSON and writes it to the given output
8080
* stream.
8181
* @note Any property tree key containing only unnamed subkeys will be
8282
* rendered as JSON arrays.
@@ -85,7 +85,7 @@ namespace boost { namespace property_tree { namespace json_parser
8585
* to JSON or writing to the output stream.
8686
* @param stream The stream to which to write the JSON representation of the
8787
* property tree.
88-
* @param pt The property tree to tranlsate to JSON and output.
88+
* @param pt The property tree to translate to JSON and output.
8989
* @param pretty Whether to pretty-print. Defaults to true for backward
9090
* compatibility.
9191
*/
@@ -100,7 +100,7 @@ namespace boost { namespace property_tree { namespace json_parser
100100
}
101101

102102
/**
103-
* Translates the property tree to JSON and writes it the given file.
103+
* Translates the property tree to JSON and writes it to the given file.
104104
* @note Any property tree key containing only unnamed subkeys will be
105105
* rendered as JSON arrays.
106106
* @pre @e pt cannot contain keys that have both subkeys and non-empty data.

include/boost/property_tree/ptree.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ namespace boost { namespace property_tree
462462
/** If the node identified by the path does not exist, create it,
463463
* including all its missing parents.
464464
* If the node already exists, add a sibling with the same key.
465-
* Set the newly created node's value to the given paremeter,
465+
* Set the newly created node's value to the given parameter,
466466
* translated with the supplied translator.
467467
* @param path Path to the child. The last fragment must not have an
468468
* index.
@@ -479,7 +479,7 @@ namespace boost { namespace property_tree
479479
/** If the node identified by the path does not exist, create it,
480480
* including all its missing parents.
481481
* If the node already exists, add a sibling with the same key.
482-
* Set the newly created node's value to the given paremeter,
482+
* Set the newly created node's value to the given parameter,
483483
* translated with the supplied translator.
484484
* @param path Path to the child. The last fragment must not have an
485485
* index.

include/boost/property_tree/string_path.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ namespace boost { namespace property_tree
7474
/// If instantiated with std::string and id_translator\<std::string\>,
7575
/// it accepts paths of the form "one.two.three.four".
7676
///
77-
/// @tparam String Any Sequence. If the sequence does not support random-
78-
/// access iteration, concatenation of paths assumes that
79-
/// insertions at the end preserve iterator validity.
77+
/// @tparam String Any Sequence. If the sequence does not support
78+
/// random-access iteration, concatenation of paths assumes
79+
/// that insertions at the end preserve iterator validity.
8080
/// @tparam Translator A translator with internal_type == String.
8181
template <typename String, typename Translator>
8282
class string_path
@@ -98,8 +98,8 @@ namespace boost { namespace property_tree
9898
string_path(const String &value, char_type separator = char_type('.'),
9999
Translator tr = Translator());
100100
/// Create a path by parsing the given string.
101-
/// @param value A zero-terminated array of values. Only use if zero-
102-
/// termination makes sense for your type, and your
101+
/// @param value A zero-terminated array of values. Only use if
102+
/// zero-termination makes sense for your type, and your
103103
/// sequence supports construction from it. Intended for
104104
/// string literals.
105105
/// @param separator The separator used in parsing. Defaults to '.'.

include/boost/property_tree/xml_parser.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace boost { namespace property_tree { namespace xml_parser
2828
/**
2929
* Reads XML from an input stream and translates it to property tree.
3030
* @note Clears existing contents of property tree. In case of error the
31-
* property tree unmodified.
31+
* property tree is not modified.
3232
* @note XML attributes are placed under keys named @c \<xmlattr\>.
3333
* @throw xml_parser_error In case of error deserializing the property tree.
3434
* @param stream Stream from which to read in the property tree.
@@ -56,12 +56,12 @@ namespace boost { namespace property_tree { namespace xml_parser
5656
* Reads XML from a file using the given locale and translates it to
5757
* property tree.
5858
* @note Clears existing contents of property tree. In case of error the
59-
* property tree unmodified.
59+
* property tree is not modified.
6060
* @note XML attributes are placed under keys named @c \<xmlattr\>.
6161
* @throw xml_parser_error In case of error deserializing the property tree.
6262
* @param filename The file from which to read in the property tree.
6363
* @param[out] pt The property tree to populate.
64-
* @param flags Flags controlling the bahviour of the parser.
64+
* @param flags Flags controlling the behaviour of the parser.
6565
* The following flags are supported:
6666
* @li @c no_concat_text -- Prevents concatenation of text nodes into
6767
* datastring of property tree. Puts them in
@@ -86,13 +86,13 @@ namespace boost { namespace property_tree { namespace xml_parser
8686
}
8787

8888
/**
89-
* Translates the property tree to XML and writes it the given output
89+
* Translates the property tree to XML and writes it to the given output
9090
* stream.
9191
* @throw xml_parser_error In case of error translating the property tree to
9292
* XML or writing to the output stream.
9393
* @param stream The stream to which to write the XML representation of the
9494
* property tree.
95-
* @param pt The property tree to tranlsate to XML and output.
95+
* @param pt The property tree to translate to XML and output.
9696
* @param settings The settings to use when writing out the property tree as
9797
* XML.
9898
*/
@@ -110,12 +110,12 @@ namespace boost { namespace property_tree { namespace xml_parser
110110
}
111111

112112
/**
113-
* Translates the property tree to XML and writes it the given file.
113+
* Translates the property tree to XML and writes it to the given file.
114114
* @throw xml_parser_error In case of error translating the property tree to
115115
* XML or writing to the output stream.
116116
* @param filename The file to which to write the XML representation of the
117117
* property tree.
118-
* @param pt The property tree to tranlsate to XML and output.
118+
* @param pt The property tree to translate to XML and output.
119119
* @param loc The locale to use when writing the output to file.
120120
* @param settings The settings to use when writing out the property tree as
121121
* XML.

0 commit comments

Comments
 (0)