Skip to content

Commit

Permalink
Merge pull request boostorg#38 from jwilk-forks/spelling
Browse files Browse the repository at this point in the history
Fix typos in documentation
  • Loading branch information
Lastique authored Nov 24, 2018
2 parents 8c9bba5 + 97cb638 commit 613df5a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion doc/deprecated.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ <h2><a name="Deprecated-names">Deprecated names</a> and features</h2>
</tr>
<tr>
<td style="font-size: 10pt" valign="top"><code>class path</code></td>
<td style="font-size: 10pt" valign="top"><code>is_complere()</code></td>
<td style="font-size: 10pt" valign="top"><code>is_complete()</code></td>
<td style="font-size: 10pt" valign="top">&#10004;</td>
<td style="font-size: 10pt" valign="top"><code>is_absolute()</code></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion doc/design.htm
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ <h2><a name="Realities">Realities</a></h2>
(so-called 8.3) file names.<br>
&nbsp;</li>
<li>Some operating systems allow file systems with different
characteristics to be &quot;mounted&quot; within a directory tree.&nbsp; Thus a
characteristics to be &quot;mounted&quot; within a directory tree.&nbsp; Thus an
ISO-9660 or Windows
file system may end up as a sub-tree of a POSIX directory tree.<br>
&nbsp;</li>
Expand Down
2 changes: 1 addition & 1 deletion doc/faq.htm
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h2>
not just for POSIX-based operating systems but also for Windows and the
URL portion of URI's. It is ubiquitous and
familiar.&nbsp; On many systems, it is very easy to implement because it is
either the native operating system format (Unix and Windows) or via a
either the native operating system format (Unix and Windows) or via an
operating system supplied
POSIX library (z/OS, OS/390, and many more.)</p>
<p><b>Why not use a full URI (Universal Resource Identifier) based path?</b></p>
Expand Down
22 changes: 11 additions & 11 deletions doc/reference.html
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ <h3><a name="Relative-path">relative path</a> [fs.def.relative-path]</h3>
an implied starting location. The elements of a path that determine if it is
relative are operating system dependent.&nbsp; [<i>Note:</i>
Paths <code>&quot;.&quot;</code> and <code>&quot;..&quot;</code> are relative paths. <i>—end note</i>]</p>
<h3><a name="canonical-path">canonical path</a> [fs.def.cannonical-path]</h3>
<h3><a name="canonical-path">canonical path</a> [fs.def.canonical-path]</h3>
<p>An absolute path that has
no elements that are symbolic links, and no <code>&quot;.&quot;</code> or <code>&quot;..&quot;</code> elements.</p>
<h3><a name="pathname">pathname</a> [fs.def.pathname]</h3>
Expand Down Expand Up @@ -955,7 +955,7 @@ <h2><a name="Error-reporting">Error reporting</a> [fs.err.report]</h2>
most everyday programming.<br>
&nbsp;</li>
<li>
<p>Uses where file system system errors are routine and do not necessarily represent
<p>Uses where file system errors are routine and do not necessarily represent
failure. Returning an error code is the most appropriate response. This allows
application specific error handling, including simply ignoring the error.</li>
</ul>
Expand Down Expand Up @@ -985,7 +985,7 @@ <h2><a name="Error-reporting">Error reporting</a> [fs.err.report]</h2>
implementation to an operating system or other underlying API results in an
error that prevents the function from meeting its specifications, the
<code>system::error_code&amp;</code> argument is set as
appropriate appropriate for the specific error. Otherwise, <code>clear()</code>
appropriate for the specific error. Otherwise, <code>clear()</code>
is called on the
<code>system::error_code&amp;</code> argument.<br>
&nbsp;</li>
Expand Down Expand Up @@ -1318,7 +1318,7 @@ <h3><a name="path-appends"><code><font size="4"> path</font></code> appends</a>
<p>an added separator
would be redundant, or</li>
<li>
<p>would change an relative path to an absolute path, or</li>
<p>would change a relative path to an absolute path, or</li>
<li>
<p><code>p.empty()</code>, or</li>
<li>
Expand Down Expand Up @@ -1346,7 +1346,7 @@ <h3><a name="path-appends"><code><font size="4"> path</font></code> appends</a>
<p>an added separator
would be redundant, or</li>
<li>
<p>would change an relative path to an absolute path, or</li>
<p>would change a relative path to an absolute path, or</li>
<li>
<p><code>p.empty()</code>, or</li>
<li>
Expand Down Expand Up @@ -1400,7 +1400,7 @@ <h3><a name="path-modifiers"> <code>
<pre>path&amp; <a name="path-make_preferred">make_preferred</a>();</pre>

