diff --git a/en/gnome/docs/develfaq.sgml b/en/gnome/docs/develfaq.sgml index af4c682079..9e124e9e98 100644 --- a/en/gnome/docs/develfaq.sgml +++ b/en/gnome/docs/develfaq.sgml @@ -1,6 +1,6 @@ - + @@ -108,24 +108,31 @@ WITH_DEBUG=yes here. This script will merge the development ports tree into your main ports tree. From there, you can use - portupgrade to upgrade from &gnomever; to &gnomedevelver; - and stay up-to-date afterwards. NOTE: if this is a - first-time upgrade from &gnomever; to &gnomedevelver; you - must run a special portupgrade command to account - for the move from X11BASE to LOCALBASE:

+ portupgrade or portmaster to upgrade from + &gnomever; to &gnomedevelver; and stay up-to-date afterwards. + NOTE: if this is a first-time upgrade from &gnomever; to + &gnomedevelver; you must run portupgrade or + portmaster command:

-portupgrade -rf glib-2\* cairo gnome-doc-utils gnome-mime-data gnome-audio
+portupgrade -o textproc/rarian textproc/scrollkeeper
+portupgrade -a
+
+or
+
+portmaster -o textproc/rarian textproc/scrollkeeper
+portmaster -a

The long answer is that keeping up-to-date with the GNOME development branch is complicated. Sometimes components change - in a way that makes portupgrade fail, or causes strange end results. - If you plan to track the development branch, it is a good idea - to join the + in a way that makes portupgrade or portmaster + fail, or causes strange end results. If you plan to track the + development branch, it is a good idea to join the freebsd-gnome mailing list, as well as to join the - #freebsd-gnome IRC channel on FreeNode (irc.freenode.net).

+ #freebsd-gnome IRC channel on FreeNode + (irc.freenode.net).

If all of this sounds scary, or you need a desktop that "Just Works," you should stick with the stable GNOME branch.

@@ -164,7 +171,7 @@ portupgrade -rf glib-2\* cairo gnome-doc-utils gnome-mime-data gnome-audio

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME 2.19.6 is now out, and ports and packages are +

    GNOME 2.20.0 is now out, and ports and packages are up-to-date. Keep those bug reports coming.