Merge remote-tracking branch 'origin/master'

Protected-notes.md

@@ -7,6 +7,7 @@ For such sensitive data Trilium can protect these notes which essentially means:
 * time-limited access to protected notes
     * To first access protected notes you need to enter your password which will decrypt the note and allow you to read / write them. But after certain time period (by default 10 minutes) this decrypted note is unloaded from memory and to read it again you need to enter your password again.
     * This protects against a possible scenario where you leave your computer unlocked for a long time and somebody can access your Trilium application.
+* protected notes protect only confidentiality and partially integrity of the notes. User outside of the protected sessions can still e.g. delete the protected notes or move them to a new location.
     
 ## How to use protected notes
 

Tree-manipulation.md

@@ -10,9 +10,9 @@ You can manipulate the tree simply by dragging and dropping notes as you can see
 
 Trilium provides fast keyboard based manipulation with following [[shortcuts|keyboard shortcuts]]:
 
-* `SHIFT-UP` and `SHIFT-DOWN` - move note up or down in the order
-* `SHIFT-LEFT` - move note upwards in the hierarchy by changing a note's parent to note's parent's parent.
-* `SHIFT-RIGHT` - move note downwards in the hierarchy by setting parent to the note currently above (this is a bit hard to explain - it's best to see a demo or try it for yourself)
+* `CTRL-UP` and `CTRL-DOWN` - move note up or down in the order
+* `CTRL-LEFT` - move note upwards in the hierarchy by changing a note's parent to note's parent's parent.
+* `CTRL-RIGHT` - move note downwards in the hierarchy by setting parent to the note currently above (this is a bit hard to explain - it's best to see a demo or try it for yourself)
 * `LEFT` and `RIGHT` expands and collapses a sub-tree
 
 [[gifs/move-note-with-keyboard.gif]]