Index: branches/HTM-14.1-update-dev1/doc/Doxyfile
===================================================================
--- branches/HTM-14.1-update-dev1/doc/Doxyfile	(revision 1278)
+++ branches/HTM-14.1-update-dev1/doc/Doxyfile	(revision 1287)
@@ -39,5 +39,5 @@
 # control system is used.
 
-PROJECT_NUMBER         = HM-16.4
+PROJECT_NUMBER         = HM-16.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
Index: branches/HTM-14.1-update-dev1/doc/software-manual.tex
===================================================================
--- branches/HTM-14.1-update-dev1/doc/software-manual.tex	(revision 1278)
+++ branches/HTM-14.1-update-dev1/doc/software-manual.tex	(revision 1287)
@@ -187,5 +187,5 @@
 \begin{abstract}
 This document is a user manual describing usage of reference software
-for the HEVC project. It applies to version 16.4
+for the HEVC project. It applies to version 16.6
 of the software.
 \end{abstract}
@@ -677,4 +677,22 @@
 \\
 
+\Option{SummaryOutFilename} &
+%\ShortOption{\None} &
+\Default{false} &
+Filename to use for producing summary output file. If empty, do not produce a file.
+\\
+
+\Option{SummaryPicFilenameBase} &
+%\ShortOption{\None} &
+\Default{false} &
+Base filename to use for producing summary picture output files. The actual filenames used will have I.txt, P.txt and B.txt appended. If empty, do not produce a file.
+\\
+
+\Option{SummaryVerboseness} &
+%\ShortOption{\None} &
+\Default{false} &
+Specifies the level of the verboseness of the text output.
+\\
+
 \Option{CabacZeroWordPaddingEnabled} &
 %\ShortOption{\None} &
@@ -751,4 +769,28 @@
 \\
 
+\Option{ClipInputVideoToRec709Range} &
+%\ShortOption{\None} &
+\Default{0} &
+If 1 then clip input video to the Rec. 709 Range on loading when InternalBitDepth is less than MSBExtendedBitDepth.
+\\
+
+\Option{ClipOutputVideoToRec709Range} &
+%\ShortOption{\None} &
+\Default{0} &
+If 1 then clip output video to the Rec. 709 Range on saving when OutputBitDepth is less than InternalBitDepth.
+\\
+
+\Option{EfficientFieldIRAPEnabled} &
+%\ShortOption{\None} &
+\Default{1} &
+Enable to code fields in a specific, potentially more efficient, order.
+\\
+
+\Option{HarmonizeGopFirstFieldCoupleEnabled} &
+%\ShortOption{\None} &
+\Default{1} &
+Enables harmonization of Gop first field couple.
+\\
+
 \end{OptionTableNoShorthand}
 
@@ -810,4 +852,10 @@
 \Default{false} &
 For --profile=main-RExt, specifies the value of general_intra_constraint_flag to use for RExt profiles.
+\\
+
+\Option{OnePictureOnlyConstraintFlag} &
+%\ShortOption{\None} &
+\Default{false} &
+For --profile=main-RExt, specifies the value of general_one_picture_only_constraint_flag to use for RExt profiles.
 \\
 
@@ -976,4 +1024,16 @@
 Specifies the search range used for bi-prediction refinement in motion
 estimation.
+\\
+
+\Option{ClipForBiPredMEEnabled} &
+%\ShortOption{\None} &
+\Default{0} &
+Enables clipping in the Bi-Pred ME, which prevents values over- or under-flowing. It is usually disabled to reduce encoder run-time.
+\\
+
+\Option{FastMEAssumingSmootherMVEnabled} &
+%\ShortOption{\None} &
+\Default{0} &
+Enables fast ME assuming a smoother MV.
 \\
 
@@ -1014,4 +1074,9 @@
 \\
 
+\Option{DisableIntraInInter} &
+%\ShortOption{\None} &
+\Default{0} &
+Flag to disable intra PUs in inter slices.
+\\
 
 \end{OptionTableNoShorthand}
@@ -1339,12 +1404,4 @@
 \\
 
-\Option{DeblockingFilterControlPresent}&
-%\ShortOption{\None}&
-\Default{false}&
-Enables or disables the presence of the deblocking filter control
-parameters in the picture parameter set and in the slice segment header.
-When disabled, the default deblocking filter parameters are used.
-\\
-
 \Option{LoopFilterOffsetInPPS}&
 %\ShortOption{\None}&
@@ -1377,5 +1434,6 @@
 %\ShortOption{\None}&
 \Default{false}&
-Enables or disables the use of a deblocking filter metric to evaluate the suitability of deblocking..
+Enables or disables the use of a deblocking filter metric to evaluate the suitability of deblocking. If enabled then
+LoopFilterOffsetInPPS and LoopFilterDisable must be 0.
 \\
 
@@ -1408,4 +1466,22 @@
 \\
 
+\Option{TestSAODisableAtPictureLevel} &
+%\ShortOption{\None} &
+\Default{false} &
+Enables the testing of disabling SAO at the picture level after having analysed all blocks.
+\\
+
+\Option{SaoEncodingRate} &
+%\ShortOption{\None} &
+\Default{0.75} &
+When >0 SAO early picture termination is enabled for luma and chroma.
+\\
+
+\Option{SaoEncodingRateChroma} &
+%\ShortOption{\None} &
+\Default{0.5} &
+The SAO early picture termination rate to use for chroma (when m_SaoEncodingRate is >0). If <=0, use results for luma.
+\\
+
 \Option{SAOLcuBoundary} &
 %\ShortOption{\None} &
@@ -1421,4 +1497,22 @@
 prediction only permits samples from intra blocks in the same slice as the
 current block to be used for intra prediction.
+\\
+
+\Option{FastUDIUseMPMEnabled} &
+%\ShortOption{\None} &
+\Default{true} &
+If enabled, adapt intra direction search, accounting for MPM
+\\
+
+\Option{FastMEForGenBLowDelayEnabled} &
+%\ShortOption{\None} &
+\Default{true} &
+If enabled use a fast ME for generalised B Low Delay slices
+\\
+
+\Option{UseBLambdaForNonKeyLowDelayPictures} &
+%\ShortOption{\None} &
+\Default{true} &
+Enables use of B-Lambda for non-key low-delay pictures
 \\
 
@@ -2514,31 +2608,7 @@
 \\
 
-HB_LAMBDA_FOR_LDC &
-on &
-use of B-style lambda for non-key pictures in low-delay mode
-\\
-
-GPB_SIMPLE &
-on &
-Fast estimation of generalized B in low-delay mode
-\\
-
-GPB_SIMPLE_UNI &
-on &
-Fast estimation of generalized B in low-delay mode for uni-direction
-\\
-
-FASTME_SMOOTHER_MV &
-on &
-Fast ME using smoother MV assumption
-\\
-
 ADAPT_SR_SCALE &
 on &
 division factor for adaptive search range
-\\
-
-CLIP_TO_709_RANGE &
-off &
 \\
 
@@ -2689,4 +2759,10 @@
 \\
 
+\Option{ClipOutputVideoToRec709Range} &
+%\ShortOption{\None} &
+\Default{0} &
+If 1 then clip output video to the Rec. 709 Range on saving when OutputBitDepth is less than InternalBitDepth.
+\\
+
 \end{OptionTableNoShorthand}
 
