diff options
Diffstat (limited to 'libstdc++-v3/doc/xml')
-rw-r--r-- | libstdc++-v3/doc/xml/manual/build_hacking.xml | 8 | ||||
-rw-r--r-- | libstdc++-v3/doc/xml/manual/configure.xml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/doc/xml/manual/build_hacking.xml b/libstdc++-v3/doc/xml/manual/build_hacking.xml index 917b4d258ff..912658bb2ce 100644 --- a/libstdc++-v3/doc/xml/manual/build_hacking.xml +++ b/libstdc++-v3/doc/xml/manual/build_hacking.xml @@ -142,13 +142,13 @@ in the build directory starts the build process. The <literal>all</literal> targ <para> Most comments should use {octothorpes, shibboleths, hash marks, pound signs, whatever} rather than "dnl". Nearly all comments in - configure.ac should. Comments inside macros written in ancilliary + configure.ac should. Comments inside macros written in ancillary .m4 files should. About the only comments which should <emphasis>not</emphasis> use #, but use dnl instead, are comments - <emphasis>outside</emphasis> our own macros in the ancilliary + <emphasis>outside</emphasis> our own macros in the ancillary files. The difference is that # comments show up in <code>configure</code> (which is most helpful for debugging), - while dnl'd lines just vanish. Since the macros in ancilliary + while dnl'd lines just vanish. Since the macros in ancillary files generate code which appears in odd places, their "outside" comments tend to not be useful while reading <code>configure</code>. @@ -419,7 +419,7 @@ in the build directory starts the build process. The <literal>all</literal> targ </para> <para> Generates two convenience libraries, one for C++98 and one for - C++11, various compability files for shared and static + C++11, various compatibility files for shared and static libraries, and then collects all the generated bits and creates the final libstdc++ libraries. </para> diff --git a/libstdc++-v3/doc/xml/manual/configure.xml b/libstdc++-v3/doc/xml/manual/configure.xml index cf0989720fa..3246d85193e 100644 --- a/libstdc++-v3/doc/xml/manual/configure.xml +++ b/libstdc++-v3/doc/xml/manual/configure.xml @@ -376,7 +376,7 @@ to standard error for certain events such as calling a pure virtual function or the invocation of the standard terminate handler. Those messages cause the library to depend on the demangler and standard I/O - facilites, which might be undesirable in a low-memory environment or + facilities, which might be undesirable in a low-memory environment or when standard error is not available. This option disables those messages. This option does not change the library ABI. </para> |