mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-25 02:36:07 +00:00
Fix bug 4619. fdl of nautilus collides with help from gnome-core. This is
2000-11-09 Mathieu Lacage <mathieu@eazel.com> Fix bug 4619. fdl of nautilus collides with help from gnome-core. This is a workaround till we have a new shipped gnome-core. * nautilus.spec.in: remove fdl directory * user-guide/C/Makefile.am: remove fdl installation * user-guide/C/fdl.sgml: remove * user-guide/C/sgml/fdl.sgml: add * user-guide/C/sgml/nautilus.sgml: change to use the new fdl file.
This commit is contained in:
Mathieu Lacage
Mathieu Lacage
parent
c6e38c19ba
commit
3bd900bb5e
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2000-11-09 Mathieu Lacage <mathieu@eazel.com>
|
||||
|
||||
Fix bug 4619. fdl of nautilus collides with help from gnome-core.
|
||||
This is a workaround till we have a new shipped gnome-core.
|
||||
* nautilus.spec.in: remove fdl directory
|
||||
* user-guide/C/Makefile.am: remove fdl installation
|
||||
* user-guide/C/fdl.sgml: remove
|
||||
* user-guide/C/sgml/fdl.sgml: add
|
||||
* user-guide/C/sgml/nautilus.sgml: change to use the new fdl file.
|
||||
|
||||
|
||||
2000-11-09 Darin Adler <darin@eazel.com>
|
||||
|
||||
buddy: John Sullivan <sullivan@eazel.com>
|
||||
|
|
|
|||
|
|
@ -237,7 +237,6 @@ fi
|
|||
%{prefix}/share/oaf/nautilus-tree-view.oafinfo
|
||||
%{prefix}/share/oaf/nautilus.oafinfo
|
||||
%{prefix}/share/gnome/help/nautilus/C/*
|
||||
%{prefix}/share/gnome/help/fdl/C/*
|
||||
|
||||
%files devel
|
||||
|
||||
|
|
|
|||
|
|
@ -21,15 +21,12 @@ install-data-local:
|
|||
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR)$$basefile; \
|
||||
done; \
|
||||
fi
|
||||
$(mkinstalldirs) $(DESTDIR)$(SGML_DIR)/fdl/$(LANG)/
|
||||
$(INSTALL_DATA) $(srcdir)/fdl.sgml $(DESTDIR)$(SGML_DIR)/fdl/$(LANG)/fdl.sgml
|
||||
|
||||
dist-hook:
|
||||
mkdir $(distdir)/sgml
|
||||
mkdir $(distdir)/html
|
||||
mkdir $(distdir)/img
|
||||
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
|
||||
-cp $(srcdir)/fdl.sgml $(distdir)
|
||||
-cp $(srcdir)/img/*.png $(distdir)/img
|
||||
-cp $(srcdir)/html/*.html $(distdir)/html
|
||||
|
||||
|
|
|
|||
|
|
@ -1,53 +1,7 @@
|
|||
<!DOCTYPE Article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[
|
||||
]>
|
||||
|
||||
<!-- Web Based FDL
|
||||
<appendix id="fdl">
|
||||
<docinfo>
|
||||
<chapter id="fdl">
|
||||
|
||||
<releaseinfo>
|
||||
Version 1.1, March 2000
|
||||
</releaseinfo>
|
||||
|
||||
<copyright>
|
||||
<year>2000</year><holder>Free Software Foundation, Inc.</holder>
|
||||
</copyright>
|
||||
|
||||
<legalnotice id="fdl-legalnotice">
|
||||
<para>
|
||||
<address>Free Software Foundation, Inc. <street>59 Temple Place, Suite 330</street>,
|
||||
<city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode> <country>USA</country></address>
|
||||
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is
|
||||
not allowed.
|
||||
</para>
|
||||
</legalnotice>
|
||||
|
||||
</docinfo>-->
|
||||
<article id="index">
|
||||
<title>GNU Free Documentation License</title>
|
||||
<artheader>
|
||||
<releaseinfo>
|
||||
Version 1.1, March 2000
|
||||
</releaseinfo>
|
||||
|
||||
<copyright>
|
||||
<year>2000</year><holder>Free Software Foundation, Inc.</holder>
|
||||
</copyright>
|
||||
|
||||
<legalnotice id="fdl-legalnotice">
|
||||
<para>
|
||||
<address>Free Software Foundation, Inc.
|
||||
<street>59 Temple Place, Suite 330</street>,
|
||||
<city>Boston</city>,
|
||||
<state>MA</state> <postcode>02111-1307</postcode>
|
||||
<country>USA</country></address>. Everyone is permitted to
|
||||
copy and distribute verbatim copies of this license
|
||||
document, but changing it is not allowed.
|
||||
</para>
|
||||
</legalnotice>
|
||||
|
||||
</artheader>
|
||||
|
||||
<title>GNU Free Documentation License</title>
|
||||
|
||||
<sect1 id="fdl-preamble">
|
||||
<title>0. PREAMBLE</title>
|
||||
|
|
@ -684,10 +638,7 @@
|
|||
License</ulink>, to permit their use in free software.
|
||||
</para>
|
||||
</sect1>
|
||||
</article>
|
||||
<!--
|
||||
</appendix>
|
||||
-->
|
||||
</chapter>
|
||||
|
||||
|
||||
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
<!ENTITY CHAPTER-1 SYSTEM "chapter-1.sgml">
|
||||
<!ENTITY CHAPTER-2 SYSTEM "chapter-2.sgml">
|
||||
<!ENTITY CHAPTER-3 SYSTEM "chapter-3.sgml">
|
||||
<!ENTITY FDL SYSTEM "fdl.sgml">
|
||||
|
||||
]>
|
||||
|
||||
|
|
@ -30,7 +31,7 @@
|
|||
<para>
|
||||
Permission is granted to copy, distribute and/or modify this
|
||||
document under the terms of the <ulink type="help"
|
||||
url="gnome-help:fdl"><citetitle>GNU Free Documentation
|
||||
url="gnome-help:nautilus.sgml?fdl-preamble"><citetitle>GNU Free Documentation
|
||||
License</citetitle></ulink>, Version 1.1 or any later version published
|
||||
by the Free Software Foundation with no Invariant Sections, no
|
||||
Front-Cover Texts, and no Back-Cover Texts. You may obtain a copy of the
|
||||
|
|
@ -62,4 +63,6 @@
|
|||
|
||||
&CHAPTER-3;
|
||||
|
||||
&FDL;
|
||||
|
||||
</book>
|
||||
|
|
|
|||
Loading…
Reference in a new issue