Merge branch 'xep-0446' into premerge

xep-0446.xml

@@ -25,6 +25,12 @@
   <supersededby/>
   <shortname>file-metadata</shortname>
   &larma;
+  <revision>
+    <version>0.2.0</version>
+    <date>2022-07-17</date>
+    <initials>lmw</initials>
+    <remark>Use height/width instead of dimensions</remark>
+  </revision>
   <revision>
     <version>0.1.0</version>
     <date>2020-11-24</date>
@@ -70,11 +76,6 @@
       <td>Timestamp specifying the last modified time of the file (which MUST conform to the DateTime profile of &xep0082;).</td>
       <td><tt>2015-07-26T21:46:00+01:00</tt></td>
     </tr>
-    <tr>
-      <td>dimensions</td>
-      <td>Horizontal and vertical dimensions of image or video files, in pixels.</td>
-      <td><tt>1920x1080</tt></td>
-    </tr>
     <tr>
       <td>desc</td>
       <td>A human readable description of the file. Multiple <tt>&lt;desc/&gt;</tt> elements MAY be included if different xml:lang values are specified.</td>
@@ -85,6 +86,11 @@
       <td>A hash of the file content, using the <tt>&lt;hash/&gt;</tt> element defined in &xep0300; and qualifed by the 'urn:xmpp:hashes:2' namespace. Multiple hashes MAY be included for hash agility.</td>
       <td><em>see specification</em></td>
     </tr>
+    <tr>
+      <td>height</td>
+      <td>Vertical dimensions of image or video files, in pixels.</td>
+      <td><tt>1920</tt></td>
+    </tr>
     <tr>
       <td>length</td>
       <td>Length of an audio or video file, in milliseconds.</td>
@@ -110,6 +116,11 @@
       <td>A thumbnail element of the file, using the &lt;thumbnail/&gt; element defined in &xep0264; and qualified by the 'urn:xmpp:thumbs:1' namespace. Multiple thumbnails MAY be included for media type and size agility.</td>
       <td><em>see specification</em></td>
     </tr>
+    <tr>
+      <td>width</td>
+      <td>Horizontal dimensions of image or video files, in pixels.</td>
+      <td><tt>1080</tt></td>
+    </tr>
   </table>
   <p>
     All child elements are OPTIONAL, however, specifications making use of the