Merge branch 'master' into cooking

diff --combined doc/gmqcc.1
index 185092e4c8c910a0bc13b4f01fdfa75cc32217b2,a940f4235a6541478aecf48c1aae7d5d2559f39d..c825a417b5d25a05cd3a0c51c534cc35074634df
--- 1/doc/gmqcc.1
--- 2/doc/gmqcc.1
+++ b/doc/gmqcc.1
@@@ -153,7 -153,7 +153,7 @@@ Adds compiler information to the genera
  this includes the following globals:
  .Bl -tag -width indent -compact
  .It Li reserved:version
- String containing the compiler version as printed by the --version
+ String containing the compiler version as printed by the \-\-version
  parameter.
  .El
  .It Fl -correct , Fl -no-correct
@@@ -327,15 -327,10 +327,15 @@@ it can happen that incompatible types a
  enables several warnings when static typechecking cannot guarantee
  consistent behavior.
  .It Fl W Ns Cm breakdef
 -When compiling original id1 QC, there is a definition for `break`
 +When compiling original id1 QC there is a definition for `break`
  which conflicts with the 'break' keyword in GMQCC. Enabling this
 -warning will print a warning when the definition occurs. The
 -definition is ignored for both cases.
 +will print a warning when the definition occurs. The definition is
 +ignored for both cases.
 +.It Fl W Ns Cm const-overwrite
 +When compiling original QuakeWorld QC there are instances where
 +code overwrites constants. This is considered an error, however
 +for QuakeWorld to compile it needs to be treated as a warning
 +instead, as such this warning only works when -std=qcc.
  .El
  .Sh COMPILE FLAGS
  .Bl -tag -width Ds
@@@ -356,7 -351,7 +356,7 @@@ features used in the Xonotic codebase. 
  ticket.
  .It Fl f Ns Cm ftepp-predefs
  Enable some predefined macros. This only works in combination with
- \'-fftepp' and is currently not included by '-std=fteqcc'. The
+ \'\-fftepp' and is currently not included by '\-std=fteqcc'. The
  following macros will be added:
  .Bd -literal -offset indent
  __LINE__
@@@ -678,7 -673,7 +678,7 @@@ A documented example for a gmqcc.ini fi
  .Sh AUTHOR
  See <http://graphitemaster.github.com/gmqcc>.
  .Sh BUGS
- Currently the '-fftepp-predefs' flag is not included by '-std=fteqcc',
+ Currently the '\-fftepp-predefs' flag is not included by '\-std=fteqcc',
  partially because it is not entirely conformant to fteqcc.
  .Pp
  Please report bugs on <http://github.com/graphitemaster/gmqcc/issues>,