Merge remote-tracking branch 'origin/main'

nikosdion · Dec 8, 2023 · 96f4d8a · 96f4d8a
2 parents 8c0501d + 7bb2b24
commit 96f4d8a
Show file tree

Hide file tree

Showing 3 changed files with 975 additions and 1,365 deletions.
diff --git a/sections/components.xml b/sections/components.xml
@@ -5537,16 +5537,22 @@ protected $minimumJoomla = '4.2.0';</programlisting>
     structure they will not be automatically removed.</para>
 
     <para>The $deleteFiles and $deleteFolders properties allow you to specify
-    which files and folders need to be removed, if they exist, on update. For
-    example:</para>
+    which files and folders need to be removed, if they exist, on
+    update.</para>
+
+    <para>Please remember that you need to call the
+    <methodname>removeFiles</methodname> method directly from your
+    <methodname>postflight</methodname> method.</para>
+
+    <para>Example for setting these variables:</para>
 
     <programlisting language="php">protected $deleteFiles = [
-  JPATH_SITE . '/components/com_example/tmpl/welcome/default_donate.php',
-  JPATH_ADMINISTRATOR . '/components/com_example/tmpl/item/default_phpwarning.php',
+  'components/com_example/tmpl/welcome/default_donate.php',
+  'administrator/components/com_example/tmpl/item/default_phpwarning.php',
 ];
 
 protected $deleteFolders = [
-  JPATH_SITE . '/media/com_example/icons',
+  'media/com_example/icons',
 ];</programlisting>
   </section>
 

diff --git a/sections/concepts.xml b/sections/concepts.xml
@@ -938,9 +938,9 @@ $wa
 
     <para>In Joomla 4.1 and later versions you are supposed to put the
     template's static files inside a media subdirectory:
-    <filename>media/site/<replaceable>TEMPLATE_NAME</replaceable></filename>
+    <filename>media/templates/site/<replaceable>TEMPLATE_NAME</replaceable></filename>
     for front-end templates, or
-    <filename>media/site/<replaceable>TEMPLATE_NAME</replaceable></filename>
+    <filename>media/templates/administrator/<replaceable>TEMPLATE_NAME</replaceable></filename>
     for back-end templates, where <replaceable>TEMPLATE_NAME</replaceable> is
     the name of your template without the <code>tpl_</code> prefix. As of
     Joomla 6 this will be the only supported method. It is definitely the only