diff --git a/BUILD_OSX.md b/BUILD_OSX.md index 76778d5088..9b38665969 100644 --- a/BUILD_OSX.md +++ b/BUILD_OSX.md @@ -7,7 +7,7 @@ - [Install Xcode Command line tools](#install-xcode-cli-tools) - [Install Conda](#install-conda) - [Run the shell script](#run-the-shell-script) -- [Building FreeCAD on macOS using homebrew packages with & without formual file](#homebrew-build-fc-on-macos) +- [Building FreeCAD on macOS using homebrew packages with & without formula file](#homebrew-build-fc-on-macos) - [Requirements](#homebrew-requirements) - [Install required FreeCAD dependencies](#homebrew-install-required-deps) - [Limitations of using freecad formula file](#homebrew-limits-of-formula-file) diff --git a/src/Mod/Fem/femsolver/settings.py b/src/Mod/Fem/femsolver/settings.py index 7590b97a06..36e43ec149 100644 --- a/src/Mod/Fem/femsolver/settings.py +++ b/src/Mod/Fem/femsolver/settings.py @@ -195,7 +195,7 @@ class _SolverDlg(object): # set the binary path to the FreeCAD defaults # ATM pure unix shell commands without path names are used as standard - # TODO the binaries provieded with the FreeCAD distribution should be found + # TODO the binaries provided with the FreeCAD distribution should be found # without any additional user input # see ccxttols, it works for Windows and Linux there binary = self.default diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 3459526a49..8bd535ee63 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -4429,7 +4429,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer SoSeparator *sep = new SoSeparator(); sep->ref(); - // no caching for fluctuand data structures + // no caching for fluctuant data structures sep->renderCaching = SoSeparator::OFF; // every information visual node gets its own material for to-be-implemented preselection and selection @@ -4482,7 +4482,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer SoSeparator *sep = new SoSeparator(); sep->ref(); - // no caching for fluctuand data structures + // no caching for fluctuant data structures sep->renderCaching = SoSeparator::OFF; // every information visual node gets its own material for to-be-implemented preselection and selection @@ -4612,7 +4612,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer SoSeparator *sep = new SoSeparator(); sep->ref(); - // no caching for fluctuand data structures + // no caching for fluctuant data structures sep->renderCaching = SoSeparator::OFF; // every information visual node gets its own material for to-be-implemented preselection and selection @@ -4706,7 +4706,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer SoSeparator *sep = new SoSeparator(); sep->ref(); - // no caching for fluctuand data structures + // no caching for fluctuant data structures sep->renderCaching = SoSeparator::OFF; // every information visual node gets its own material for to-be-implemented preselection and selection @@ -4775,7 +4775,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer SoSeparator* sep = new SoSeparator(); sep->ref(); - // no caching for fluctuand data structures + // no caching for fluctuant data structures sep->renderCaching = SoSeparator::OFF; // every information visual node gets its own material for to-be-implemented preselection and selection @@ -5970,7 +5970,7 @@ void ViewProviderSketch::rebuildConstraintsVisual(void) // root separator for one constraint SoSeparator *sep = new SoSeparator(); sep->ref(); - // no caching for fluctuand data structures + // no caching for fluctuant data structures sep->renderCaching = SoSeparator::OFF; // every constrained visual node gets its own material for preselection and selection @@ -6808,7 +6808,7 @@ void ViewProviderSketch::createEditInventorNodes(void) ps->style.setValue(SoPickStyle::UNPICKABLE); Coordsep->addChild(ps); Coordsep->setName("CoordSeparator"); - // no caching for fluctuand data structures + // no caching for fluctuant data structures Coordsep->renderCaching = SoSeparator::OFF; SoMaterial *CoordTextMaterials = new SoMaterial; diff --git a/src/Mod/Surface/Gui/TaskFilling.cpp b/src/Mod/Surface/Gui/TaskFilling.cpp index 3b07bee830..bc25c3a0b7 100644 --- a/src/Mod/Surface/Gui/TaskFilling.cpp +++ b/src/Mod/Surface/Gui/TaskFilling.cpp @@ -548,7 +548,7 @@ void FillingPanel::on_listBoundary_itemDoubleClicked(QListWidgetItem* item) ui->comboBoxFaces->addItem(text, text.toLatin1()); } - // activste face and continuity + // activate face and continuity if (data.size() == 5) { int index = ui->comboBoxFaces->findData(data[3]); ui->comboBoxFaces->setCurrentIndex(index);