The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit aaacbe579b8b4467f8904890e403bd26cbe6b428
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Mon May 27 18:13:09 2013 +0200

    Update our documentation to mention git instead of svn.
    
    Note that some mentions of svn remain in
    * development/cmake/LyxPackaging.cmake
    * development/LyX-Mac-binary-release.sh
    * development/Win32/packaging/installer/settings.nsh

diff --git a/INSTALL.MacOSX b/INSTALL.MacOSX
index 866d5dd..666e4a7 100644
--- a/INSTALL.MacOSX
+++ b/INSTALL.MacOSX
@@ -93,7 +93,7 @@ The aspell library is GPL-licensed and can be downloaded from
 ftp://ftp.gnu.org/gnu/aspell or one of the mirrors.
 At the time of writing aspell-0.60.tar.gz is the current version.
 Unpack the tarball in the same directory where you placed the
-svn checkout or LyX tarball.
+git checkout or LyX tarball.
 
 BUILD INSTRUCTIONS
 
@@ -210,7 +210,7 @@ adjust some environment variables to do so.
 user's directory being located at ~/Library/Application Support/LyX-2.0)
 
 
-(b) Developmental Versions (svn checkouts)
+(b) Developmental Versions (git checkouts)
 
 Building LyX from developmental sources requires a few more steps.
 Instead of the instructions above, do the following:
@@ -228,10 +228,6 @@ Instead of the instructions above, do the following:
      make
      make install-strip
 
-Note that by default svn versions use some extra debugging code that
-somewhat slows LyX down. If it is a real problem, you can pass the
-option --enable-build-type=release to configure.
-
 
 (c) Distribution build
 
@@ -254,7 +250,7 @@ Per default the resulting LyX application is build for ppc 
and i386
 to be usable on all systems from Tiger upwards.
 
 
-(d) Developmental Versions (svn checkouts and Qt4 frameworks)
+(d) Development Versions (git checkouts and Qt4 frameworks)
 
 Instead of the instructions in (b), do the following:
 
diff --git a/README b/README
index 2da3d1a..4f13069 100644
--- a/README
+++ b/README
@@ -70,13 +70,13 @@ How does the LyX version scheme work?
     shows that these releases will contain a few new features, and
     that the bulk of the patches will be documentation updates.
 
-    If you get the source from Subversion, the version string will
-    look like one of:
+    If you get the source from Git, the version string will look like
+    one of:
 
-       1.5.1svn     -- this is the stable branch on which maintenance
-               release 1.5.1 will eventually be tagged.
-       1.6.0svn     -- this is the main branch on which stable
-               release 1.6.0 will eventually be tagged.
+       2.0.6dev     -- this is the stable branch on which maintenance
+               release 2.0.6 will eventually be tagged.
+       2.1.0dev     -- this is the main branch on which stable
+               release 2.1.0 will eventually be tagged.
 
 What's new?
 
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index f2def99..d1b78f9 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -22,7 +22,7 @@ AC_ARG_ENABLE(build-type,
     *) AC_MSG_ERROR([bad build type specification \"$enableval\". Please use 
one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);;
    esac],
   [case AC_PACKAGE_VERSION in
-    *svn*|*dev*) build_type=development;;
+    *dev*) build_type=development;;
     *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
     *) build_type=release ;;
    esac])

-----------------------------------------------------------------------

Summary of changes:
 INSTALL.MacOSX       |   10 +++-------
 README               |   12 ++++++------
 config/lyxinclude.m4 |    2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to