bagder: curl-www/legal Makefile, 1.7, 1.8 _index.html, 1.6, 1.7 _licmix.html, 1.1, 1.2 _menu.html, NONE, 1.1 _thename.html, 1.14, 1.15

[email protected]
Newsgroups gmane.comp.web.curl.www.cvs
Message-ID <[email protected]>
Update of /cvsroot/curl/curl-www/legal
In directory labb:/tmp/cvs-serv8744

Modified Files:
	Makefile _index.html _licmix.html _thename.html 
Added Files:
	_menu.html 
Log Message:
use a submenu in the legal section


--- NEW FILE: _menu.html ---

#define BACKGROUND "#ffffff"
#define TEXTCOLOR "#000000"

#ifndef NOBODY

<BODY bgcolor=BACKGROUND text=TEXTCOLOR LINK="#0000ff" VLINK="#808080" ALINK="red">
#endif

#undef LINK
#define LINK(l,t) <div class="libselect">t</div>

#undef VLINK
#define VLINK(l,t) <div><a href="l" class="libitem">t</a></div>

#include "ad.t"
#include "mirrorlinks.t"

<table cellspacing="0" cellpadding="5"><tr><td valign="top" align="left">

<div class="libmenu">

<div><a href="/" class="menuitem"><img border="0" src="/pix/left.png" alt="<">Front Page</a></div>

<hr>

#ifdef LEGAL_MAIN
LINK("", Legal Index )
#else
VLINK("/legal/", Legal Index )
#endif

#ifdef LEGAL_COPYRIGHT
LINK("", Copyright )
#else
VLINK("/docs/copyright.html", Copyright &raquo;)
#endif

#ifdef LEGAL_LICMIX
LINK("", Licence Mixing )
#else
VLINK("/legal/licmix.html", License Mixing )
#endif

#ifdef LEGAL_THENAME
LINK("", The Name)
#else
VLINK("/legal/thename.html", The Name)
#endif


</div>

<p>
#include "sflogo.t"

</td><td valign="top" align="left">

Index: Makefile
===================================================================
RCS file: /cvsroot/curl/curl-www/legal/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	12 Aug 2004 11:54:40 -0000	1.7
+++ Makefile	9 May 2005 13:49:42 -0000	1.8
@@ -3,11 +3,11 @@
 SRCROOT=$(ROOT)/cvssource
 DOCROOT=$(SRCROOT)/docs
 
-MAINPARTS= $(ROOT)/_doctype.html $(ROOT)/_menu.html $(ROOT)/_footer.html \
+MAINPARTS= $(ROOT)/_doctype.html _menu.html $(ROOT)/_footer.html \
 $(ROOT)/setup.t $(ROOT)/pic.t $(ROOT)/where.t $(ROOT)/mirrorlinks.t	 \
 $(ROOT)/sflogo.t $(ROOT)/css.t
 NOW=$(shell gnudate +'-D__TODAY__=%B %d, %Y')
-ACTION=@echo preprocessing $@; rm -f $@; cpp -I$(ROOT) -Idocs -WWW -Uunix -H -C -V -LL "$(NOW)" _$@ $@; chmod a-w+r $@
+ACTION=@echo preprocessing $@; rm -f $@; cpp -I$(ROOT) -Idocs -WWW -Uunix -H -C -P -V -LL "$(NOW)" _$@ $@; chmod a-w+r $@
 
 TXT2PLAIN = txt2plain.pl
 

Index: _index.html
===================================================================
RCS file: /cvsroot/curl/curl-www/legal/_index.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- _index.html	12 Aug 2004 11:54:40 -0000	1.6
+++ _index.html	9 May 2005 13:49:42 -0000	1.7
@@ -4,10 +4,13 @@
 #include "css.t"
 </HEAD>
 
+#define CURL_URL /legal
+#define LEGAL_MAIN
+
 #include "_menu.html"
 #include "setup.t"
 
-WHERE2(Copyright, "/copyright.html", Legal Index)
+WHERE2(Legal, "/legal/", Index)
 
 TITLE(Legal stuff and Licensing Issues)
 <div class="relatedbox">
@@ -20,6 +23,11 @@
  We get repeated questions about the legal status of <a
  href="thename.html">the name curl</a>. Who owns it, can we use it, will
  someone sue us?
+<p>
+ This section also contains the <a href="licmix.html">Licence Mixing</a>
+ document since curl/libcurl can be built and used with quite a few
+ dependences and this document tries to sort out some of the license issues
+ involved.
 
 #include "_footer.html"
 </BODY>

Index: _licmix.html
===================================================================
RCS file: /cvsroot/curl/curl-www/legal/_licmix.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- _licmix.html	12 Aug 2004 11:54:40 -0000	1.1
+++ _licmix.html	9 May 2005 13:49:42 -0000	1.2
@@ -4,12 +4,21 @@
 #include "css.t"
 </HEAD>
 
+#define CURL_URL legal/licmix.html
+#define LEGAL_LICMIX
+
 #include "_menu.html"
 #include "setup.t"
 
 WHERE2(Legal, "/legal/", License Mixing)
 
 TITLE(License Mixing)
+<div class="relatedbox">
+<b>Related:</b>
+<br><a href="/docs/copyright.html">curl license</a>
+<br><a href="thename.html">the curl name</a>
+<br><a href="/docs/libs.html">dependencies</a>
+</div>
 <p>
  Here's a casual attempt at describing a few things you need to consider when
 you use libcurl with one or more other libraries and your own application,

Index: _thename.html
===================================================================
RCS file: /cvsroot/curl/curl-www/legal/_thename.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- _thename.html	15 Mar 2004 15:55:44 -0000	1.14
+++ _thename.html	9 May 2005 13:49:42 -0000	1.15
@@ -1,8 +1,11 @@
 #include "_doctype.html"
-<HTML>
-<HEAD> <TITLE>cURL - naming issues</TITLE>
+<html>
+<head> <title>cURL - naming issues</title>
 #include "css.t"
-</HEAD>
+</headk>
+
+#define CURL_URL legal/thename.html
+#define LEGAL_THENAME
 
 #include "_menu.html"
 #include "setup.t"

_______________________________________________
http://cool.haxx.se/mailman/listinfo/curl-www-commits
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.