diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 09ad3a6a0f..ce52895b94 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -134,11 +134,12 @@ enumitem
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes false
+\tracking_changes true
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
+\author 2047637253 "Guillaume Munch"
 \end_header
 
 \begin_body
@@ -16118,7 +16119,7 @@ reference "sec:File-Formats"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -37589,7 +37590,7 @@ Format
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -37856,7 +37857,7 @@ Format
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -37953,7 +37954,7 @@ Format
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -42748,10 +42749,16 @@ reference "sec:Branches"
 \end_layout
 
 \begin_layout Section
+
+\change_deleted 2047637253 1472399758
 Output
+\change_inserted 2047637253 1472400015
+Formats
+\change_unchanged
+
 \begin_inset CommandInset label
 LatexCommand label
-name "sec:Doc-Output"
+name "sec:Doc-Formats"
 
 \end_inset
 
@@ -42942,15 +42949,27 @@ Save transient properties
  controls whether document settings that are frequently switched or that
  are specific to the user are saved with the document.
  The properties that are affected by option are currently
+\change_inserted 2047637253 1472400492
+:
+\change_unchanged
+
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 the activation of change tracking
+\change_inserted 2047637253 1472400062
+,
+\change_unchanged
+
 \end_layout
 
 \begin_layout Itemize
 the output of tracked changes
+\change_inserted 2047637253 1472400062
+,
+\change_unchanged
+
 \end_layout
 
 \begin_layout Itemize
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index aad62014e5..382aa969c3 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -750,7 +750,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	masterChildModule->childrenTW->resizeColumnToContents(2);
 
 
-	// output
+	// Formats
 	outputModule = new UiWidget<Ui::OutputUi>;
 
 	connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
@@ -1425,7 +1425,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(listingsModule, N_("Listings[[inset]]"));
 	docPS->addPanel(bulletsModule, N_("Bullets"));
 	docPS->addPanel(branchesModule, N_("Branches"));
-	docPS->addPanel(outputModule, N_("Output"));
+	docPS->addPanel(outputModule, N_("Formats[[output]]"));
 	docPS->addPanel(preambleModule, N_("LaTeX Preamble"));
 	docPS->setCurrentPanel("Document Class");
 // FIXME: hack to work around resizing bug in Qt >= 4.2
@@ -2840,7 +2840,7 @@ void GuiDocument::applyView()
 	bp_.listings_params =
 		InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
 
-	// output
+	// Formats
 	bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
 		outputModule->defaultFormatCO->currentIndex()).toString());
 
@@ -3396,7 +3396,7 @@ void GuiDocument::paramsToDialog()
 		fontModule->fontencLE->setText(toqstr(bp_.fontenc));
 	}
 
-	// Output
+	// Formats
 	// This must be set _after_ fonts since updateDefaultFormat()
 	// checks osFontsCB settings.
 	// update combobox with formats