r17710 by gpittman - reducing install docs

Fri Jul 13 00:33:24 UTC 2012

Author: gpittman
Date: Fri Jul 13 00:33:23 2012
New Revision: 17710

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17710
Log:
reducing install docs

Modified:
    branches/Version14x/Scribus/scribus/doc/en/install.html
    branches/Version14x/Scribus/scribus/doc/en/install1.html
    branches/Version14x/Scribus/scribus/doc/en/menu.xml

Modified: branches/Version14x/Scribus/scribus/doc/en/install.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17710&path=/branches/Version14x/Scribus/scribus/doc/en/install.html
==============================================================================

--- branches/Version14x/Scribus/scribus/doc/en/install.html (original)
+++ branches/Version14x/Scribus/scribus/doc/en/install.html Fri Jul 13 00:33:23 2012
@@ -9,7 +9,7 @@
 <p>The installation process of Scribus depends on the operating system/distribution you are using. This is, of course, true for any program you may wish to install. </p>
 <p><b>Linux:</b> On Linux, the easiest way to install Scribus is using a package manager like Yum, YaST or APT, as this method will resolve all dependencies automatically. If there are no pre-built Scribus packages for your Linux version available, you can either try installing an RPM oder DEB package by using the <code>alien</code> command or you have to <a href="install1.html">build from source</a>.</p>
 <p><b>Other UNIX systems:</b> There <i>may</i> be packages for OpenSolaris or any of the BSD Unices available, but experience has shown that these are often quite old, and it’s probable that you will have to build Scribus from source.</p>
-<p><b>Mac OS X:</b> DMGs and pkg files for Mac OS X 10.5 and later versions are available from our <a href="http://sourceforge.net/projects/scribus/files/">Sourceforge repository</a>. If your OS X version is older, you can try to install Scribus via Fink or try to <a href="install5.html">build it from source</a>.</p>
+<p><b>Mac OS X:</b> DMGs and pkg files for Mac OS X 10.5 and later versions are available from our <a href="http://sourceforge.net/projects/scribus/files/">Sourceforge repository</a>. If your OS X version is older, you can try to install Scribus via Fink or try to build it from source.</p>
 <p><b>Windows:</b> Installing Scribus on Windows works as with most Windows programs: There is one file with the extension *.exe that contains everything you need (except <a href="toolbox5.html">Ghostscript</a>). See the <a href="readme-win32.html">Windows README</a> for more information.</p>
 <p><b>OS/2 and eComStation:</b> The OS/2 port does not come with an installer. All files are packaged in a ZIP file, which you need to extract. Before you can run Scribus, you need to install several dependencies. See the <a href="readme-os2.html">OS/2 README</a> for more information.</p>
 

Modified: branches/Version14x/Scribus/scribus/doc/en/install1.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17710&path=/branches/Version14x/Scribus/scribus/doc/en/install1.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/install1.html (original)
+++ branches/Version14x/Scribus/scribus/doc/en/install1.html Fri Jul 13 00:33:23 2012
@@ -1,37 +1,20 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<title>How to obtain the Scribus Source Code</title>
+	<title>Compiling Scribus</title>
 </head>
 <body>
-<h2>How to Obtain the Scribus Source Code</h2>
-<p>You can get a tarball of the most recent release of Scribus from Sourceforge: <a href="http://sourceforge.net/projects/scribus/files/"> http://sourceforge.net/projects/scribus/files/</a>.</p>
-
-<p>Thanks to <a href="http://Anduin.net">Anduin.net</a> there is also an anonymous SVN repository, which is updated hourly. Use of this code is only recommended for those who want to stay on the bleeding edge. Instructions for getting the latest source code via SVN: </p>
-
-<p><strong>Scribus 1.4 branch</strong>. This branch is the code for the stable release (1.4.x).</p>
-<blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">
-<pre>
-svn co svn://scribus.info/Scribus/branches/Version14x
-</pre>
-or for those with closed SVN ports on their firewalls:
-<pre>
-svn co http://scribus.info/svn/Scribus/branches/Version14x
-</pre>
-</td></tr></table></blockquote>
-
-<p><strong>Scribus 1.5svn – Development</strong>. This branch is the code for the experimental version (1.5svn). This code may be highly unstable or may not even work or compile at all!</p>
-<blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">
-<pre>
-svn co svn://scribus.info/Scribus/trunk
-</pre>
-or, once again, for those with closed SVN ports on their firewalls:
-<pre>
-svn co http://scribus.info/svn/Scribus/trunk
-</pre>
-</td></tr></table></blockquote>
-
-<p>From here, continue with the <a href="install4.html">Compiling and Installing using CMake</a> instructions.</p>
+<h2>What this page is about</h2>
+<p>Generally speaking, this page applies to those using some variety of Linux, since with Linux, you have ready access to all the components you need to compile the source code into an binary which you can run on your computer. Here are some brief notes. For details please consult the wiki, where <a href="http://wiki.scribus.net/canvas/Building_SVN_versions_with_CMake">there is a page devoted to explaining the process in detail</a>.</p>
+<p>In case it needs to be mentioned, everything you need is available for free for Linux, but you will almost certainly need to assemble all of the specific components needed for the process. It's a challenge the first time, to be sure, but we think you'll find it worth the effort.</p>
+<h3>subversion (SVN)</h3>
+<p>This is the name of the software Scribus currently uses to maintain the Scribus code, and with it you can obtain the latest code for both the current stable version and development version. Subversion simply downloads the sourcecode and the various instructions needed to compile or build Scribus.</p>
+<h3>cmake</h3>
+<p>Your next step after getting the source is to run cmake, which checks to see that you have all the dependencies (other source code and libraries) needed to compile the source code. So <code>cmake</code> is another piece of software besides <code>subversion</code> that you must have to get and compile Scribus. One particularly useful thing <code>cmake</code> allows is your own personal customizations, which might include a particular spell-checker, putting your Scribus installation in a custom location (which allows for having more than one version on your computer), and maybe limiting the number of languages available, which reduced the time to build Scribus. Refer to the wiki for these details.</p>
+<h3>gcc and gcc++</h3>
+Last but not least, this is the software which literally does the compiling. If <code>cmake</code> says you have all the components, then this should run smoothly.</p>
+<h3>And repeat...</h3>
+Once you've gone through this, you can update your personal repository as often as you want, and recompile Scribus for the most up-to-date version available. Enjoy!</p>
 
 </body>
 </html>

Modified: branches/Version14x/Scribus/scribus/doc/en/menu.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17710&path=/branches/Version14x/Scribus/scribus/doc/en/menu.xml
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/menu.xml (original)
+++ branches/Version14x/Scribus/scribus/doc/en/menu.xml Fri Jul 13 00:33:23 2012
@@ -14,9 +14,6 @@
 			<submenuitem text="OS/2 and eComStation" file="readme-os2.html"/>
 			<submenuitem text="Windows" file="readme-win32.html"/>
 			<submenuitem text="Scribus Source and SVN" file="install1.html"/>
-			<submenuitem text="Requirements" file="install2.html"/>
-			<submenuitem text="Compiling using CMake" file="install4.html"/>
-			<submenuitem text="Compiling using CMake on OS X" file="install5.html"/>                     
 		</submenuitem>
 		<submenuitem text="Setup" file="config.html">
 			<submenuitem text="Configuring Scribus" file="settings1.html"/>


