<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>COPYING-DOCS</filename>
    </added>
    <added>
      <filename>help/htmldocs.make</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/Makefile.am</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/colors_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/emblems_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/ff_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/find_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/locbar_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/menubar_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/music_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/sidebar_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/softcat.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/storage.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/figures/themes_small.png</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/index.html</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/C/nautilus-quick-reference-C.omf</filename>
    </added>
    <added>
      <filename>help/nautilus-quick-reference/Makefile.am</filename>
    </added>
    <added>
      <filename>user-guide/NOTICE</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,57 @@
+2001-02-22  Dan Mueth  &lt;dan@eazel.com&gt;
+
+        reviewed by: Pavel Cisler &lt;pavel@eazel.com&gt;
+
+	Generally, I removed old cruft, added COPYING-DOCS, added
+	a new HTML doc (nautilus-quick-reference), and updated
+	the build stuff and spec file as necessary.
+
+        * COPYING-DOCS: This is the GNU FDL, similar to COPYING.  It
+          should be installed with all modules with FDL'd docs.
+        * Makefile.am: Added COPYING-DOCS to EXTRA_DIST
+        * configure.in: Added nautilus-quick-reference 
+        * help/Makefile.am: Added nautilus-quick-reference
+        * help/htmldocs.make: Created this file.  This is the makefile
+	  to suck in for html docs.  Be sure to use index.html as
+	  your primary HTML file and put PNG images into figures/
+
+	This stuff is Vera's new Nautilus Quick Reference doc in HTML
+	format. &lt;vera@eazel.com&gt;  I purposefully left out two screenshots
+	with the Eazel logo in them.
+        * help/nautilus-quick-reference/C/Makefile.am: added
+        * help/nautilus-quick-reference/C/figures/colors_small.png: added
+        * help/nautilus-quick-reference/C/figures/emblems_small.png: added
+        * help/nautilus-quick-reference/C/figures/ff_small.png:
+        * help/nautilus-quick-reference/C/figures/find_small.png:
+        * help/nautilus-quick-reference/C/figures/locbar_small.png:
+        * help/nautilus-quick-reference/C/figures/menubar_small.png:
+        * help/nautilus-quick-reference/C/figures/music_small.png:
+        * help/nautilus-quick-reference/C/figures/sidebar_small.png:
+        * help/nautilus-quick-reference/C/figures/softcat.png:
+        * help/nautilus-quick-reference/C/figures/storage.png:
+        * help/nautilus-quick-reference/C/figures/themes_small.png:
+        * help/nautilus-quick-reference/C/index.html:
+        * help/nautilus-quick-reference/C/nautilus-quick-reference-C.omf:
+        * help/nautilus-quick-reference/Makefile.am:
+        * help/nautilus-user-manual/C/nautilus-user-manual-C.omf: Updated
+        * nautilus.spec.in: Added OMF files, Quick Ref, and COPYING-DOCS
+
+	Removed this old stuff:
+        * user-guide/C/Makefile.am: 
+        * user-guide/C/html/license.html:
+        * user-guide/C/img/custicon.png:
+        * user-guide/C/img/full.png: removed
+        * user-guide/C/img/locbar.png: 
+        * user-guide/C/img/player.png:
+        * user-guide/C/img/prefmenu.png:
+        * user-guide/C/img/sidebar.png:
+        * user-guide/C/img/viewmenu.png:
+        * user-guide/C/nautilus-C.omf:
+        * user-guide/C/sgml/nautilus.sgml:
+
+	Added this notice so people don't add stuff in user-guide/
+        * user-guide/NOTICE:
+
 2001-02-22  Gene Z. Ragan  &lt;gzr@eazel.com&gt;
  
  	reviewed by: Pavel Cisler &lt;pavel@eazel.com&gt;
