[Libreoffice-commits] online.git: loolwsd.xml.in

[Eduard Ardeleanu (via logerrit)]

 loolwsd.xml.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3ca4d279572ff21d864ec1300fdd21676698aaac
Author:     Eduard Ardeleanu <eduard-andrei.ardeleanu at 1and1.ro>
AuthorDate: Tue Dec 17 13:07:16 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Dec 17 12:19:56 2019 +0100

    Update per_document loolwsd settings
    
    Remove obsolete settings: limit_virt_mem_kb, limit_data_mem_kb and add entry for setting limit_virt_mem_mb
    
    Change-Id: Ieda5bdc9078f94ab2269d96092d7718b068f4fc7
    Reviewed-on: https://gerrit.libreoffice.org/85288
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 71f6b8f6f..d71119105 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -23,8 +23,7 @@
         <idlesave_duration_secs desc="The number of idle seconds after which document, if modified, should be saved. Defaults to 30 seconds." type="int" default="30">30</idlesave_duration_secs>
         <autosave_duration_secs desc="The number of seconds after which document, if modified, should be saved. Defaults to 5 minutes." type="int" default="300">300</autosave_duration_secs>
         <always_save_on_exit desc="On exiting the last editor, always perform the save, even if the document is not modified." type="bool" default="false">false</always_save_on_exit>
-        <limit_virt_mem_kb desc="The maximum virtual memory allowed to each document process. 0 for unlimited, 1700 min." type="uint">0</limit_virt_mem_kb>
-        <limit_data_mem_kb desc="The maximum memory data segment allowed to each document process. 0 for unlimited." type="uint">0</limit_data_mem_kb>
+        <limit_virt_mem_mb desc="The maximum virtual memory allowed to each document process. 0 for unlimited." type="uint">0</limit_virt_mem_mb>
         <limit_stack_mem_kb desc="The maximum stack size allowed to each document process. 0 for unlimited." type="uint">8000</limit_stack_mem_kb>
         <limit_file_size_mb desc="The maximum file size allowed to each document process to write. 0 for unlimited." type="uint">0</limit_file_size_mb>
         <limit_num_open_files desc="The maximum number of files allowed to each document process to open. 0 for unlimited." type="uint">0</limit_num_open_files>