[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses fdl-howto-opt.ca.html fdl-howto-op...
|
From: |
GNUN |
|
Subject: |
www/licenses fdl-howto-opt.ca.html fdl-howto-op... |
|
Date: |
Mon, 25 Jul 2016 16:28:12 +0000 (UTC) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/07/25 16:28:12
Modified files:
licenses : fdl-howto-opt.ca.html fdl-howto-opt.pl.html
licenses/po : fdl-howto-opt.ca-diff.html
Added files:
licenses/po : fdl-howto-opt.pl-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/fdl-howto-opt.ca.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/fdl-howto-opt.pl.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-howto-opt.ca-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-howto-opt.pl-diff.html?cvsroot=www&rev=1.1
Patches:
Index: fdl-howto-opt.ca.html
===================================================================
RCS file: /web/www/www/licenses/fdl-howto-opt.ca.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- fdl-howto-opt.ca.html 11 Jul 2016 08:08:20 -0000 1.27
+++ fdl-howto-opt.ca.html 25 Jul 2016 16:28:12 -0000 1.28
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/fdl-howto-opt.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/fdl-howto-opt.ca.po">
+ https://www.gnu.org/licenses/po/fdl-howto-opt.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/fdl-howto-opt.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/fdl-howto-opt.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2016-05-26" --><!--#set
var="ENGLISH_PAGE" value="/licenses/fdl-howto-opt.en.html" -->
<!--#include virtual="/server/header.ca.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/licenses/po/fdl-howto-opt.translist" -->
<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
<h2>Com utilitzar les funcionalitats opcionals de la GFDL</h2>
<p>per <a href="http://www.stallman.org/";>Richard Stallman</a></p>
@@ -222,7 +228,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2016/07/11 08:08:20 $
+$Date: 2016/07/25 16:28:12 $
<!-- timestamp end -->
</p>
Index: fdl-howto-opt.pl.html
===================================================================
RCS file: /web/www/www/licenses/fdl-howto-opt.pl.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- fdl-howto-opt.pl.html 6 Feb 2016 04:00:24 -0000 1.20
+++ fdl-howto-opt.pl.html 25 Jul 2016 16:28:12 -0000 1.21
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/fdl-howto-opt.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/fdl-howto-opt.pl.po">
+ https://www.gnu.org/licenses/po/fdl-howto-opt.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/fdl-howto-opt.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/fdl-howto-opt.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2016-05-26" --><!--#set
var="ENGLISH_PAGE" value="/licenses/fdl-howto-opt.en.html" -->
<!--#include virtual="/server/header.pl.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/licenses/po/fdl-howto-opt.translist" -->
<!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
<h2>Jak stosowaÄ opcjonalne elementy GFDL</h2>
<p><a href="http://www.stallman.org/";>Richard Stallman</a></p>
@@ -238,7 +244,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2016/02/06 04:00:24 $
+$Date: 2016/07/25 16:28:12 $
<!-- timestamp end -->
</p>
Index: po/fdl-howto-opt.ca-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/fdl-howto-opt.ca-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/fdl-howto-opt.ca-diff.html 4 Jun 2014 00:29:29 -0000 1.1
+++ po/fdl-howto-opt.ca-diff.html 25 Jul 2016 16:28:12 -0000 1.2
@@ -11,7 +11,7 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.76</strong></del></span> <span
class="inserted"><ins><em>1.77</em></ins></span> -->
+<!-- Parent-Version: 1.77 -->
<title>How to Use the Optional Features of the GFDL
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/licenses/po/fdl-howto-opt.translist" -->
@@ -37,7 +37,7 @@
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
Version 1.3 or any later version published by the Free Software
- Foundation; with no Invariant Sections, no Front-Cover Texts and
+ Foundation; with no Invariant Sections, no Front-Cover <span
class="removed"><del><strong>Texts</strong></del></span> <span
class="inserted"><ins><em>Texts,</em></ins></span> and
no Back-Cover Texts. A copy of the license is included in the
section entitled "GNU Free Documentation License".
</pre>
@@ -171,7 +171,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -186,19 +186,18 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2000, <span
class="removed"><del><strong>2008</strong></del></span> <span
class="inserted"><ins><em>2008, 2014</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © 2000, 2008, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2016</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<span
class="removed"><del><strong><p></p><p</strong></del></span>
-
-<span class="inserted"><ins><em><p</em></ins></span>
class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/06/04 00:29:29 $
+$Date: 2016/07/25 16:28:12 $
<!-- timestamp end -->
</p>
</div>
Index: po/fdl-howto-opt.pl-diff.html
===================================================================
RCS file: po/fdl-howto-opt.pl-diff.html
diff -N po/fdl-howto-opt.pl-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/fdl-howto-opt.pl-diff.html 25 Jul 2016 16:28:12 -0000 1.1
@@ -0,0 +1,207 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/licenses/fdl-howto-opt.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>How to Use the Optional Features of the GFDL
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/licenses/po/fdl-howto-opt.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>How to Use the Optional Features of the GFDL</h2>
+
+<p>by <a href="http://www.stallman.org/">Richard
Stallman</a></p>
+
+<p>
+The <a href="/licenses/fdl.html">GNU FDL</a> (GNU Free
Documentation License)
+includes two optional features,
+<a href="#SEC1"><strong>invariant sections</strong></a>
+and
+<a href="#SEC2"><strong>cover texts</strong></a>,
+which you can use if you wish. The manual's license
+notice should say whether you are using these features.</p>
+
+<p>
+The simplest case is that you do not use these features. Then
+the license notice should say so, like this:</p>
+
+<pre>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License,
+ Version 1.3 or any later version published by the Free Software
+ Foundation; with no Invariant Sections, no Front-Cover <span
class="removed"><del><strong>Texts</strong></del></span> <span
class="inserted"><ins><em>Texts,</em></ins></span> and
+ no Back-Cover Texts. A copy of the license is included in the
+ section entitled "GNU Free Documentation License".
+</pre>
+<p>
+But if you want to use these features, here is an explanation of
+what they are intended for and how to use them.</p>
+
+<h3 id="SEC1">Invariant sections</h3>
+<p>
+The idea of invariant sections is that they give you a way to express
+nontechnical personal opinions about the topic.</p>
+<p>
+The classical example of an invariant nontechnical section in a free
+manual is the <a href="/gnu/manifesto.html">GNU Manifesto</a>,
which
+is included in the GNU Emacs Manual. The GNU Manifesto says nothing
+about how to edit with Emacs, but it explains the reason why I wrote
+GNU Emacs—to be an essential part of the GNU operating system,
+which would give computer users freedom to cooperate in a community.
+Since the GNU Manifesto presents the principles of the GNU Project,
+rather than features of GNU Emacs, we decided that others should not
+remove or change it when redistributing the Emacs Manual, and we wrote
+that requirement into the license. In effect, we made the GNU
+Manifesto into an invariant section, though without using that term.
+To do this today using the GNU FDL, we would write the license notice
+like this:</p>
+
+<pre>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License,
+ Version 1.3 or any later version published by the Free Software
+ Foundation; with the Invariant Sections being just "GNU
+ Manifesto", with no Front-Cover Texts, and with no Back-Cover
+ Texts. A copy of the license is included in the section
+ entitled "GNU Free Documentation License".
+</pre>
+<p>
+This says that the section “GNU Manifesto” is the only
+invariant section.</p>
+<p>
+The old Emacs Manual license did not allow others who modify and
+redistribute the manual to add new invariant sections. But while
+formulating a more general version of the concept for the GNU FDL, I
+felt that it would be more morally consistent if those who modify a
+manual can write invariant sections, just as the first authors can.
+The FDL permits this.</p>
+<p>
+But that feature requires a safeguard to prevent it from being abused
+to endanger the free status of the manual. Person B who modifies a
+manual that was written by person A should not be able to make any of
+person A's documentation invariant, for that would deny person C the
+permission to modify it further. Likewise, if person B adds
+documentation for additional subtopics, this added documentation must
+not be invariant; the documentation itself must be modifiable by
+others. The FDL's conditions on adding invariant sections provide
+this safeguard.</p>
+<p>
+There is no need for a manual to have any invariant sections. The
+simplest case is to have none at all. You do not have to list the GNU
+FDL itself as an invariant section, because the FDL explicitly says
+that the FDL itself may not be changed. The FDL also distinguishes
+certain section titles, “History” and
+“Dedications” and others. You should not list these
+sections as invariant, because the FDL already gives the rules for
+these sections.</p>
+
+<h3 id="SEC2">Cover texts</h3>
+<p>
+A cover text is a short piece of text that you insist must be printed
+on the cover of the manual when the manual is published, even if
+someone else is publishing it. You can specify a “front-cover
+text” which has to be printed on the front cover, and you can
+specify a “back-cover text” which has to be printed on the
+back cover. You can specify one of each.</p>
+<p>
+Cover texts are a new feature, so I cannot cite past examples of their
+use, but the intended purpose is simple. They are meant to give the
+original publisher of an edition a way to ask or encourage people to
+buy the copies they publish rather than those of some other reprinter.
+For example, we could imagine specifying this as a back-cover text:</p>
+
+<pre>
+ Free Manuals Inc. paid Alyssa P. Hacker to write this manual
+ and asks for your support through buying the Free Manuals edition.
+</pre>
+<p>
+This might help Free Manuals Inc. succeed in the business of
+publishing free manuals—at least, that is the plan. To specify
+this back-cover text, Free Manuals Inc. would write the license notice
+like this:</p>
+
+<pre>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License,
+ Version 1.3 or any later version published by the Free Software
+ Foundation; with no Invariant Sections, no Front-Cover Texts, and
+ one Back-Cover Text: "Free Manuals Inc. paid Alyssa P. Hacker to
+ write this manual and asks for your support through buying the
+ Free Manuals edition." A copy of the license is included in the
+ section entitled "GNU Free Documentation License".
+</pre>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 2000, 2008, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2016</em></ins></span> Free Software
Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/07/25 16:28:12 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses fdl-howto-opt.ca.html fdl-howto-op...,
GNUN <=