A couple minor changes in the User's Guide.

[lyx.git] / lib / doc / Additional.lyx

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index f8f32fd1d59c4318b5745613bca5b86d98083cd6..1814d9dfe487c0ff4792291c26662f0784550b0d 100644 (file)
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -5712,23 +5712,23 @@ Name:
 status collapsed
 
 \begin_layout Plain Layout
-lyxclient.exe
+lyxeditor.exe
 \end_layout
 
 \end_inset
 
- program.
+ program (which is installed by default on Cygwin along with the LyX executable).
  Select 
 \begin_inset Flex CharStyle:Code
 status collapsed
 
 \begin_layout Plain Layout
-lyxclient.exe
+lyxeditor.exe
 \end_layout
 
 \end_inset
 
- and then specify the program arguments as as 
+ and then specify the program arguments as 
 \begin_inset Flex CharStyle:Code
 status collapsed
 
@@ -5748,67 +5748,17 @@ lyxsocket
 \emph on
 lyxpipe
 \emph default
-, select 
-\begin_inset Flex CharStyle:Code
-status collapsed
-
-\begin_layout Plain Layout
-bash.exe
-\end_layout
-
-\end_inset
-
- instead of 
-\begin_inset Flex CharStyle:Code
-status collapsed
-
-\begin_layout Plain Layout
-lyxclient.exe
-\end_layout
-
-\end_inset
-
- and specify 
-\begin_inset Flex CharStyle:Code
-status collapsed
-
-\begin_layout Plain Layout
--c 'lyxeditor.sh "%f" %l'
-\end_layout
-
-\end_inset
-
- as program arguments (here, don't forget the double quotes around 
+, omit the 
 \begin_inset Flex CharStyle:Code
 status collapsed
 
 \begin_layout Plain Layout
-%f
+-g
 \end_layout
 
 \end_inset
 
- as they are essential), where 
-\begin_inset Flex CharStyle:Code
-status collapsed
-
-\begin_layout Plain Layout
-lyxeditor.sh
-\end_layout
-
-\end_inset
-
- is the previously introduced shell script (make sure that 
-\begin_inset Flex CharStyle:Code
-status collapsed
-
-\begin_layout Plain Layout
-lyxeditor.sh
-\end_layout
-
-\end_inset
-
- is in the bash command PATH, otherwise use its full posix name).
+ option and be sure to specify the LyXServer pipe path in the LyX preferences.
 \end_layout
 
 \begin_layout Standard
@@ -5875,47 +5825,44 @@ cd $(dirname $1)
 \begin_inset Newline newline
 \end_inset
 
-SumatraPDF -inverse-search "lyxclient -g %f %l" $(basename $1)
+SumatraPDF -inverse-search "lyxeditor -g %f %l" $(basename $1)
 \end_layout
 
 \begin_layout Standard
-This is needed because SumatraPDF is a native Windows application and does
- not understand the posix paths used by the Cygwin version of LyX.
- If SumatraPDF is not in your command PATH, use its full posix path in the
- script above.
- Again, if you want to use the 
-\emph on
-lyxpipe
-\emph default
- instead of the 
-\emph on
-lyxsocket
-\emph default
-, replace 
+This wrapper script is needed because SumatraPDF is a native Windows application
+ and does not understand the posix paths used by the Cygwin version of LyX.
+ If SumatraPDF.exe is not in your command PATH, use its full posix path in
+ the script above.
+ The 
 \begin_inset Flex CharStyle:Code
 status collapsed
 
 \begin_layout Plain Layout
-"lyxclient -g %f %l"
+-g
 \end_layout
 
 \end_inset
 
- with 
+ enables communication via the 
+\emph on
+lyxsocket
+\emph default
+.
+ Again, omit the 
 \begin_inset Flex CharStyle:Code
 status collapsed
 
 \begin_layout Plain Layout
-"bash -c 'lyxeditor.sh 
-\backslash
-"%f
-\backslash
-" %l'"
+-g
 \end_layout
 
 \end_inset
 
-.
+ option if you want to use the 
+\emph on
+lyxpipe
+\emph default
+, and be sure to specify the LyXServer pipe path in the LyX preferences.
 \end_layout
 
 \begin_layout Standard
@@ -18403,7 +18350,24 @@ Control
  submenu.
  Please note that if you use password protected access to repository via
  ssh, you will be asked in terminal window.
- LyX was tested against SVN 1.4 and 1.5.
+ LyX was tested against SVN 1.5 and 1.6
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Most of the commands will work with 1.4 too, see 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sub:SVN-Repo-Update"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsubsection
@@ -18446,7 +18410,7 @@ Then you are asked interactively to supply an initial description of the
 \begin_layout Standard
 SVN command that is run: 
 \family typewriter
-snv add -q 
+svn add -q 
 \begin_inset Quotes eld
 \end_inset
 
@@ -18566,7 +18530,27 @@ svn revert -q
 \end_layout
 
 \begin_layout Subsubsection
-Synchronization of local directory checkout with repository
+\begin_inset CommandInset label
+LatexCommand label
+name "sub:SVN-Repo-Update"
+
+\end_inset
+
+Update of the local directory checkout from repository
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Note that this command will work only with subversion 
+\begin_inset Formula $\geqq1.5$
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -18582,7 +18566,7 @@ status collapsed
 
 \end_inset
 
- files and so on administration becomes more complicate.
+ files and so on administration becomes more complicated.
  LyX now supports updating the whole tree in which resides the document
 \begin_inset Foot
 status collapsed
@@ -18607,14 +18591,14 @@ One need to organize the files structure so that all external files are
 status collapsed
 
 \begin_layout Plain Layout
-Synchronize local directory with repository
+Update local directory from repository
 \end_layout
 
 \end_inset
 
- command firstly reverts all local changes (to avoid merge conflicts aftwards)
- and then updates the whole directory structure from the archive.
- If local changes are detected user is warned before reversion starts.
+ command updates the whole directory and in case of merge conflicts local
+ version of the files are left, so no unintended data loss occurs.
+ If local changes are detected user is warned before update starts.
 \end_layout
 
 \begin_layout Labeling
@@ -18650,11 +18634,7 @@ svn diff $path
 status collapsed
 
 \begin_layout Plain Layout
-svn revert -R $path
-\begin_inset Newline newline
-\end_inset
-
-svn update $path
+svn update --accept mine-full $path
 \end_layout
 
 \end_inset