Skip to content

Commit 9d32cb6

Browse files
authored
Merge branch 'main' into template-specialization-with-namespace
2 parents ddadba4 + 9711e82 commit 9d32cb6

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

breathe/directives/function.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def run(self) -> List[Node]:
8989
).warn(
9090
"doxygenfunction: Unable to resolve function "
9191
'"{namespace}{function}" with arguments "{args}".\n'
92-
"Could not parse arguments. Parsing eror is\n{cpperror}"
92+
"Could not parse arguments. Parsing error is\n{cpperror}"
9393
)
9494

9595
finder_filter = self.filter_factory.create_function_and_all_friend_finder_filter(

breathe/renderer/filter.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
)
120120
121121
Which is to say that we want to let through a compound, with kind group, with name 'mygroup' but
122-
we're also happy if the node is **not** a compund with kind group. Really we just don't want to let
122+
we're also happy if the node is **not** a compound with kind group. Really we just don't want to let
123123
through any compounds with kind group with name other than 'mygroup'. As such, we can rephrase this
124124
as:
125125
@@ -931,7 +931,7 @@ def create_file_filter(self, filename: str, options: Dict[str, Any]) -> Filter:
931931

932932
def create_content_filter(self, kind: str, options: Dict[str, Any]) -> Filter:
933933
"""Returns a filter which matches the contents of the or namespace but not the group or
934-
namepace name or description.
934+
namespace name or description.
935935
936936
This allows the groups to be used to structure sections of the documentation rather than to
937937
structure and further document groups of documentation

breathe/renderer/sphinxrenderer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2322,7 +2322,7 @@ def visit_docparamlist(self, node) -> List[Node]:
23222322
if node.kind == "exception":
23232323
msg = "Doxygen \\exception commands with multiple names can not be"
23242324
msg += " converted to a single :throws: field in Sphinx."
2325-
msg += " Exception '{}' suppresed from output.".format(
2325+
msg += " Exception '{}' suppressed from output.".format(
23262326
"".join(n.astext() for n in thisName)
23272327
)
23282328
self.state.document.reporter.warning(msg)
@@ -2391,7 +2391,7 @@ def visit_docdotfile(self, node) -> List[Node]:
23912391
if not dotcode.rstrip("\n"):
23922392
raise RuntimeError("%s found but without any content" % dot_file_path)
23932393
except OSError as exc:
2394-
# doxygen seems to prevent this from triggering as a non-existant file
2394+
# doxygen seems to prevent this from triggering as a non-existent file
23952395
# generates no XML output for the corresponding `\dotfile` cmd
23962396
self.state.document.reporter.warning(exc) # better safe than sorry
23972397
except RuntimeError as exc:

documentation/compare

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ git checkout $first
3838
(cd ../examples/doxygen; make)
3939
# Clean current sphinx build directory
4040
make clean
41-
# Make sure the BUILDDIR variable can be overridden in the Makfile. Required for older commits
41+
# Make sure the BUILDDIR variable can be overridden in the Makefile. Required for older commits
4242
sed -i 's/BUILDDIR = build/BUILDDIR ?= build/g' Makefile
4343
# Build into our first comparison directory
4444
make html BUILDDIR=$firstdir

examples/specific/cpp_function.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ struct Class {
1212

1313
/** A namespace to demonstrate a namespaced function */
1414
namespace TestNamespaceFunction {
15-
/** A function within a namspace. */
15+
/** A function within a namespace. */
1616
void namespaceFunc();
1717
}

0 commit comments

Comments
 (0)