[Libreoffice-commits] core.git: Branch 'aoo/trunk' - readlicense_oo/docs

[Matthias Seidel]

 readlicense_oo/docs/readme/readme.xrm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f7ce97f232160a0871fb6613517de339597f178f
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sat Feb 25 21:39:16 2017 +0000

    Added Windows 10 in ReadMe, fixed typo

diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm
index 333a2f9..f85c0ed 100644
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -78,7 +78,7 @@
 			<div class="WIN" id="SystemRequirements_WIN">
 				<ul>
 					<li>
-						<p id="s2s3sdf2" xml:lang="en-US">Microsoft Windows XP, Vista, Windows 7 or Windows 8</p>
+						<p id="s2s3sdf2" xml:lang="en-US">Microsoft Windows XP, Vista, Windows 7, Windows 8 or Windows 10</p>
 					</li>
 
 					<li>
@@ -235,7 +235,7 @@
 
 		<div id="Keyboard">
 			<h2 id="awe1" xml:lang="en-US">Shortcut Keys</h2>
-			<p id="w32e1" xml:lang="en-US">Only shortcut keys (key combinations) not used by the operating system can be used in ${PRODUCTNAME}. If a key combination in ${PRODUCTNAME} does not work as described in the ${PRODUCTNAME} Help, check if that shortcut is already used by the operating system. To rectify such conflicts, you can change the keys assigned by your operating system. Alternatively, you can change almost any key assignment in ${PRODUCTNAME}. For more information on this topic, refer to the ${PRODUCTNAME} Help or the Help documention of your operating system.</p>
+			<p id="w32e1" xml:lang="en-US">Only shortcut keys (key combinations) not used by the operating system can be used in ${PRODUCTNAME}. If a key combination in ${PRODUCTNAME} does not work as described in the ${PRODUCTNAME} Help, check if that shortcut is already used by the operating system. To rectify such conflicts, you can change the keys assigned by your operating system. Alternatively, you can change almost any key assignment in ${PRODUCTNAME}. For more information on this topic, refer to the ${PRODUCTNAME} Help or the Help documentation of your operating system.</p>
 			<div class="MAC" id="MACKeysBETA">
 				<p id="mackeys1" xml:lang="en-US">The application help of ${PRODUCTNAME} may use shortcut combinations for PC keyboards only.</p>
 			</div>