Date: Sun, 13 Oct 2002 16:44:56 -0700 (PDT) From: <adam@vectors.cx> To: FreeBSD-gnats-submit@FreeBSD.org Subject: www/44026: [patch] a number of fixes to www/en/gnome Message-ID: <200210132344.g9DNiu8o004740@vectors.cx>
next in thread | raw e-mail | index | archive | help
>Number: 44026
>Category: www
>Synopsis: [patch] a number of fixes to www/en/gnome
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-www
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 13 16:50:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:
>Release: FreeBSD 4.7-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD manifold.vectors.cx 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #22: Thu Sep 12 13:25:10 PDT 2002 root@manifold.vectors.cx:/usr/src/sys/compile/subspace i386
>Description:
these are patches for www/en/gnome/{index.xsl,docs/faq.sgml,docs/faq2.sgml}.
they accomplish the following:
* fix run-on sentences and a few other grammatical semantics
* seeing as how neither 1.4.1 and 2.0.* are even accurate anymore,
this changes all references to 1.4 and 2.these are patches for www/en/gnome/{index.xsl,docs/faq.sgml,docs/faq2.sgml}.
they accomplish the following:
* fix run-on sentences and a few other grammatical semantics
* seeing as how neither 1.4.1 and 2.0.* are even accurate anymore,
this changes all references to gnome 1.4 and gnome 2.0.
* include mention of gnome2-fifth-toe
* explain how to install nautilus2
>How-To-Repeat:
>Fix:
--- gnome-www-diff.patch begins here ---
Index: www/en/gnome/index.xsl
===================================================================
RCS file: /home/ncvs/www/en/gnome/index.xsl,v
retrieving revision 1.29
diff -u -r1.29 index.xsl
--- www/en/gnome/index.xsl 2002/09/15 19:21:54 1.29
+++ www/en/gnome/index.xsl 2002/10/13 23:30:01
@@ -39,7 +39,7 @@
<p><font size="+1" color="#990000"><b>GNOME on FreeBSD</b></font>
<small><br/>
· <a href="http://www.FreeBSD.org/gnome/">GNOME on FreeBSD Home</a><br/>
- · <a href="docs/faq.html#q1">Installation Instructions for GNOME 1.4.1</a><br/>
+ · <a href="docs/faq.html#q1">Installation Instructions for GNOME 1.4</a><br/>
· <a href="docs/faq2.html#q1">Installation Instructions for GNOME 2.0</a><br/>
· <a href="../ports/gnome.html">Available Applications</a><br/>
· <a href="docs/volunteer.html">How to Help</a><br/>
@@ -50,7 +50,7 @@
<p><font size="+1" color="#990000"><b>Documentation</b></font>
<small><br/>
- · <a href="docs/faq.html">GNOME 1.4.1 FAQ</a><br/>
+ · <a href="docs/faq.html">GNOME 1.4 FAQ</a><br/>
· <a href="docs/faq2.html">GNOME 2.0 FAQ</a><br/>
· <a href="docs/porting.html">Creating Ports</a><br/>
</small></p>
@@ -97,7 +97,7 @@
<p>The GNOME project was born as an effort to create an entirely free
desktop environment for free systems. From the start, the main
- objective of GNOME has been to provide a user friendly suite of
+ objective of GNOME has been to provide a user-friendly suite of
applications and an easy-to-use desktop. The FreeBSD GNOME Project
strives to bring GNOME to the FreeBSD user.</p>
@@ -110,11 +110,11 @@
months to include addressing a number of problems in the existing
Unix infrastructure.</p>
- <p>The GNOME project acts as an umbrella, the major components of
+ <p>The GNOME project acts as an umbrella. The major components of
GNOME are:</p>
<ul>
<li>The <a href="http://www.gnome.org">GNOME desktop</a>: An easy
- to use windows-based environment for users.</li>
+ to use window-based environment for users.</li>
<li>The <a href="http://developer.gnome.org">GNOME development
platform</a>: A rich collection of tools, libraries,
and components to develop powerful applications on Unix.</li>
@@ -125,7 +125,7 @@
<h2><font color="#990000">State of the port</font></h2>
<p>We currently support 4.x and 5-CURRENT FreeBSD systems
- for GNOME 1.4.1 and 2.0.2. Anything prior to FreeBSD 4.5 is
+ for GNOME 1.4 and 2.0. Anything prior to FreeBSD 4.5 is
not supported. Most of GNOME has been ported to FreeBSD;
however, there is <a href="docs/volunteer.html">plenty left to
do</a>!</p>
Index: www/en/gnome/docs/faq.sgml
===================================================================
RCS file: /home/ncvs/www/en/gnome/docs/faq.sgml,v
retrieving revision 1.35
diff -u -r1.35 faq.sgml
--- www/en/gnome/docs/faq.sgml 2002/08/25 19:12:55 1.35
+++ www/en/gnome/docs/faq.sgml 2002/10/13 23:30:01
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY base CDATA "../..">
<!ENTITY date "$FreeBSD: www/en/gnome/docs/faq.sgml,v 1.35 2002/08/25 19:12:55 marcus Exp $">
-<!ENTITY title "FreeBSD GNOME Project: GNOME 1.4.1 FAQ">
+<!ENTITY title "FreeBSD GNOME Project: GNOME 1.4 FAQ">
<!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
]>
@@ -59,9 +59,9 @@
<tt># pkg_add -r gnome</tt>
<p>This will download the latest GNOME packages from the FreeBSD FTP
- site, and proceed to install them on your system. <b>Note:</b> As
- of 4.4-RELEASE, installing GNOME from packages contained on a
- release CDROM is broken. You should instead use the ports
+ site, and proceed to install them on your system. <b>Note:</b>
+ Installing GNOME from packages contained in the 4.4-RELEASE
+ release CDROM was broken. You should instead use the ports
method below. The problem was fixed in the 4.5-RELEASE.</p>
<p>To build and install GNOME from ports, you should first
@@ -85,8 +85,8 @@
Vim, to take advantage of the Gtk+ widget set.</p>
<p>Currently, building from ports is the preferred method for
- installing GNOME on FreeBSD, however FreeBSD GNOME team is working
- on improving situation with pre-built packages.</p>
+ installing GNOME on FreeBSD; however, the FreeBSD GNOME team is working
+ on improving the installation of pre-built packages.</p>
</td>
</tr>
<tr><td><br></td></tr>
@@ -144,7 +144,7 @@
<p>Ports such as <tt>devel/pth</tt> and <tt>devel/ngpt</tt> can
also cause pthread-related problems when compiling GNOME. If you
- do not need these ports installed, it is recommended you remove them.
+ do not need these ports installed, it is recommended that you remove them.
</p>
</td>
</tr>
@@ -384,7 +393,7 @@
and KDE are still far from perfection or even completeness and
could hardly be compared to commercial offerings in terms of
user-friendliness. But at the same time it is a huge step in the
- right direction. It should also be noted, that both GNOME and
+ right direction. It should also be noted that both GNOME and
KDE are still very young and the situation is likely to improve as
they mature (does anybody remember what sort of crap
Windows 3.11 was?).</p>
Index: www/en/gnome/docs/faq2.sgml
===================================================================
RCS file: /home/ncvs/www/en/gnome/docs/faq2.sgml,v
retrieving revision 1.16
diff -u -r1.16 faq2.sgml
--- www/en/gnome/docs/faq2.sgml 2002/10/02 23:52:49 1.16
+++ www/en/gnome/docs/faq2.sgml 2002/10/13 23:30:01
@@ -19,10 +19,10 @@
<li> <a href="#q3">I installed GNOME 2.0, but I am missing
application foo. What gives?</a>
<li> <a href="#q4">What is the best way to upgrade from GNOME
- 1.4.1 to GNOME 2.0?</a>
+ 1.4 to GNOME 2.0?</a>
<li> <a href="#q5">How do I keep my GNOME 2.0 components
and applications up-to-date?</a>
- <li> <a href="#q6">Can I install GNOME 1.4.1 applications under
+ <li> <a href="#q6">Can I install GNOME 1.4 applications under
GNOME 2.0 and vice versa?</a>
<li> <a href="#q7">Where can I get more themes for GNOME 2.0?</a>
<li> <a href="#q8">What window managers work well with GNOME 2.0?
@@ -119,7 +119,7 @@
<p>Ports such as <tt>devel/pth</tt> and <tt>devel/ngpt</tt> can
also cause pthread-related problems when compiling GNOME 2.0.
- If you do not need these ports installed, it is recommended
+ If you do not need these ports installed, it is recommended that
you remove them.
</p>
</td>
@@ -144,7 +144,25 @@
have not been a great deal of applications ported over to it.
As more applications become available, they will be ported
over. In the meantime, you can, however, run
- <a href="#q6">GNOME 1.4.1 applications</a> under GNOME 2.0.</p>
+ <a href="#q6">GNOME 1.4 applications</a> under GNOME 2.0.</p>
+
+ <p>Many applications that have already been ported are included in
+ the <tt>gnome2-fifth-toe</tt> meta-port. <tt>gnome2-fifth-toe</tt>
+ includes both <a href="#q6">GNOME 1.4 applications</a> and GNOME
+ 2.0 applications.</p>
+
+ <p>To install <tt>gnome2-fifth-toe</tt> from packages:</p>
+
+ <tt># pkg_add -r gnome2-fifth-toe</tt>
+
+ <p>To install <tt>gnome2-fifth-toe</tt> from ports:</p>
+
+ <pre>
+# cd /usr/ports/x11/gnome2-fifth-toe
+# make clean
+# make install clean
+ </pre>
+
</td>
</tr>
<tr><td><br></td></tr>
@@ -154,7 +172,7 @@
<td width="10">
<b><a name="q4"> 4.</a></b></td>
<td align="left" valign="top" colspan="3">
- <b>What is the best way to upgrade from GNOME 1.4.1 to GNOME 2.0?
+ <b>What is the best way to upgrade from GNOME 1.4 to GNOME 2.0?
</b>
</td>
</tr>
@@ -165,10 +183,10 @@
<p>Right now, the GNOME project is still very much in flux.
Work still must be done to the GNOME ports infrastructure in
order to get things working cleanly. However, if you have
- GNOME 1.4.1, and you want to upgrade to GNOME 2.0, first
+ GNOME 1.4, and you want to upgrade to GNOME 2.0, first
familiarize yourself with the <a href="http://www.gnome.org/start/2.0/installation.html#upgrading">official</a>; upgrade instructions from
- the GNOME site. Next, make sure your GNOME 1.4.1 ports are
- up-to-date, then remove the following GNOME 1.4.1 packages from
+ the GNOME site. Next, make sure your GNOME 1.4 ports are
+ up-to-date, then remove the following GNOME 1.4 packages from
the system:</p>
<pre>
@@ -189,7 +207,7 @@
eog
</pre>
- <p>After those packages are removed, you can build GNOME 2.0 per the
+ <p>After those packages are removed, you can build GNOME 2.0 as per the
instructions listed above.</p>
</td>
@@ -245,7 +263,7 @@
<td width="10">
<b><a name="q6"> 6.</a></b></td>
<td align="left" valign="top" colspan="3">
- <b>Can I install GNOME 1.4.1 applications under GNOME 2.0 and vice
+ <b>Can I install GNOME 1.4 applications under GNOME 2.0 and vice
versa?</b>
</td>
</tr>
@@ -253,13 +271,13 @@
<tr>
<td width="10"> <br> </td>
<td align="left" valign="top" colspan="3">
- <p>Sure! Right now, the FreeBSD GNOME team is in the process or
- migrating all GNOME 1.4.1 ports to a new build infrastructure.
+ <p>Sure! Right now, the FreeBSD GNOME team is in the process of
+ migrating all GNOME 1.4 ports to a new build infrastructure.
This new infrastructure, called <b>GNOMENG</b>, will allow
- GNOME 2 users to install GNOME 1.4.1 ports without overwriting
+ GNOME 2 users to install GNOME 1.4 ports without overwriting
their GNOME 2 desktop.</p>
- <p>Before building a GNOME 1.4.1 port under GNOME 2, take a
+ <p>Before building a GNOME 1.4 port under GNOME 2, take a
look at the port's Makefile, and check that it contains:</p>
<pre>
@@ -276,7 +294,7 @@
<p>In that case, send email to
<a href="mailto:&email;@FreeBSD.org">&email;@FreeBSD.org</a>
- mention the name of the port, and we will convert it to the
+ mentioning the name of the port, and we will convert it to the
new layout. Alternatively, you are free to convert the port
yourself, and submit a PR.</p>
@@ -290,8 +308,8 @@
supfile contains the <b>ports-all</b> tag.
</p>
- <p>To run GNOME 2.0 applications under GNOME 1.4.1, you will need
- to make sure your GNOME 1.4.1 components are up-to-date, then
+ <p>To run GNOME 2.0 applications under GNOME 1.4, you will need
+ to make sure your GNOME 1.4 components are up-to-date, then
install the <tt>gnome2-devel</tt> port. To install this port
do the following:</p>
@@ -422,6 +440,19 @@
want to edit any menu other than Favorites, you must be
root. This feature requires GNOME 2.0.2 or later.</p>
+ <p>Nautilus can be installed as part of the <tt>gnome2-fifth-toe</tt>
+ meta-port, as a package:</p>
+
+ <tt># pkg_add -r nautilus2</tt>
+
+ <p>Or, to install Nautilus from ports:
+
+ <pre>
+# cd /usr/ports/x11-fm/nautilus2
+# make clean
+# make install clean
+ </pre>
+
<p>To edit the menus, launch Nautilus, and enter the URL
<b>applications:///</b>. From there you should be able to edit
your entire application menu.</p>
@@ -451,8 +482,8 @@
<ol>
<li> If you have any theme engine references, you will have
- to make sure there is a corresponding GTK+ 2 theme engine,
- otherwise remove the engine entries.</li>
+ to make sure there is a corresponding GTK+ 2 theme engine.
+ Otherwise, remove the engine entries.</li>
<li> The default font specification should be outside of
any <tt>style</tt> blocks and should be specified with
the <tt>gtk-font-name</tt> keyword. For example:
--- gnome-www-diff.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-www" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210132344.g9DNiu8o004740>