GNOME.org
 

[nanny] Update nanny doc (gnome-style)

commit 133b283b38db78ffbecda07806889bee423b086b
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Wed Feb 3 16:26:16 2010 +0100

    Update nanny doc (gnome-style)

 Makefile.am                                        |    2 +-
 configure.ac                                       |    3 +
 help/{ => C/figures}/nanny-add-web-to-filter.png   |  Bin 11498 -> 11498 bytes
 help/{ => C/figures}/nanny-browser.png             |  Bin 42047 -> 42047 bytes
 help/{ => C/figures}/nanny-session.png             |  Bin 38165 -> 38165 bytes
 .../figures}/nanny-web-content-filtering.png       |  Bin 13535 -> 13535 bytes
 help/C/legal.xml                                   |   76 ++++++++++++++++++++
 help/{ => C}/nanny.xml                             |   44 +++++++++++-
 help/Makefile.am                                   |   14 ++++-
 9 files changed, 134 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 030e501..e2799b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,4 +37,4 @@ dist-hook:
 		echo Failed to generate ChangeLog >&2 ); \
 	else \
 		echo A git clone is required to generate a ChangeLog >&2; \
-	fi
\ No newline at end of file
+	fi
diff --git a/configure.ac b/configure.ac
index 0d5b7ff..9986134 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AC_SUBST(VERSION)
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_MAINTAINER_MODE
 
@@ -21,6 +22,8 @@ AC_ARG_WITH(init-scripts,
   [  --with-init-scripts=[redhat/debian/suse/None]  Install init.d scripts [default=None]],,
   with_init_scripts=None)
 
+GNOME_DOC_INIT
+
 dnl check for python
 dnl ----------------------------
 AM_PATH_PYTHON
diff --git a/help/nanny-add-web-to-filter.png b/help/C/figures/nanny-add-web-to-filter.png
similarity index 100%
rename from help/nanny-add-web-to-filter.png
rename to help/C/figures/nanny-add-web-to-filter.png
diff --git a/help/nanny-browser.png b/help/C/figures/nanny-browser.png
similarity index 100%
rename from help/nanny-browser.png
rename to help/C/figures/nanny-browser.png
diff --git a/help/nanny-session.png b/help/C/figures/nanny-session.png
similarity index 100%
rename from help/nanny-session.png
rename to help/C/figures/nanny-session.png
diff --git a/help/nanny-web-content-filtering.png b/help/C/figures/nanny-web-content-filtering.png
similarity index 100%
rename from help/nanny-web-content-filtering.png
rename to help/C/figures/nanny-web-content-filtering.png
diff --git a/help/C/legal.xml b/help/C/legal.xml
new file mode 100644
index 0000000..ac97e1d
--- /dev/null
+++ b/help/C/legal.xml
@@ -0,0 +1,76 @@
+  <legalnotice id="legalnotice">
+	<para>
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), 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 can find
+	  a copy of the GFDL at this <ulink type="help"
+	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+	  distributed with this manual.
+         </para>
+         <para> This manual is part of a collection of GNOME manuals
+          distributed under the GFDL.  If you want to distribute this
+          manual separately from the collection, you can do so by
+          adding a copy of the license to the manual, as described in
+          section 6 of the license.
+	</para>
+
+	<para>
+	  Many of the names used by companies to distinguish their
+	  products and services are claimed as trademarks. Where those
+	  names appear in any GNOME documentation, and the members of
+	  the GNOME Documentation Project are made aware of those
+	  trademarks, then the names are in capital letters or initial
+	  capital letters.
+	</para>
+
+	<para>
+	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
+	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
+	  WITH THE FURTHER UNDERSTANDING THAT:
+
+	  <orderedlist>
+		<listitem>
+		  <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
+                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
+                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
+                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
+                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
+                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
+                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
+                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
+                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
+                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
+                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
+                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
+                    EXCEPT UNDER THIS DISCLAIMER; AND
+		  </para>
+		</listitem>
+		<listitem>
+		  <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
+                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
+                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
+                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
+                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
+                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
+                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
+                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
+                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
+                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+                       THE POSSIBILITY OF SUCH DAMAGES.
+		  </para>
+		</listitem>
+	  </orderedlist>
+	</para>
+  </legalnotice>
+
diff --git a/help/nanny.xml b/help/C/nanny.xml
similarity index 89%
rename from help/nanny.xml
rename to help/C/nanny.xml
index 2c7a82c..98e4192 100644
--- a/help/nanny.xml
+++ b/help/C/nanny.xml
@@ -28,6 +28,10 @@
       <year>2009</year> 
       <holder>openshine.com</holder> 
     </copyright>
+    <abstract role="description">
+       <para><application>&app;</application> enables you to control what system users do.
+       </para>
+    </abstract>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -39,7 +43,41 @@
       <publishername>openshine.com </publishername> 
     </publisher> 
 
-   &legal;
+<!--   &legal; -->
+
+   <authorgroup>
+       <author role="maintainer">
+         <firstname>Luis</firstname>
+         <surname>de Bethencourt</surname>
+         <affiliation>
+           <orgname>GNOME Documentation Project</orgname>
+         </affiliation>
+         <email>luisbg openshine com</email>
+       </author>
+       <author>
+         <firstname>Roberto</firstname>
+         <surname>Majadas</surname>
+         <affiliation>
+           <orgname>GNOME Documentation project</orgname>
+         </affiliation>
+         <contrib>Update documentation</contrib>
+         <email>roberto majadas openshine com</email>
+       </author>
+   </authorgroup>
+
+   <revhistory>
+      <revision>
+        <revnumber>&app; Manual V1.0</revnumber>
+        <date>January 2010</date>
+        <revdescription>
+          <para role="author">Luis de Bethencourt
+            <email>luisbg openshine com</email>
+          </para>
+          <para role="publisher">GNOME Documentation Project</para>
+        </revdescription>
+      </revision>
+   </revhistory>
+
     <releaseinfo>This manual describes version &appversion; of GNOME Nanny.
     </releaseinfo> 
     <legalnotice> 
@@ -206,7 +244,7 @@
     <!-- ================ Usage Subsection ================================ -->
     <sect2 id="nanny-web-access"> 
       <title>Control web access.</title> 
-      <figure id="nanny-browser">
+      <figure id="nanny-browser-b">
         <title>Web content filtering</title>
           <screenshot>
             <mediaobject>
@@ -222,7 +260,7 @@
             </mediaobject>
           </screenshot>
       </figure>
-      <figure id="nanny-browser">
+      <figure id="nanny-browser-c">
         <title>Add web to filter</title>
           <screenshot>
             <mediaobject>
diff --git a/help/Makefile.am b/help/Makefile.am
index 5119a93..88804c9 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,5 +1,17 @@
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+
+DOC_MODULE = nanny
+DOC_ENTITIES = legal.xml nanny.xml
+DOC_INCLUDES = 
+DOC_FIGURES = figures/nanny-add-web-to-filter.png       \
+              figures/nanny-browser.png	                \
+              figures/nanny-session.png                 \
+              figures/nanny-web-content-filtering.png
+DOC_LINGUAS = 
+
 helpdir = $(datadir)/gnome/help/nanny/C/
-help_DATA = nanny.xml nanny-add-web-to-filter.png  nanny-browser.png  nanny-session.png  nanny-web-content-filtering.png 
+help_DATA = C/nanny.xml C/figures/nanny-add-web-to-filter.png  C/figures/nanny-browser.png  C/figures/nanny-session.png  C/figures/nanny-web-content-filtering.png 
 
 EXTRA_DIST=$(help_DATA)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]