summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/docs/ClangCommandLineReference.rst2
-rw-r--r--clang/docs/ClangFormatStyleOptions.rst2
-rw-r--r--clang/docs/LanguageExtensions.rst2
-rw-r--r--clang/docs/Toolchain.rst6
4 files changed, 6 insertions, 6 deletions
diff --git a/clang/docs/ClangCommandLineReference.rst b/clang/docs/ClangCommandLineReference.rst
index 61abd05e0cc..e852c3e3879 100644
--- a/clang/docs/ClangCommandLineReference.rst
+++ b/clang/docs/ClangCommandLineReference.rst
@@ -158,7 +158,7 @@ Compile CUDA code for host only. Has no effect on non-CUDA compilations.
.. option:: --cuda-include-ptx=<arg>, --no-cuda-include-ptx=<arg>
-Include PTX for the follwing GPU architecture (e.g. sm\_35) or 'all'. May be specified more than once.
+Include PTX for the following GPU architecture (e.g. sm\_35) or 'all'. May be specified more than once.
.. option:: --cuda-noopt-device-debug, --no-cuda-noopt-device-debug
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index c9f4c4589a4..054d5c32c6f 100644
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/docs/ClangFormatStyleOptions.rst
@@ -1398,7 +1398,7 @@ the configuration (without a prefix: ``Auto``).
**JavaImportGroups** (``std::vector<std::string>``)
A vector of prefixes ordered by the desired groups for Java imports.
- Each group is seperated by a newline. Static imports will also follow the
+ Each group is separated by a newline. Static imports will also follow the
same grouping convention above all non-static imports. One group's prefix
can be a subset of another - the longest prefix is always matched. Within
a group, the imports are ordered lexicographically.
diff --git a/clang/docs/LanguageExtensions.rst b/clang/docs/LanguageExtensions.rst
index 7d878150de9..c800a96e6dc 100644
--- a/clang/docs/LanguageExtensions.rst
+++ b/clang/docs/LanguageExtensions.rst
@@ -2725,7 +2725,7 @@ same namespace. For instance:
Without the namespaces on the macros, ``other_function`` will be annotated with
``[[noreturn]]`` instead of ``__attribute__((unavailable))``. This may seem like
a contrived example, but its very possible for this kind of situation to appear
-in real code if the pragmas are spread out accross a large file.
+in real code if the pragmas are spread out across a large file.
Subject Match Rules
-------------------
diff --git a/clang/docs/Toolchain.rst b/clang/docs/Toolchain.rst
index 0da20eb0462..3540708a382 100644
--- a/clang/docs/Toolchain.rst
+++ b/clang/docs/Toolchain.rst
@@ -100,14 +100,14 @@ currently-supported languages are:
In each case, GCC will be invoked to compile the input.
-Assember
---------
+Assembler
+---------
Clang can either use LLVM's integrated assembler or an external system-specific
tool (for instance, the GNU Assembler on GNU OSes) to produce machine code from
assembly.
By default, Clang uses LLVM's integrated assembler on all targets where it is
-supported. If you wish to use the system assember instead, use the
+supported. If you wish to use the system assembler instead, use the
``-fno-integrated-as`` option.
Linker
OpenPOWER on IntegriCloud