Index: lldb/include/lldb/Core/Debugger.h
===================================================================
--- lldb/include/lldb/Core/Debugger.h
+++ lldb/include/lldb/Core/Debugger.h
@@ -249,112 +249,130 @@
 
   void SetLoggingCallback(lldb::LogOutputCallback log_callback, void *baton);
 
-  // Properties Functions
-  enum StopDisassemblyType {
-    eStopDisassemblyTypeNever = 0,
-    eStopDisassemblyTypeNoDebugInfo,
-    eStopDisassemblyTypeNoSource,
-    eStopDisassemblyTypeAlways
-  };
-
   Status SetPropertyValue(const ExecutionContext *exe_ctx,
                           VarSetOperationType op, llvm::StringRef property_path,
                           llvm::StringRef value) override;
 
-  bool GetAutoConfirm() const;
-
+  /// Format properties.
+  /// @{
   const FormatEntity::Entry *GetDisassemblyFormat() const;
-
   const FormatEntity::Entry *GetFrameFormat() const;
-
   const FormatEntity::Entry *GetFrameFormatUnique() const;
-
-  uint32_t GetStopDisassemblyMaxSize() const;
-
   const FormatEntity::Entry *GetThreadFormat() const;
-
   const FormatEntity::Entry *GetThreadStopFormat() const;
+  /// @}
 
+  /// Scripting language properties.
+  /// @{
   lldb::ScriptLanguage GetScriptLanguage() const;
-
   bool SetScriptLanguage(lldb::ScriptLanguage script_lang);
+  /// @}
 
+  /// REPL language properties.
+  /// @{
   lldb::LanguageType GetREPLLanguage() const;
-
   bool SetREPLLanguage(lldb::LanguageType repl_lang);
+  /// @}
 
+  /// Terminal width properties.
+  /// @{
   uint32_t GetTerminalWidth() const;
-
   bool SetTerminalWidth(uint32_t term_width);
+  /// @}
 
+  /// Prompt properties.
+  /// @{
   llvm::StringRef GetPrompt() const;
-
   void SetPrompt(llvm::StringRef p);
   void SetPrompt(const char *) = delete;
+  /// @}
 
+  /// External editor properties.
+  /// @{
   bool GetUseExternalEditor() const;
-
   bool SetUseExternalEditor(bool use_external_editor_p);
+  /// @}
 
+  /// Color properties.
+  /// @{
   bool GetUseColor() const;
-
   bool SetUseColor(bool use_color);
+  /// @}
 
+  /// Progress properties.
+  /// @{
   bool GetShowProgress() const;
-
   bool SetShowProgress(bool show_progress);
 
   llvm::StringRef GetShowProgressAnsiPrefix() const;
-
   llvm::StringRef GetShowProgressAnsiSuffix() const;
+  /// @}
 
+  /// Autosuggestion properties.
+  /// @{
   bool GetUseAutosuggestion() const;
-
   llvm::StringRef GetAutosuggestionAnsiPrefix() const;
-
   llvm::StringRef GetAutosuggestionAnsiSuffix() const;
+  /// @}
 
+  /// Source properties.
+  /// @{
   bool GetUseSourceCache() const;
-
   bool SetUseSourceCache(bool use_source_cache);
 
   bool GetHighlightSource() const;
+  /// @}
 
+  /// Stop properties.
+  /// @{
   lldb::StopShowColumn GetStopShowColumn() const;
-
   llvm::StringRef GetStopShowColumnAnsiPrefix() const;
-
   llvm::StringRef GetStopShowColumnAnsiSuffix() const;
 
   uint32_t GetStopSourceLineCount(bool before) const;
+  uint32_t GetDisassemblyLineCount() const;
 
-  StopDisassemblyType GetStopDisassemblyDisplay() const;
+  enum StopDisassemblyType {
+    eStopDisassemblyTypeNever = 0,
+    eStopDisassemblyTypeNoDebugInfo,
+    eStopDisassemblyTypeNoSource,
+    eStopDisassemblyTypeAlways
+  };
 
-  uint32_t GetDisassemblyLineCount() const;
+  StopDisassemblyType GetStopDisassemblyDisplay() const;
+  uint32_t GetStopDisassemblyMaxSize() const;
 
   llvm::StringRef GetStopShowLineMarkerAnsiPrefix() const;
-
   llvm::StringRef GetStopShowLineMarkerAnsiSuffix() const;
+  /// @}
 
-  bool GetAutoOneLineSummaries() const;
-
+  /// Auto indentation properties.
+  /// @{
   bool GetAutoIndent() const;
-
   bool SetAutoIndent(bool b);
+  /// @}
 
+  /// Expression properties.
+  /// @{
   bool GetPrintDecls() const;
-
   bool SetPrintDecls(bool b);
 
-  uint32_t GetTabSize() const;
+  bool GetNotifyVoid() const;
 
+  lldb::DWIMPrintVerbosity GetDWIMPrintVerbosity() const;
+  /// @}
+
+  /// Tab size properties.
+  /// @{
+  uint32_t GetTabSize() const;
   bool SetTabSize(uint32_t tab_size);
+  /// @}
 
-  lldb::DWIMPrintVerbosity GetDWIMPrintVerbosity() const;
+  bool GetAutoConfirm() const;
 
   bool GetEscapeNonPrintables() const;
 
-  bool GetNotifyVoid() const;
+  bool GetAutoOneLineSummaries() const;
 
   ConstString GetInstanceName() { return m_instance_name; }