<blockquote>
<p><i>Effects:</i> <i>directory-separator</i>s are converted to <i>prefered-separator</i>s.
<p><i>Effects:</i> <i>directory-separator</i>s are converted to <i>preferred-separator</i>s.
See [<a href="#Operating-system-examples">fs.os.examples</a>].</p>
<p><i>Returns:</i> <code>*this</code></p>
</blockquote>
Expand Down Expand Up @@ -2709,7 +2709,7 @@ <h2><a name="Class-directory_iterator">Class <code>directory_iterator</code>
input iterator (C++ Std, 24.2.1, Input iterators [input.iterators]).</p>
<p>A <code>directory_iterator</code> reads successive elements from the directory for
which it was constructed, as if by calling ISO/IEC 9945 <code><a href="http://www.opengroup.org/onlinepubs/000095399/functions/readdir_r.html">readdir_r()</a></code>. After a <code>directory_iterator</code> is constructed, and every time <code>operator++</code> is called,
it reads a directory element and stores information about it in a object of type <code><a href="#Class-directory_entry">directory_entry</a></code>. <code>operator++</code> is not equality preserving; that is, <code>i == j</code> does not imply that <code>++i == ++j</code>. </p>
it reads a directory element and stores information about it in an object of type <code><a href="#Class-directory_entry">directory_entry</a></code>. <code>operator++</code> is not equality preserving; that is, <code>i == j</code> does not imply that <code>++i == ++j</code>. </p>
<blockquote>
<p>[<i>Note:</i> The practical consequence of not preserving equality is that directory iterators
can only be used for single-pass algorithms. <i>—end note</i>]</p>
Expand Down Expand Up @@ -2761,7 +2761,7 @@ <h3><a name="directory_iterator-members"><code>directory_iterator</code> members
directory_iterator(</code>const path&amp; p, system::error_code&amp; ec<code>);</code></pre>
<blockquote>

<p><i>Effects:</i> Constructs a iterator representing the first
<p><i>Effects:</i> Constructs an iterator representing the first
entry in the directory <code>p</code> resolves to, if any; otherwise, the end iterator.</p>

<p><i>Throws:</i> As specified in <a href="#Error-reporting">Error reporting</a>.</p>
Expand Down Expand Up @@ -2863,7 +2863,7 @@ <h2><a name="Class-recursive_directory_iterator">Class <code>recursive_directory
recursive_<code>directory_iterator(</code>const path&amp; p, system::error_code&amp; ec<code>);</code></pre>
<blockquote>

<p><i>Effects:</i>&nbsp; Constructs a iterator representing the first
<p><i>Effects:</i>&nbsp; Constructs an iterator representing the first
entry in the directory <code>p</code> resolves to, if any; otherwise, the end iterator.</p>

<p><i>Postcondition: </i>Unless the end iterator was constructed,<i> </i><code>level() == 0 &amp;&amp; no_push_pending() == false &amp;&amp; m_options == opt</code>.
Expand Down Expand Up @@ -3426,7 +3426,7 @@ <h2><a name="Operational-functions">Operational functions</a> [fs.op.funcs]</h2>
<blockquote>
<p><i>Returns:</i> An object of type <code><a href="#space_info">space_info</a></code>. The value of the <code>space_info</code> object is determined as if by
using ISO/IEC 9945 <code><a href="http://www.opengroup.org/onlinepubs/000095399/functions/statvfs.html"
style="text-decoration: none">statvfs()</a></code> to obtain a ISO/IEC 9945 struct
style="text-decoration: none">statvfs()</a></code> to obtain an ISO/IEC 9945 struct
<code><a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/statvfs.h.html" style="text-decoration: none">statvfs</a></code>,
and then multiplying its <code>f_blocks</code>, <code>f_bfree</code>,
and <code>f_bavail</code> members by its <code>f_frsize</code> member,
Expand Down Expand Up @@ -4240,7 +4240,7 @@ <h2><a name="Acknowledgements">Acknowledgements</a></h2>
<p>The create_directories, extension, basename, and replace_extension functions
were developed by Vladimir Prus. The temp_directory_path function was
contributed by Jeff Flinn. David Svoboda suggested the canonical function and
provided psuedo-code.</p>
provided pseudo-code.</p>
<p>Howard Hinnant and John Maddock reviewed a draft of the version 2 proposal, and
identified a number of mistakes or weaknesses, resulting in a more polished
final document.</p>
Expand Down
2 changes: 1 addition & 1 deletion doc/tickets.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<p>&nbsp;</p>
<h2>Locale related</h2>
<p><a href="https://svn.boost.org/trac/boost/ticket/3332">#3332</a>
boost::filesystem::path will get trobule in locale Chinese_Taiwan.950 (windows)<br>
boost::filesystem::path will get trouble in locale Chinese_Taiwan.950 (windows)<br>
<a href="https://svn.boost.org/trac/boost/ticket/7211">#7211</a> path_locale
destructor crashes when overloaded operator new and delete are present<br>
<a href="https://svn.boost.org/trac/boost/ticket/8388">#8388</a>
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial.html
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ <h2><a name="Directory-iteration">Directory iteration</a> plus catching
results ourselves. </li>
</ul>

<p>The next sections show how how those changes play out, so read on!</p>
<p>The next sections show how those changes play out, so read on!</p>

<h2><a name="Using-path-decomposition">Using path decomposition, plus sorting results</a> - (<a href="../example/tut4.cpp">tut4.cpp</a>)</h2>

Expand Down
2 changes: 1 addition & 1 deletion doc/v3_design.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ <h2><a name="Details">Details</a></h2>
</tr>
</table>

<p>When a class path function argument type matches the the operating system's
<p>When a class path function argument type matches the operating system's
API argument type for paths, no conversion is performed rather than conversion
to a specified encoding such as one of the Unicode encodings. This avoids
unintended consequences, etc.</p>
Expand Down

0 comments on commit 613df5a

Please sign in to comment.