Date: Fri, 18 Oct 2013 17:55:48 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43000 - in head: en_US.ISO8859-1/htdocs/gnome en_US.ISO8859-1/htdocs/gnome/docs share/xml Message-ID: <201310181755.r9IHtmHH010566@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm (ports committer) Date: Fri Oct 18 17:55:47 2013 New Revision: 43000 URL: http://svnweb.freebsd.org/changeset/doc/43000 Log: Bump development version that we are currently working on. Update misc items like supported FreeBSD versions. And GNOME development happens in SVN these days. Replace FreeBSD with &os; [1] Reviewed by: rene@ Suggested by: rene@ [1] Modified: head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml head/en_US.ISO8859-1/htdocs/gnome/index.xsl head/share/xml/release.ent Modified: head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml Fri Oct 18 13:52:57 2013 (r42999) +++ head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml Fri Oct 18 17:55:47 2013 (r43000) @@ -22,7 +22,7 @@ <li> <a href="#q5">What should I do when something does not work?</a></li> <li> <a href="#q6">How can I help with the development versions?</a></li> <li> <a href="#q7">What is the current state of development GNOME on - FreeBSD</a></li> + &os;</a></li> </ol> <h2>Full Text </h2> @@ -38,20 +38,22 @@ <ol> <li><b>STABLE</b> - The applications and libraries in the stable branch are considered "release quality," and are the versions that - appear in the FreeBSD ports tree. The current stable version is + appear in the &os; ports tree. The current stable version is GNOME &gnomever;.</li> <li><b>DEVELOPMENT</b> - In between stable releases are development releases. Traditionally, GNOME development releases have odd minor - numbers (e.g. 2.3, &gnomedevelver;, 2.(n*2)-1). Development releases will + numbers (e.g. 2.3, &gnomedevelver;, 3.(n*2)-1). Development releases will become stable releases, and move from alpha to beta quality during - their lifecycle. The development releases need testing by FreeBSD + their lifecycle. The development releases need testing by &os; users to minimize the number of surprises when the new stable - versions are committed to the FreeBSD CVS tree. This document is - about the development branch. The current development branch - is GNOME &gnomedevelver;.</li> + versions are committed to the &os; SVN tree. This document is + about the development branch. At any time the development branch for &os; + might be based of a stable GNOME release. However it will be tagged + "development" here if it is the version that is work in progress by the &os; + GNOME team. The current development branch for &os; is GNOME &gnomedevelver;.</li> <li><b>GIT</b> - Often newer-than-new, the GIT master versions of GNOME applications and libraries are alpha quality, or often completely - unbuildable. The FreeBSD GNOME project pays attention to, but + unbuildable. The &os; GNOME project pays attention to, but does not track the alpha quality code.</li> </ol> </li> @@ -62,7 +64,7 @@ <!-- A2 --> <p>If you are looking for a stable environment, absolutely not. Please only track the GNOME &gnomedevelver; branch if you wish to help identify bugs - and improve the FreeBSD GNOME project. You will find little + and improve the &os; GNOME project. You will find little sympathy if a development-quality GNOME application eats your homework.</p> </li> @@ -72,12 +74,12 @@ <p><b>How do I obtain the development versions of GNOME stuff?</b></p> <!-- A3 --> <p><a href="mailto:marcus@FreeBSD.org">Marcus</a> maintains a - CVS repository where all the development versions of - the GNOME components for FreeBSD are housed. Instructions for + SVN repository where all the development versions of + the GNOME components for &os; are housed. Instructions for how to check out the development ports module and how to merge it - into the FreeBSD ports tree reside on the entrance page to his + into the &os; ports tree reside on the entrance page to his SVN repository. Please read carefully the instructions at - <a href="http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi">http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi</a>. + <a href="http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/">http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/</a>. </p> <p>During the development cycle, FreeBSD-specific caveats and @@ -97,7 +99,7 @@ <pre> WITH_DEBUG="yes" </pre> - <p>GNOME has an excellent guide for getting <a href="http://live.gnome.org/GettingTraces">; + <p>GNOME has an excellent guide for getting <a href="https://wiki.gnome.org/GettingTraces">; useful back traces</a>.</p> </li> @@ -106,7 +108,7 @@ WITH_DEBUG="yes" <p><b>How do I keep everything up-to-date and in sync?</b></p> <!-- A4 --> <p>The short answer is that you need to use the <tt>marcusmerge</tt> - script to merge the development tree with the FreeBSD ports tree. + script to merge the development tree with the &os; ports tree. The <tt>marcusmerge</tt> script is available <a href="http://www.marcuscom.com/downloads/marcusmerge">; here</a>, and a man page on using the script is available @@ -127,7 +129,8 @@ WITH_DEBUG="yes" (<tt>irc.freenode.net</tt>).</p> <p>If all of this sounds scary, or you need a desktop that - "Just Works," you should stick with the stable GNOME branch.</p> + "Just Works," you should stick with the &gnomever; version that + is available in the &os; ports tree.</p> </li> <!-- Q5 --> @@ -137,7 +140,7 @@ WITH_DEBUG="yes" <p>It depends. If you think the problem is truly a bug with the GNOME component, you can report a bug using <b>bug-buddy</b> or the GNOME <a href="http://bugzilla.gnome.org">Bugzilla</a>; - interface. If you think the problem lies in a FreeBSD port, or + interface. If you think the problem lies in a &os; port, or is FreeBSD-specific, send email to <a href="mailto:&email;@FreeBSD.org">&email;@FreeBSD.org</a>, or report the problem on the <em>#freebsd-gnome</em> IRC @@ -161,11 +164,10 @@ WITH_DEBUG="yes" <!-- Q7 --> <li style="padding-bottom: 0.5em"><a name="q7"></a> - <p><b>What is the current state of development GNOME on FreeBSD?</b></p> + <p><b>What is the current state of development GNOME on &os;?</b></p> <!-- A7 --> - <p>We have just cleared out the MarcusCom ports tree after - merging &gnomever; into the FreeBSD ports tree. Stay tuned - for the start of &gnomedevelver; work.</p> + <p>&gnomever; is the latest version that was merged into the &os; ports tree. + Work is currently underway to make &gnomedevelver; stable.</p> </li> </ol> </body> Modified: head/en_US.ISO8859-1/htdocs/gnome/index.xsl ============================================================================== --- head/en_US.ISO8859-1/htdocs/gnome/index.xsl Fri Oct 18 13:52:57 2013 (r42999) +++ head/en_US.ISO8859-1/htdocs/gnome/index.xsl Fri Oct 18 17:55:47 2013 (r43000) @@ -100,9 +100,9 @@ web browsers, audio players, office programs, and more.</p> - <p>The FreeBSD GNOME Project is a team of devoted + <p>The &os; GNOME Project is a team of devoted developers and users that manage the - integration of GNOME and FreeBSD.</p> + integration of GNOME and &os;.</p> <h2>How to install GNOME</h2> @@ -129,15 +129,15 @@ <h2>State of the port</h2> - <p>GNOME for FreeBSD is currently fully supported on - 8.3, 8-STABLE, 9.0, 9.1, and 9-STABLE, while - 10.0-CURRENT is provided on a best effort basis. - Most of GNOME has been ported to FreeBSD, but there is still - <a href="docs/volunteer.html">plenty left to be done</a>!</p> + <p>GNOME for &os; is currently fully supported on + 8.4, 8-STABLE, 9.1, 9.2, and 9-STABLE, 10.0 and 10-STABLE while + 11.0-CURRENT is provided on a best effort basis. + Work is being done to replace Gnome 2 with Mate and Gnome3. + There is still <a href="docs/volunteer.html">plenty left to be done</a>!</p> <h2>One stop solution shop!</h2> - <p>GNOME is simple and easy to build using the FreeBSD ports system, but + <p>GNOME is simple and easy to build using the &os; ports system, but sometimes things simply go wrong. If GNOME -- or anything that uses GNOME libraries -- is not building the way it should, simply run the <a href="/gnome/gnomelogalyzer.sh">gnomelogalyzer.sh</a> Modified: head/share/xml/release.ent ============================================================================== --- head/share/xml/release.ent Fri Oct 18 13:52:57 2013 (r42999) +++ head/share/xml/release.ent Fri Oct 18 17:55:47 2013 (r43000) @@ -83,4 +83,4 @@ <!ENTITY gnomeoldver '2.30'> <!ENTITY gnomever '2.32'> -<!ENTITY gnomedevelver '2.90'> +<!ENTITY gnomedevelver '3.6'>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310181755.r9IHtmHH010566>