[Unison-hackers] [unison-svn] r543 - in trunk: doc src

[bcpierce at seas.upenn.edu]

Author: bcpierce
Date: 2015-06-08 10:58:56 -0400 (Mon, 08 Jun 2015)
New Revision: 543

Modified:
   trunk/doc/unison-manual.tex
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/uigtk2.ml
Log:
* Add shortcut key to GTK2 user interface allowing - to be used as a
  synonym for / (to accommodate german keyboards)

* Small fix to manual


Modified: trunk/doc/unison-manual.tex
===================================================================
--- trunk/doc/unison-manual.tex	2015-06-08 14:53:28 UTC (rev 542)
+++ trunk/doc/unison-manual.tex	2015-06-08 14:58:56 UTC (rev 543)
@@ -1236,7 +1236,11 @@
 otherwise if {\tt HOME} is defined, it will be
 {\tt \$HOME$\backslash$.unison};
 otherwise, it will be
-{\tt c:$\backslash$.unison}.
+{\tt c:$\backslash$.unison}.  
+On OS X, 
+{\tt \$HOME/.unison} will be used if it is present, but 
+{\tt \$HOME/Library/Application Support/Unison} will be created and used by
+default. 
 
 The archive file for each replica is found in the {\tt .unison}
 directory on that replica's host.  Profiles (described below) are

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2015-06-08 14:53:28 UTC (rev 542)
+++ trunk/src/RECENTNEWS	2015-06-08 14:58:56 UTC (rev 543)
@@ -1,3 +1,11 @@
+CHANGES FROM VERSION 2.48.6
+
+* Add shortcut key to GTK2 user interface allowing - to be used as a
+  synonym for / (to accommodate german keyboards)
+
+* Small fix to manual
+
+-------------------------------
 CHANGES FROM VERSION 2.48.5
 
 uimac14: replace Growl with OS X native notification center.

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2015-06-08 14:53:28 UTC (rev 542)
+++ trunk/src/mkProjectInfo.ml	2015-06-08 14:58:56 UTC (rev 543)
@@ -101,3 +101,4 @@
 
 
 
+

Modified: trunk/src/uigtk2.ml
===================================================================
--- trunk/src/uigtk2.ml	2015-06-08 14:53:28 UTC (rev 542)
+++ trunk/src/uigtk2.ml	2015-06-08 14:58:56 UTC (rev 543)
@@ -4012,7 +4012,7 @@
         (actionMenu#add_image_item ~key:GdkKeysyms._slash ~callback:questionAction
           ~image:((GMisc.image ~stock:`NO ~icon_size:`MENU ())#coerce)
           "Do _Not Propagate Changes") in
-    grAdd grAction skip;
+    grAdd grAction skip; 
     skip#add_accelerator ~group:accel_group ~modi:[`SHIFT] GdkKeysyms._minus;
 
     let merge =