summaryrefslogtreecommitdiff
path: root/libs/format
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2016-10-06 10:30:07 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2016-10-06 10:32:57 +0900
commit71d216b90256936a9638f325af9bc69d720e75de (patch)
tree9c5f682d341c7c88ad0c8e3d4b262e00b6fb691a /libs/format
parent733b5d5ae2c5d625211e2985ac25728ac3f54883 (diff)
downloadboost-71d216b90256936a9638f325af9bc69d720e75de.tar.gz
boost-71d216b90256936a9638f325af9bc69d720e75de.tar.bz2
boost-71d216b90256936a9638f325af9bc69d720e75de.zip
Imported Upstream version 1.59.0
Change-Id: I2dde00f4eca71df3eea9d251dcaecde18a6c90a5 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'libs/format')
-rw-r--r--libs/format/doc/format.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/format/doc/format.html b/libs/format/doc/format.html
index 9b06eea4b3..6995572085 100644
--- a/libs/format/doc/format.html
+++ b/libs/format/doc/format.html
@@ -218,7 +218,7 @@ cout &lt;&lt; fmter2 % 101 ;
cout &lt;&lt; format("_%1%_ %1% \n") % group(showpos, setw(5), 101);
</pre>
- </blockquote>The manipulators are applied at each occurence of %1%, and
+ </blockquote>The manipulators are applied at each occurrence of %1%, and
thus it prints : "_ +101_ +101 \n"
</li>
@@ -738,7 +738,7 @@ cout &lt;&lt; format("%1% %2% %1%\n") % group(hex, showbase, 40) % 50; // prints
</ol>
<p>Such manipulators are passed to the streams right before the following
- argument, at every occurence. Note that formatting options specified within
+ argument, at every occurrence. Note that formatting options specified within
the format string are overridden by stream state modifiers passed this way.
For instance in the following code, the <i>hex</i> manipulator has priority
over the <i>d</i> type-specification in the format-string which would set