From: Pavel Sanda <sanda@lyx.org>
Date: Wed, 14 Oct 2009 19:18:10 +0000 (+0000)
Subject: Doc it
X-Git-Tag: 2.0.0~5368
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f4f465a532a633e7b6f0a934fa94dd866390dbaf;p=features.git

Doc it

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31616 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index d3b4997a0e..f89071adac 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -18403,7 +18403,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, 1.5 and 1.6.
+ LyX was tested against SVN 1.5 and 1.6
+\begin_inset Foot
+status open
+
+\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
@@ -18566,7 +18583,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 with 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
@@ -18650,11 +18687,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