doc-el commit 992:ecafc55b385c - Merge from ncvs

freebsd-doc-el at lists.hellug.gr freebsd-doc-el at lists.hellug.gr
Sun Nov 2 18:33:26 EET 2008


changeset: 992:ecafc55b385c
user:      keramida
date:      2008-11-02 18:33 +0200
details:   http://hg.hellug.gr/freebsd/doc-el/?cmd=changeset;node=ecafc55b385c

description:
	Merge from ncvs

diffstat:

12 files changed, 104 insertions(+), 32 deletions(-)
el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml      |    2 
el_GR.ISO8859-7/books/handbook/x11/chapter.sgml               |    2 
en_US.ISO8859-1/articles/contributors/contrib.committers.sgml |    6 +
en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml     |   34 ++++----
en_US.ISO8859-1/books/handbook/config/chapter.sgml            |    4 
en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml      |    6 -
en_US.ISO8859-1/books/handbook/x11/chapter.sgml               |   19 +++-
en_US.ISO8859-1/books/porters-handbook/book.sgml              |    8 +
en_US.ISO8859-1/share/sgml/authors.ent                        |    4 
share/pgpkeys/pgpkeys-developers.sgml                         |    7 +
share/pgpkeys/pgpkeys.ent                                     |    3 
share/pgpkeys/versus.key                                      |   41 ++++++++++

diffs (truncated from 396 to 300 lines):

diff -r 596de5dc46d7 -r ecafc55b385c el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml
--- a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -4,7 +4,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml,v 1.2 2008/01/14 14:19:44 keramida Exp $
+  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml,v 1.3 2008/11/02 13:43:14 manolis Exp $
 
   %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
   %SRCID%	1.230
diff -r 596de5dc46d7 -r ecafc55b385c el_GR.ISO8859-7/books/handbook/x11/chapter.sgml
--- a/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -4,7 +4,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.9 2008/09/18 12:06:00 manolis Exp $
+  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.10 2008/10/28 09:49:44 manolis Exp $
 
   %SOURCE%      en_US.ISO8859-1/books/handbook/x11/chapter.sgml
   %SRCID%       1.190
diff -r 596de5dc46d7 -r ecafc55b385c en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.245 2008/10/06 13:59:02 lstewart Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.246 2008/11/01 11:08:11 versus Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -547,6 +547,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.versus;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.raj;</para>
     </listitem>
 
diff -r 596de5dc46d7 -r ecafc55b385c en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.47 2007/12/30 02:40:32 danger Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.48 2008/10/31 12:23:35 pgj Exp $
 -->
 
 <chapter id="sgml-primer">
@@ -65,8 +65,8 @@
       like that, and our computers require some assistance before they can
       meaningfully process our text.</para>
 
-    <para>More precisely, they need help identifying what is what.  You or I
-      can look at
+    <para>More precisely, they need help identifying what is what.  Let's
+      look at this text:</para>
 
       <blockquote>
 	<para>To remove <filename>/tmp/foo</filename> use &man.rm.1;.</para>
@@ -74,7 +74,7 @@
 	<screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>
       </blockquote>
 
-      and easily see which parts are filenames, which are commands to be typed
+    <para>It is easy to see which parts are filenames, which are commands to be typed
       in, which parts are references to manual pages, and so on.  But the
       computer processing the document cannot.  For this we need
       markup.</para>
@@ -204,15 +204,15 @@
 
     <para>For an element called <replaceable>element-name</replaceable> the
       start tag will normally look like
-      <literal>&lt;<replaceable>element-name</replaceable>&gt;</literal>.  The
+      <sgmltag><replaceable>element-name</replaceable></sgmltag>.  The
       corresponding closing tag for this element is
-      <literal>&lt;/<replaceable>element-name</replaceable>&gt;</literal>.</para>
+      <sgmltag>/<replaceable>element-name</replaceable></sgmltag>.</para>
 
     <example>
       <title>Using an element (start and end tags)</title>
 
       <para>HTML has an element for indicating that the content enclosed by
