From: Michael Schuster <michael@schuster.ms>
Date: Tue, 29 Sep 2020 17:05:39 +0000 (+0200)
Subject: Windows MSI: Stay compatible with the upstream "StartMenuShortcuts" feature
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~126^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2476dcb4250c2e7f941dbdeebb9270e344bb75f4;p=nextcloud-desktop.git

Windows MSI: Stay compatible with the upstream "StartMenuShortcuts" feature

Even though we only create a program shortcut in the Start Menu, try to make administrators lives easier by not diverging feature and option naming.

Signed-off-by: Michael Schuster <michael@schuster.ms>
---

diff --git a/admin/win/msi/Nextcloud.wxs b/admin/win/msi/Nextcloud.wxs
index 7e8406d32..4adaeba3b 100644
--- a/admin/win/msi/Nextcloud.wxs
+++ b/admin/win/msi/Nextcloud.wxs
@@ -192,7 +192,7 @@
             <Condition Level="0">(NO_SHELL_EXTENSIONS=1)</Condition>
         </Feature>
 
-        <Feature Id="StartMenuShortcut" Title="Start Menu Shortcut">
+        <Feature Id="StartMenuShortcuts" Title="Start Menu Shortcut">
             <ComponentRef Id="StartMenuIcon" />
             <Condition Level="0">(NO_START_MENU_SHORTCUTS=1)</Condition>
         </Feature>
diff --git a/doc/installing.rst b/doc/installing.rst
index 25e4e2b08..7e4d9495c 100644
--- a/doc/installing.rst
+++ b/doc/installing.rst
@@ -63,17 +63,17 @@ If you want to disable, e.g., desktop shortcut icons you can simply change the a
 
 See the following table for a list of available features:
 
-+--------------------+--------------------+----------------------------------+---------------------------+
-| Feature            | Enabled by default | Description                      |Property to disable        |
-+====================+====================+==================================+===========================+
-| Client             | Yes, required      | The actual client                |                           |
-+--------------------+--------------------+----------------------------------+---------------------------+
-| DesktopShortcut    | Yes                | Adds a shortcut to the desktop   |``NO_DESKTOP_SHORTCUT``    |
-+--------------------+--------------------+----------------------------------+---------------------------+
-| StartMenuShortcuts | Yes                | Adds shortcuts to the start menu |``NO_START_MENU_SHORTCUTS``|
-+--------------------+--------------------+----------------------------------+---------------------------+
-| ShellExtensions    | Yes                | Adds Explorer integration        |``NO_SHELL_EXTENSIONS``    |
-+--------------------+--------------------+----------------------------------+---------------------------+
++--------------------+--------------------+-----------------------------------+---------------------------+
+| Feature            | Enabled by default | Description                       |Property to disable        |
++====================+====================+===================================+===========================+
+| Client             | Yes, required      | The actual client                 |                           |
++--------------------+--------------------+-----------------------------------+---------------------------+
+| DesktopShortcut    | Yes                | Adds a shortcut to the desktop    |``NO_DESKTOP_SHORTCUT``    |
++--------------------+--------------------+-----------------------------------+---------------------------+
+| StartMenuShortcuts | Yes                | Adds a shortcut to the start menu |``NO_START_MENU_SHORTCUTS``|
++--------------------+--------------------+-----------------------------------+---------------------------+
+| ShellExtensions    | Yes                | Adds Explorer integration         |``NO_SHELL_EXTENSIONS``    |
++--------------------+--------------------+-----------------------------------+---------------------------+
 
 Installation
 ~~~~~~~~~~~~