Fix merge conflict in fs/common.hpp

Author: fwsGonzo

api/fs/common.hpp

@@ -203,4 +203,4 @@ namespace fs {
 
 } //< fs
 
-#endif
+#endif //< FS_COMMON_HPP

api/net/http/connection.hpp

@@ -67,7 +67,7 @@ namespace http {
     inline TCP_conn release();
 
     /**
-     * @brief      Wether the underlying TCP connection has been released or not
+     * @brief      Whether the underlying TCP connection has been released or not
      *
      * @return     true if the underlying TCP connection is released
      */

api/net/http/message.hpp

@@ -99,7 +99,7 @@ class Message {
    *
    * @param[in]  len   The length of the content
    *
-   * @return     Outcome of wether the field got updated or not
+   * @return     Outcome of whether the field got updated or not
    */
   inline bool set_content_length(size_t len);
 

api/net/tcp/connection.hpp

@@ -642,7 +642,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   void writeq_reset();
 
   /*
-    Mark wether the Connection is in TCP write queue or not.
+    Mark whether the Connection is in TCP write queue or not.
   */
   void set_queued(bool queued)
   { queued_ = queued; }
@@ -888,7 +888,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   void timewait_timeout()
   { signal_close(); }
 
-  /** Wether to use Delayed ACK or not */
+  /** Whether to use Delayed ACK or not */
   bool use_dack() const;
 
   /**

api/net/tcp/rttm.hpp

@@ -60,7 +60,7 @@ struct RTTM {
   {}
 
   /**
-   * @brief      Returns wether the RTTM is currently "measuring" (time is set)
+   * @brief      Returns whether the RTTM is currently "measuring" (time is set)
    *
    * @return     True if the RTTM is active (measuring)
    */

api/net/tcp/tcp.hpp

@@ -69,7 +69,7 @@ namespace net {
      * map of listeners
      *
      * @param port listening port
-     * @return wether the listener had a port
+     * @return whether the listener had a port
      */
     bool unbind(const tcp::port_t port);
 
@@ -188,10 +188,10 @@ namespace net {
     { return wscale_; }
 
     /**
-     * @brief      Returns wether this TCP is using window scaling.
+     * @brief      Returns whether this TCP is using window scaling.
      *             A wscale factor of 0 means off.
      *
-     * @return     Wether wscale is being used
+     * @return     Whether wscale is being used
      */
     constexpr bool uses_wscale() const
     { return wscale_ > 0; }

api/util/chunk.hpp

@@ -121,7 +121,7 @@ class Chunk {
   Chunk operator+(const Chunk& c);
 
   /**
-   * @brief Check wether the chunk is valid/not empty
+   * @brief Check whether the chunk is valid/not empty
    */
   operator bool() const noexcept
   { return static_cast<bool>(buffer_) and (length_ > 0); }

api/util/timer.hpp

@@ -89,7 +89,7 @@ class Timer {
   /**
    * @brief If the timer is running (active)
    *
-   * @return Wether the timer is running or not
+   * @return whether the timer is running or not
    */
   bool is_running() const
   { return id_ != Timers::UNUSED_ID; }

install.sh

@@ -17,7 +17,7 @@ export INCLUDEOS_ENABLE_TEST=${INCLUDEOS_ENABLE_TEST-OFF}
 
 # Initialize variables:
 install_yes=0
-verbose=0
+quiet=0
 source=0
 
 while getopts "h?yqs" opt; do
@@ -150,7 +150,7 @@ printf "    %-25s %-25s %s\n"\
 
 # Give user option to evaluate install options
 if tty -s && [ $install_yes -eq 0 ]; then
-	read -p "Is this correct [Y|n]?" answer
+	read -p "Is this correct [Y/n]?" answer
 	answer=${answer:-"Y"}	# Default value
 	case $answer in
 		[yY] | [yY][Ee][Ss] )

lib/mana/include/mana/middleware/butler.hpp

@@ -71,7 +71,7 @@ class Butler : public Middleware {
    * @details Very bad but easy way to assume the path is a request for a file.
    *
    * @param path
-   * @return wether a path is a file request or not
+   * @return whether a path is a file request or not
    */
   inline bool is_file_request(const std::string& path) const
   { return !get_extension(path).empty(); }