-	the element is a paragraph, called <literal>p</literal>.  This
+	the element is a paragraph, called <sgmltag>p</sgmltag>.  This
 	element has both start and end tags.</para>
       
       <programlisting><![ CDATA [<p>This is a paragraph.  It starts with the start tag for
@@ -231,7 +231,7 @@
       <title>Using an element (start tag only)</title>
 
       <para>HTML has an element for indicating a horizontal rule, called
-	<literal>hr</literal>.  This element does not wrap content, so only
+	<sgmltag>hr</sgmltag>.  This element does not wrap content, so only
 	has a start tag.</para>
 
       <programlisting><![ CDATA [<p>This is a paragraph.</p>
@@ -266,10 +266,10 @@
 	end.</para>
 
       <para>When this document (or anyone else knowledgeable about SGML) refers
-	to <quote>the &lt;p&gt; tag</quote> they mean the literal text
+	to <quote>the <sgmltag>p</sgmltag> tag</quote> they mean the literal text
 	consisting of the three characters <literal>&lt;</literal>,
 	<literal>p</literal>, and <literal>&gt;</literal>.  But the phrase
-	<quote>the &lt;p&gt; element</quote> refers to the whole
+	<quote>the <sgmltag>p</sgmltag> element</quote> refers to the whole
 	element.</para>
 
       <para>This distinction <emphasis>is</emphasis> very subtle.  But keep it 
@@ -287,7 +287,7 @@
       <literal><replaceable>attribute-name</replaceable>="<replaceable>attribute-value</replaceable>"</literal>.</para>
 
     <para>In sufficiently recent versions of HTML, the <sgmltag>p</sgmltag>
-      element has an attribute called <literal>align</literal>, which suggests
+      element has an attribute called <sgmltag>align</sgmltag>, which suggests
       an alignment (justification) for the paragraph to the program displaying
       the HTML.</para>
 
@@ -494,7 +494,7 @@
 
 		<row>
 		  <entry>6</entry>
-		  <entry>The text of the error message.</entry>
+		  <entry>The text of the message.</entry>
 		</row>
 	      </tbody>
 	    </tgroup>
@@ -519,7 +519,7 @@
 	</step>
 
 	<step>
-	  <para>Put the <literal>title</literal> element back in.</para>
+	  <para>Put the <sgmltag>title</sgmltag> element back in.</para>
 	</step>
       </procedure>
     </sect2>
@@ -781,7 +781,7 @@
   <sect1 id="sgml-primer-sgml-escape">
     <title>Escaping back to SGML</title>
 
-    <para>Earlier in this primer I said that SGML is only used when writing a
+    <para>As mentioned earlier, SGML is only used when writing a
       DTD.  This is not strictly true.  There is certain SGML syntax that you
       will want to be able to use within your documents.  For example,
       comments can be included in your document, and will be ignored by the
@@ -1379,7 +1379,7 @@
 	  characters.</para>
 	
 	<para><literal>RCDATA</literal> is for <quote>Entity references and
-	  character data</quote> If the parser is in this content model then it
+	  character data</quote>.  If the parser is in this content model then it
 	  is expecting to see characters <emphasis>and</emphasis> entities.
 	  <literal>&lt;</literal> loses its special status, but
 	  <literal>&amp;</literal> will still be treated as
@@ -1392,7 +1392,7 @@
 	  <literal>&lt;</literal> is converted to a
 	  <literal>&amp;lt;</literal> and every <literal>&amp;</literal>
 	  is converted to a <literal>&amp;amp;</literal>, it can be
-	  easier to mark the section as only containing CDATA.  When the SGML
+	  easier to mark the section as only containing <literal>CDATA</literal>.  When the SGML
 	  parser encounters this it will ignore the
 	  <literal>&lt;</literal> and <literal>&amp;</literal> symbols
 	  embedded in the content.</para>
@@ -1534,7 +1534,7 @@
   &lt;body>	    
     &lt;p>This paragraph &lt;![ CDATA [contains many &lt;
       characters (&lt; &lt; &lt; &lt; &lt;) so it is easier
-      to wrap it in a CDATA marked section ]]&gt;&lt;/p>
+      to wrap it in a CDATA marked section.]]&gt;&lt;/p>
 
     &lt;![ IGNORE [
     &lt;p>This paragraph will definitely not be included in the
diff -r 596de5dc46d7 -r ecafc55b385c en_US.ISO8859-1/books/handbook/config/chapter.sgml
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.234 2008/09/17 19:27:10 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.235 2008/11/01 11:13:46 brueffer Exp $
 -->
 
 <chapter id="config-tuning">
@@ -623,7 +623,7 @@
       </callout>
     </calloutlist>
 
-    <para>This is the basic set up for every
+    <para>This is the basic setup for every
       <filename>crontab</filename> file, although there is one thing
       different about this one.  Field number six, where we specified
       the username, only exists in the system
diff -r 596de5dc46d7 -r ecafc55b385c en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.228 2008/07/17 18:59:04 danger Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.231 2008/11/02 14:37:48 pgj Exp $
 -->
 
 <chapter id="cutting-edge">
@@ -271,11 +271,11 @@
 		    &os;, and not &os.current;.  You will need to edit this
 		    file and replace the following line:</para>
 
-		  <screen>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></screen>
+		  <programlisting>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></programlisting>
 
 		  <para>With this one:</para>
 
-		  <screen>*default release=cvs tag=.</screen>
+		  <programlisting>*default release=cvs tag=.</programlisting>
 
 		  <para>For a detailed explanation of usable tags, please
 		    refer to the Handbook's <link
diff -r 596de5dc46d7 -r ecafc55b385c en_US.ISO8859-1/books/handbook/x11/chapter.sgml
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.189 2008/09/17 19:46:08 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.190 2008/10/28 07:56:33 blackend Exp $
 -->
 
 <chapter id="x11">
@@ -412,8 +412,21 @@
       <screen>&prompt.user; <userinput>startx</userinput></screen>
 
       <para>If this does not work, or if the default configuration is
-	not acceptable, then X11 must be configured manually.
-	Configuration of X11 is
+	not acceptable, then X11 must be configured manually.</para>
+
+      <note>
+	<para>Desktop environments like
+	  <application>GNOME</application>,
+	  <application>KDE</application> or
+	  <application>XFce</application> have tools allowing the user
+	  to easily set the screen parameters such as the resolution.
+	  So if the default configuration is not acceptable and you
+	  planned to install a desktop environment then just continue
+	  with the installation of the desktop environment and use the
+	  appropriate screen settings tool.</para>
+      </note>
+
+      <para>Configuration of X11 is
         a multi-step process.  The first step is to build an initial
         configuration file.
         As the super user, simply
diff -r 596de5dc46d7 -r ecafc55b385c en_US.ISO8859-1/books/porters-handbook/book.sgml
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Nov 02 15:36:46 2008 +0200
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Nov 02 18:33:10 2008 +0200
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.956 2008/10/23 15:58:52 des Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.957 2008/10/28 19:50:37 trasz Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -12222,6 +12222,12 @@
 		    &man.MALLOC.9; and &man.FREE.9; macros.</entry>
 		    <entry>800051</entry>
 		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the introduction of accmode_t
+		    and renaming of VOP_ACCESS 'a_mode' argument
+		    to 'a_accmode'.</entry>
+		    <entry>800052</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>
diff -r 596de5dc46d7 -r ecafc55b385c en_US.ISO8859-1/share/sgml/authors.ent
--- a/en_US.ISO8859-1/share/sgml/authors.ent	Sun Nov 02 15:36:46 2008 +0200
+++ b/en_US.ISO8859-1/share/sgml/authors.ent	Sun Nov 02 18:33:10 2008 +0200
@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.463 2008/10/06 08:36:30 lstewart Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.464 2008/11/01 11:08:11 versus Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">




More information about the Freebsd-doc-el mailing list