@@ -22,6 +76,7 @@
  	(add_one_path_list):
  	Return a path, not a URI.
  	
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; 1.3873
 2001-02-22  Arlo Rose  &lt;arlo@eazel.com&gt;
 
 	* icons/hand.png:</diff>
      <filename>ChangeLog</filename>
    </modified>
    <modified>
      <diff>@@ -33,6 +33,7 @@ SUBDIRS =			\
 
 EXTRA_DIST=					\
 	COPYING.LIB				\
+	COPYING-DOCS				\
 	RPMs-README				\
 	HACKING					\
 	MAINTAINERS				\</diff>
      <filename>Makefile.am</filename>
    </modified>
    <modified>
      <diff>@@ -885,6 +885,8 @@ user-guide/gnugpl/Makefile
 help/Makefile
 help/nautilus-user-manual/Makefile
 help/nautilus-user-manual/C/Makefile
+help/nautilus-quick-reference/Makefile
+help/nautilus-quick-reference/C/Makefile
 applets/Makefile
 applets/launcher/Makefile
 applets/preferences-applet/Makefile</diff>
      <filename>configure.in</filename>
    </modified>
    <modified>
      <diff>@@ -1 +1 @@
-SUBDIRS = nautilus-user-manual
+SUBDIRS = nautilus-user-manual nautilus-quick-reference</diff>
      <filename>help/Makefile.am</filename>
    </modified>
    <modified>
      <diff>@@ -2,13 +2,13 @@
 &lt;omf&gt;
   &lt;resource&gt;
     &lt;title&gt;
-      The Nautilus User Guide
+      Nautilus User Manual
     &lt;/title&gt;
     &lt;subject&gt;
       &lt;category&gt;GNOME|Core Desktop&lt;/category&gt;
     &lt;/subject&gt;
     &lt;format mime=&quot;text/sgml&quot;/&gt;
-    &lt;identifier url=&quot;nautilus.sgml&quot;/&gt;
+    &lt;identifier url=&quot;nautilus-user-manual.sgml&quot;/&gt;
     &lt;language code=&quot;C&quot;/&gt;
   &lt;/resource&gt;
 &lt;/omf&gt;</diff>
      <filename>help/nautilus-user-manual/C/nautilus-user-manual-C.omf</filename>
    </modified>
    <modified>
      <diff>@@ -156,7 +156,7 @@ fi
 %files
 
 %defattr(0555, bin, bin)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
