InfiniTime.git

diff --git a/doc/InfiniTimeVision.md b/doc/InfiniTimeVision.md
index 6702d911d0b9f048660896398e40c1e8b6d3a489..da4e11136fd0dcbc2cf1baeeef94a85ca75fdc2f 100644
--- a/doc/InfiniTimeVision.md
+++ b/doc/InfiniTimeVision.md
@@ -17,7 +17,7 @@ - Battery efficiency
 - Easy and simple navigation
 - Behaviour should be predictable and easy to understand
 - Prefer solid default experience over customization
-- Personalization is achieved through custom watchfaces.
+- Personalization is achieved through custom watch faces.
   More options may be available through a companion app.
 - Use standard protocols and methods
 
@@ -25,7 +25,7 @@ ## Long term vision
 
 The perfect version of InfiniTime would include:
 
-- Capability to sideload apps and watchfaces
+- Capability to sideload apps and watch faces
 - Only a minimal feature set in the flashed firmware.
   Users would add the features they want.
 - Ports to other devices




diff --git a/doc/MemoryAnalysis.md b/doc/MemoryAnalysis.md
index 0feb0f9ec61336058b5f8d64712a8408525fe98f..fe493ba0a4752ba8cf2fb424e209f50c3a5e2b05 100644
--- a/doc/MemoryAnalysis.md
+++ b/doc/MemoryAnalysis.md
@@ -245,7 +245,7 @@ ```
 
 Now, your function `__wrap_malloc()` will be called instead of `malloc()`. You can call the actual malloc from the stdlib by calling `__real_malloc()`.
 
-Using this technique, I was able to trace all malloc calls at boot (boot -> digital watchface):
+Using this technique, I was able to trace all malloc calls at boot (boot -> digital watch face):
 
 - system task = 3464 bytes (SystemTask could potentially be declared as a global variable to avoid heap allocation here)
 - string music = 31 (maybe we should not use std::string when not needed, as it does heap allocation)




diff --git a/doc/gettingStarted/gettingStarted-1.0.md b/doc/gettingStarted/gettingStarted-1.0.md
index 1586de562a0d0b59b2ab4023726df22ff11a66d9..19bb7e24fad822dbcd049acbc089d4cc28de0814 100644
--- a/doc/gettingStarted/gettingStarted-1.0.md
+++ b/doc/gettingStarted/gettingStarted-1.0.md
@@ -8,7 +8,7 @@ ## InfiniTime quick user guide
 
 ### Setting the time
 
-By default, InfiniTime starts on the digital watchface. It'll probably display the epoch time (1 Jan 1970, 00:00).
+By default, InfiniTime starts on the digital watch face. It'll probably display the epoch time (1 Jan 1970, 00:00).
 
 You can sync the time using companion apps.
 
@@ -22,7 +22,7 @@ InfiniTime doesn't handle daylight savings automatically, so make sure to set the correct time or sync it with a companion app.
 
 ### Digital watch face
 
-![Digital watch face](ui/watchface.jpg)
+![Digital watch face](ui/watch face.jpg)
 
 This is what the default digital watch face looks like. You can change watch faces in the settings.
 




diff --git a/doc/gettingStarted/updating-software.md b/doc/gettingStarted/updating-software.md
index 5c867023dc6b1275e0bfb7bf4aa6cb3a1e0dcf98..2b5d5d9231050c75a4851d47deb12475fec089cc 100644
--- a/doc/gettingStarted/updating-software.md
+++ b/doc/gettingStarted/updating-software.md
@@ -4,7 +4,7 @@ If you just want to flash or upgrade InfiniTime on your PineTime, this page is for you! If you want more information about the software and the update procedure, check out [this](/doc/gettingStarted/about-software.md) page.
 
 ## Checking the version of InfiniTime
 
-You can check the InfiniTime version by first swiping right on the watchface to open quick settings, tapping the cogwheel to open settings, swipe up until you find an entry named "About" and tap on it.
+You can check the InfiniTime version by first swiping right on the watch face to open quick settings, tapping the cogwheel to open settings, swipe up until you find an entry named "About" and tap on it.
 
 ![InfiniTime 1.0 version](version-1.0.jpg)
 
@@ -35,7 +35,7 @@ Firmware updates must be manually validated. If the firmware isn't validated and the watch resets, the watch will revert to the previous firmware. This is a safety feature to prevent bricking your device with faulty firmware.
 
 You can validate your updated firmware on InfiniTime >= 1.0 by following this simple procedure:
 
-- From the watchface, swipe **right** to display the *quick settings menu*
+- From the watch face, swipe **right** to display the *quick settings menu*
 - Open settings by tapping the cogwheel on the bottom right
 - Swipe up until you find an entry named **Firmware** and tap on it
 - If the firmware is not validated yet, you can either validate the running firmware, or reset and revert to the previous firmware version




diff --git a/src/components/ble/weather/WeatherData.h b/src/components/ble/weather/WeatherData.h
index 613d5acb5f8780e58053286933c81cdb7385bbf1..1a995eb96f4c589ec37ec570d713b1ca83c49444 100644
--- a/src/components/ble/weather/WeatherData.h
+++ b/src/components/ble/weather/WeatherData.h
@@ -239,7 +239,7 @@        *
        * In order to represent bursts of wind instead of constant wind,
        * you have minimum and maximum speeds.
        *
-       * As direction can fluctuate wildly and some watchfaces might wish to display it nicely,
+       * As direction can fluctuate wildly and some watch faces might wish to display it nicely,
        * we're following the aerospace industry weather report option of specifying a range.
        */
       class Wind : public TimelineHeader {
@@ -283,7 +283,7 @@        * This can be mostly static with long expiration,
        * as it usually is, but it could change during a trip for ex.
        * so we allow changing it dynamically.
        *
-       * Location info can be for some kind of map watchface
+       * Location info can be for some kind of map watch face
        * or daylight calculations, should those be required.
        *
        */
@@ -331,7 +331,7 @@        * How air quality is stored
        *
        * These events are a bit more complex because the topic is not simple,
        * the intention is to heavy-lift the annoying preprocessing from the watch
-       * this allows watchface or watchapp makers to generate accurate alerts and graphics
+       * this allows watch face or watchapp makers to generate accurate alerts and graphics
        *
        * If this needs further enforced standardization, pull requests are welcome
        */




diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
index 9ccb2e72a8e6c8716a501e8623d3f8866cc72639..b6b3f5a9ab0842c53b90e075bc89c53b45f12738 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp
+++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -14,7 +14,7 @@  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * PineTimeStyle watchface for Infinitime created by Kieran Cawthray
+ * PineTimeStyle watch face for Infinitime created by Kieran Cawthray
  * Based on WatchFaceDigital
  * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
  */