diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd45ec4543ee187be191bb97a20397784faa5c30..7b495e783affcfdab846372c6de02e60aea902ee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-25  Tobias Burnus  <burnus@net-b.de>
+
+	* doc/invoke.texi (-fsanitize=): Move from optimization
+	to debugging options.
+
 2013-02-25  Andrey Belevantsev  <abel@ispras.ru>
 
 	* sched-deps.c (sched_analyze_insn): Fix typo in comment.
@@ -36,7 +41,7 @@
 	* config/mips/mips.md (multimem): New type.
 	(length): Differentiate between 17-bit and 18-bit branch offsets.
 	(MOVEP1, MOVEP2): New mode iterator.
- 	(mov_<load>l): Use ZC constraint.
+	(mov_<load>l): Use ZC constraint.
 	(mov_<load>r): Likewise.
 	(mov_<store>l): Likewise.
 	(mov_<store>r): Likewise.
@@ -90,7 +95,7 @@
 	(mips_attribute_table): Add micromips, nomicromips and nocompression.
 	(mips_mips16_decl_p): Delete.
 	(mips_nomips16_decl_p): Delete.
- 	(mips_get_compress_on_flags): New function.
+	(mips_get_compress_on_flags): New function.
 	(mips_get_compress_off_flags): New function.
 	(mips_get_compress_mode): New function.
 	(mips_get_compress_on_name): New function.
@@ -167,10 +172,10 @@
 
 2013-02-22  Greta Yorsh  <Greta.Yorsh@arm.com>
 
-        * config/arm/arm.md (split for extendsidi): Update condition.
-        (zero_extend<mode>di2,extend<mode>di2): Add an alternative.
-        * config/arm/iterators.md (qhs_extenddi_cstr): Likewise.
-        (qhs_zextenddi_cstr): Likewise.
+	* config/arm/arm.md (split for extendsidi): Update condition.
+	(zero_extend<mode>di2,extend<mode>di2): Add an alternative.
+	* config/arm/iterators.md (qhs_extenddi_cstr): Likewise.
+	(qhs_zextenddi_cstr): Likewise.
 
 2013-02-21  Jakub Jelinek  <jakub@redhat.com>
 
@@ -325,7 +330,7 @@
 	* config/microblaze/microblaze.h: Add TARGET_HAS_CLZ as combined 
 	version and TARGET_PATTERN_COMPARE check
 	* config/microblaze/microblaze.md: New clzsi2 instruction
-	
+
 2012-02-19  Edgar E. Iglesias <edgar.iglesias@gmail.com>
 
 	*  config/microblaze/microblaze.md (call_value_intern): Check symbol is 
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index f18d07e248bee38858706f213e26ba02e706ad9d..7088dd0701382e3a07ec335241e8683f3b6ecaf3 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -5033,6 +5033,18 @@ other options are processed, and it does so only once, no matter how
 many times it is given.  This is mainly intended to be used with
 @option{-fcompare-debug}.
 
+@item -fsanitize=address
+Enable AddressSanitizer, a fast memory error detector.
+Memory access instructions will be instrumented to detect
+out-of-bounds and use-after-free bugs.
+See @uref{http://code.google.com/p/address-sanitizer/} for more details.
+
+@item -fsanitize=thread
+Enable ThreadSanitizer, a fast data race detector.
+Memory access instructions will be instrumented to detect
+data race bugs.
+See @uref{http://code.google.com/p/data-race-test/wiki/ThreadSanitizer} for more details.
+
 @item -fdump-final-insns@r{[}=@var{file}@r{]}
 @opindex fdump-final-insns
 Dump the final internal representation (RTL) to @var{file}.  If the
@@ -6866,18 +6878,6 @@ assumptions based on that.
 
 The default is @option{-fzero-initialized-in-bss}.
 
-@item -fsanitize=address
-Enable AddressSanitizer, a fast memory error detector.
-Memory access instructions will be instrumented to detect
-out-of-bounds and use-after-free bugs.
-See @uref{http://code.google.com/p/address-sanitizer/} for more details.
-
-@item -fsanitize=thread
-Enable ThreadSanitizer, a fast data race detector.
-Memory access instructions will be instrumented to detect
-data race bugs. 
-See @uref{http://code.google.com/p/data-race-test/wiki/ThreadSanitizer} for more details.
-
 @item -fmudflap -fmudflapth -fmudflapir
 @opindex fmudflap
 @opindex fmudflapth