+%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog NEWS README
 %{prefix}/bin/*.sh
 %{prefix}/bin/eazel-helper
 %{prefix}/bin/gnome-db2html2
@@ -257,8 +257,10 @@ fi
 %{prefix}/share/oaf/Nautilus_shell.oaf
 %{prefix}/share/oaf/Nautilus_Control_throbber.oaf
 %{prefix}/share/gnome/help/nautilus-user-manual/C/*
+%{prefix}/share/gnome/help/nautilus-quick-reference/C/*
 %{prefix}/share/gnome/help/gnufdl/C/*
 %{prefix}/share/gnome/help/gnugpl/C/*
+%{prefix}/share/omf/nautilus/*.omf
 
 %files devel
 </diff>
      <filename>nautilus.spec.in</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>user-guide/C/Makefile.am</filename>
    </removed>
    <removed>
      <filename>user-guide/C/html/license.html</filename>
    </removed>
    <removed>
      <filename>user-guide/C/img/custicon.png</filename>
    </removed>
    <removed>
      <filename>user-guide/C/img/full.png</filename>
    </removed>
    <removed>
      <filename>user-guide/C/img/locbar.png</filename>
    </removed>
    <removed>
      <filename>user-guide/C/img/player.png</filename>
    </removed>
    <removed>
      <filename>user-guide/C/img/prefmenu.png</filename>
    </removed>
    <removed>
      <filename>user-guide/C/img/sidebar.png</filename>
    </removed>
    <removed>
      <filename>user-guide/C/img/viewmenu.png</filename>
    </removed>
    <removed>
      <filename>user-guide/C/nautilus-C.omf</filename>
    </removed>
    <removed>
      <filename>user-guide/C/sgml/nautilus.sgml</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>72fa05a7ca9d50308982192dcc61bb15bbcd85e3</id>
    </parent>
  </parents>
  <author>
    <name>Dan Mueth</name>
    <email>dan@eazel.com</email>
  </author>
  <url>http://github.com/hb/nautilus/commit/f933accf04863e3e0f5828e9ba7655861057c2bc</url>
  <id>f933accf04863e3e0f5828e9ba7655861057c2bc</id>
  <committed-date>2001-02-22T02:26:22-08:00</committed-date>
  <authored-date>2001-02-22T02:26:22-08:00</authored-date>
  <message>reviewed by: Pavel Cisler &lt;pavel@eazel.com&gt;

2001-02-22  Dan Mueth  &lt;dan@eazel.com&gt;

        reviewed by: Pavel Cisler &lt;pavel@eazel.com&gt;

        Generally, I removed old cruft, added COPYING-DOCS, added
        a new HTML doc (nautilus-quick-reference), and updated
        the build stuff and spec file as necessary.

        * COPYING-DOCS: This is the GNU FDL, similar to COPYING.  It
          should be installed with all modules with FDL'd docs.
        * Makefile.am: Added COPYING-DOCS to EXTRA_DIST
        * configure.in: Added nautilus-quick-reference
        * help/Makefile.am: Added nautilus-quick-reference
        * help/htmldocs.make: Created this file.  This is the makefile
          to suck in for html docs.  Be sure to use index.html as
          your primary HTML file and put PNG images into figures/

        This stuff is Vera's new Nautilus Quick Reference doc in HTML
        format. &lt;vera@eazel.com&gt;  I purposefully left out two screenshots
        with the Eazel logo in them.
        * help/nautilus-quick-reference/C/Makefile.am: added
        * help/nautilus-quick-reference/C/figures/colors_small.png: added
        * help/nautilus-quick-reference/C/figures/emblems_small.png: added
        * help/nautilus-quick-reference/C/figures/ff_small.png:
        * help/nautilus-quick-reference/C/figures/find_small.png:
        * help/nautilus-quick-reference/C/figures/locbar_small.png:
        * help/nautilus-quick-reference/C/figures/menubar_small.png:
        * help/nautilus-quick-reference/C/figures/music_small.png:
        * help/nautilus-quick-reference/C/figures/sidebar_small.png:
        * help/nautilus-quick-reference/C/figures/softcat.png:
        * help/nautilus-quick-reference/C/figures/storage.png:
        * help/nautilus-quick-reference/C/figures/themes_small.png:
        * help/nautilus-quick-reference/C/index.html:
        * help/nautilus-quick-reference/C/nautilus-quick-reference-C.omf:
        * help/nautilus-quick-reference/Makefile.am:
        * help/nautilus-user-manual/C/nautilus-user-manual-C.omf: Updated
        * nautilus.spec.in: Added OMF files, Quick Ref, and COPYING-DOCS

        Removed this old stuff:
        * user-guide/C/Makefile.am:
        * user-guide/C/html/license.html:
        * user-guide/C/img/custicon.png:
        * user-guide/C/img/full.png: removed
        * user-guide/C/img/locbar.png:
        * user-guide/C/img/player.png:
        * user-guide/C/img/prefmenu.png:
        * user-guide/C/img/sidebar.png:
        * user-guide/C/img/viewmenu.png:
        * user-guide/C/nautilus-C.omf:
        * user-guide/C/sgml/nautilus.sgml:

        Added this notice so people don't add stuff in user-guide/
        * user-guide/NOTICE:</message>
  <tree>652c0130858fa5b00c97f22fda0efbc345a4b257</tree>
  <committer>
    <name>Dan Mueth</name>
    <email>dmueth@src.gnome.org</email>
  </committer>
</commit>
