diff --git a/.gitattributes b/.gitattributes
index 554a06e7c1..5c327de9fd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,9 @@
 
 # Custom attribute to mark source files using KiCad C++ formatting
-[attr]kicad-cpp-source whitepace=tab-in-indent format.clang-format-kicad
+[attr]kicad-cpp-source text=auto whitepace=tab-in-indent format.clang-format-kicad
 
 # Custom attribute to mark KiCad's own CMake files
-[attr]kicad-cmake-source whitespace=tab-in-indent
+[attr]kicad-cmake-source text=auto whitespace=tab-in-indent
 
 # Custom attribute for auto-generated sources:
 # * Do not perform whitespace checking
@@ -18,6 +18,7 @@
 
 *.cmake     kicad-cmake-source
 *.txt       kicad-cmake-source
+*.md        text=auto
 
 # Compiled bitmap sources
 bitmaps_png/cpp_*/*.cpp     generated
diff --git a/include/commit.h b/include/commit.h
index 9f60d9618b..0500bbfffd 100644
--- a/include/commit.h
+++ b/include/commit.h
@@ -123,11 +123,11 @@ public:
 
 
     ///> Adds a change of the item aItem of type aChangeType to the change list.
-    virtual COMMIT& Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType );
+    virtual COMMIT& Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType );
 
-    virtual COMMIT& Stage( std::vector<EDA_ITEM*>& container, CHANGE_TYPE aChangeType );
+    virtual COMMIT& Stage( std::vector<EDA_ITEM*>& container, CHANGE_TYPE aChangeType );
 
-    virtual COMMIT& Stage( const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED );
+    virtual COMMIT& Stage( const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED );
 
     ///> Executes the changes.
     virtual void Push( const wxString& aMessage = wxT( "A commit" ),
diff --git a/pcb_calculator/tracks_width_versus_current_formula.md b/pcb_calculator/tracks_width_versus_current_formula.md
index 09b2633935..3578d7cd56 100644
--- a/pcb_calculator/tracks_width_versus_current_formula.md
+++ b/pcb_calculator/tracks_width_versus_current_formula.md
@@ -1,15 +1,15 @@
-If you specify the maximum current, then the trace widths will be calculated to suit.
-
-If you specify one of the trace widths, the maximum current it can handle will be calculated. The width for the other trace to also handle this current will then be calculated.
-
-The controlling value is shown in bold.
-
-The calculations are valid for currents up to 35A (external) or 17.5A (internal), temperature rises up to 100 deg C, and widths of up to 400mil (10mm).
-
-The formula, from IPC 2221, is
-<center>__I = K * dT<sup>0.44</sup> * (W*H)<sup>0.725</sup>__</center>
-where:  
-__I__ = maximum current in amps  
-__dt__ = temperature rise above ambient in deg C  
-__W,H__ = width and thickness in mils  
-__K__ = 0.024 for internal traces or 0.048 for external traces
+If you specify the maximum current, then the trace widths will be calculated to suit.
+
+If you specify one of the trace widths, the maximum current it can handle will be calculated. The width for the other trace to also handle this current will then be calculated.
+
+The controlling value is shown in bold.
+
+The calculations are valid for currents up to 35A (external) or 17.5A (internal), temperature rises up to 100 deg C, and widths of up to 400mil (10mm).
+
+The formula, from IPC 2221, is
+<center>__I = K * dT<sup>0.44</sup> * (W*H)<sup>0.725</sup>__</center>
+where:  
+__I__ = maximum current in amps  
+__dt__ = temperature rise above ambient in deg C  
+__W,H__ = width and thickness in mils  
+__K__ = 0.024 for internal traces or 0.048 for external traces
diff --git a/pcbnew/board_commit.h b/pcbnew/board_commit.h
index 78b1a86312..1f90b5cd75 100644
--- a/pcbnew/board_commit.h
+++ b/pcbnew/board_commit.h
@@ -46,10 +46,10 @@ public:
                        bool aCreateUndoEntry = true, bool aSetDirtyBit = true ) override;
 
     virtual void Revert() override;
-    COMMIT&      Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType ) override;
-    COMMIT&      Stage( std::vector<EDA_ITEM*>& container, CHANGE_TYPE aChangeType ) override;
-    COMMIT&      Stage(
-                 const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED ) override;
+    COMMIT&      Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType ) override;
+    COMMIT&      Stage( std::vector<EDA_ITEM*>& container, CHANGE_TYPE aChangeType ) override;
+    COMMIT&      Stage(
+                 const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED ) override;
 
 private:
     TOOL_MANAGER* m_toolMgr;