svn commit: r42196 - in projects/entities: en_US.ISO8859-1/books/fdp-primer/docbook-markup en_US.ISO8859-1/books/handbook/introduction en_US.ISO8859-1/books/porters-handbook en_US.ISO8859-1/htdocs/...

Rene Ladan rene at FreeBSD.org
Mon Jul 8 20:46:28 UTC 2013


Author: rene
Date: Mon Jul  8 20:46:26 2013
New Revision: 42196
URL: http://svnweb.freebsd.org/changeset/doc/42196

Log:
  MFH updated directories up to r42195.

Modified:
  projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
  projects/entities/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
  projects/entities/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
  projects/entities/it_IT.ISO8859-15/books/handbook/install/chapter.xml
  projects/entities/ja_JP.eucJP/books/faq/book.xml
  projects/entities/ja_JP.eucJP/books/handbook/disks/chapter.xml
  projects/entities/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  projects/entities/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
  projects/entities/share/xml/freebsd.sch
Directory Properties:
  projects/entities/en_US.ISO8859-1/   (props changed)
  projects/entities/es_ES.ISO8859-1/   (props changed)
  projects/entities/hu_HU.ISO8859-2/   (props changed)
  projects/entities/it_IT.ISO8859-15/   (props changed)
  projects/entities/ja_JP.eucJP/   (props changed)
  projects/entities/pl_PL.ISO8859-2/   (props changed)
  projects/entities/share/   (props changed)

Modified: projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -1742,8 +1742,8 @@ This is the file called 'foo2'</screen>
     <title>Images</title>
 
     <important>
-      <para>Image support in the documentation is currently
-	extremely experimental.  The mechanisms described here are
+      <para>Image support in the documentation is somewhat
+	experimental.  The mechanisms described here are
 	unlikely to change, but that is not guaranteed.</para>
 
       <para>Installation of the
@@ -1751,11 +1751,11 @@ This is the file called 'foo2'</screen>
 	port is required.  It is used to convert between the different
 	image formats.  This port is <emphasis>not</emphasis> in
 	the <filename role="package">textproc/docproj</filename> meta
-	port, it must be installed by hand.</para>
+	port, it must be installed separately.</para>
 
       <para>The best example of what follows in practice is the
 	<filename>doc/en_US.ISO8859-1/articles/vm-design/</filename>
-	document.  If the description that follows is unclear, take a
+	document.  If the description that follows is unclear,
 	look at the files in that directory to see how everything
 	hangs together.  Experiment with creating different formatted
 	versions of the document to see how the image markup appears
@@ -1766,7 +1766,7 @@ This is the file called 'foo2'</screen>
       <title>Image Formats</title>
 
       <para>Two image formats are currently supported.  Which to
-	choose will depend on the nature of the image.</para>
+	use depends on the nature of the image.</para>
 
       <para>Images that are primarily vector based, such as network
 	diagrams, time lines, and similar, should be in
@@ -1787,8 +1787,8 @@ This is the file called 'foo2'</screen>
 	expected that documentation will have a mix of
 	<acronym>EPS</acronym> and <acronym>PNG</acronym> images.  The
 	<filename>Makefile</filename>s ensure that the correct format
-	image is chosen depending on the output format that you use
-	for your documentation.  <emphasis>Do not commit the same
+	image is chosen depending on the output format used.
+	<emphasis>Do not commit the same
 	image to the repository in two different
 	  formats</emphasis>.</para>
 
@@ -1801,11 +1801,49 @@ This is the file called 'foo2'</screen>
       </important>
     </sect2>
 
+    <sect2 id="docbook-markup-image-file-locations">
+      <title>Image File Locations</title>
+
+      <para>Image files can be stored in one of several
+	locations, depending on the document and image:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>In the same directory as the document itself, usually
+	    done for articles and small books that keep all their
+	    files in a single directory.</para>
+	</listitem>
+
+	<listitem>
+	  <para>In a subdirectory of the main document.  Typically
+	    done when a large book uses separate subdirectories to
+	    organize individual chapters.</para>
+
+	  <para>When images are stored in a subdirectory of the
+	    main document directory, the subdirectory name must be
+	    included in their paths in the
+	    <filename>Makefile</filename> and the
+	    <sgmltag>imagedata</sgmltag> element.</para>
+	</listitem>
+
+	<listitem>
+	  <para>In a subdirectory of
+	    <filename class="directory">doc/share/images</filename>
+	    named after the document.  For example, images for the
+	    Handbook are stored in <filename
+	      class="directory">doc/share/images/books/handbook</filename>.
+	    Images that work for multiple translations are stored in
+	    this upper level of the documentation file tree.
+	    Generally, these are images that can be used unchanged in
+	    non-English translations of the document.</para>
+	</listitem>
+      </itemizedlist>
+    </sect2>
+
     <sect2 id="docbook-markup-image-markup">
       <title>Image Markup</title>
 
-      <para>The markup for an image is relatively simple.  First,
-	markup a <sgmltag>mediaobject</sgmltag>.  The
+      <para>Images are included as part of a <sgmltag>mediaobject</sgmltag>.  The
 	<sgmltag>mediaobject</sgmltag> can contain other, more
 	specific objects.  We are concerned with two, the
 	<sgmltag>imageobject</sgmltag> and the
@@ -1814,7 +1852,7 @@ This is the file called 'foo2'</screen>
       <para>Include one <sgmltag>imageobject</sgmltag>,
 	and two <sgmltag>textobject</sgmltag> elements.  The
 	<sgmltag>imageobject</sgmltag> will point to the name of the
-	image file (without the extension).  The
+	image file without the extension.  The
 	<sgmltag>textobject</sgmltag> elements contain information
 	that will be presented to the user as well as, or instead of,
 	the image itself.</para>
@@ -1825,10 +1863,10 @@ This is the file called 'foo2'</screen>
       <itemizedlist>
 	<listitem>
 	  <para>When the reader is viewing the documentation in
-	    <acronym>HTML</acronym>.  In this case, each image will
-	    need associated alternate text to show the user, typically
-	    while the image is loading, or if they hover the mouse
-	    pointer over the image.</para>
+	    <acronym>HTML</acronym>.  In this case, each image
+	    needs associated alternate text to show the user, typically
+	    while the image is loading, or if the mouse
+	    pointer is hovered over the image.</para>
 	</listitem>
 
 	<listitem>
@@ -1843,24 +1881,23 @@ This is the file called 'foo2'</screen>
       <para>An example will make things easier to understand.  Suppose
 	there is an image called <filename>fig1.png</filename> that is
 	to be included in the document.  This image is of a rectangle
-	with an A inside it.  The markup for this would be as
-	follows.</para>
+	with an A inside it:</para>
 
-      <programlisting><mediaobject>
-  <imageobject>
-    <imagedata fileref="fig1"> <co id="co-image-ext"/>
-  </imageobject>
+      <programlisting><sgmltag class="starttag">mediaobject</sgmltag>
+  <sgmltag class="starttag">imageobject</sgmltag>
+    <sgmltag class="starttag">imagedata fileref="fig1"</sgmltag> <co id="co-image-ext"/>
+  <sgmltag class="endtag">imageobject</sgmltag>
 
-  <textobject>
-    <literallayout class="monospaced">+---------------+ <co id="co-image-literal"/>
+  <sgmltag class="starttag">textobject</sgmltag>
+    <sgmltag class="starttag">literallayout class="monospaced"</sgmltag>+---------------+ <co id="co-image-literal"/>
 |       A       |
-+---------------+</literallayout>
-  </textobject>
++---------------+<sgmltag class="endtag">literallayout</sgmltag>
+  <sgmltag class="endtag">textobject</sgmltag>
 
-  <textobject>
-    <phrase>A picture</phrase> <co id="co-image-phrase"/>
-  </textobject>
-</mediaobject></programlisting>
+  <sgmltag class="starttag">textobject</sgmltag>
+    <sgmltag class="starttag">phrase</sgmltag>A picture<sgmltag class="endtag">phrase</sgmltag> <co id="co-image-phrase"/>
+  <sgmltag class="endtag">textobject</sgmltag>
+<sgmltag class="endtag">mediaobject</sgmltag></programlisting>
 
       <calloutlist>
 	<callout arearefs="co-image-ext">
@@ -1940,7 +1977,7 @@ IMAGES+= fig3.png
 	<filename>chapter1/chapter.xml</filename>,
 	<filename>chapter2/chapter.xml</filename>, and
 	<filename>chapter3/chapter.xml</filename>.  If each chapter
-	has images associated with it, it is suggested to place
+	has images associated with it, place
 	those images in each chapter's subdirectory
 	(<filename>chapter1/</filename>,
 	<filename>chapter2/</filename>, and
@@ -1958,14 +1995,14 @@ IMAGES+= fig3.png
 	<filename>chapter1/chapter.xml</filename> should
 	contain:</para>
 
-      <programlisting><mediaobject>
-  <imageobject>
-    <imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
-  </imageobject>
+      <programlisting><sgmltag class="starttag">mediaobject</sgmltag>
+  <sgmltag class="starttag">imageobject</sgmltag>
+    <sgmltag class="emptytag">imagedata fileref="chapter1/fig1"</sgmltag> <co id="co-image-dir"/>
+  <sgmltag class="endtag">imageobject</sgmltag>
 
   …
 
-</mediaobject></programlisting>
+<sgmltag class="endtag">mediaobject</sgmltag></programlisting>
 
       <calloutlist>
 	<callout arearefs="co-image-dir">
@@ -2011,18 +2048,18 @@ IMAGES=  chapter1/fig1.png
 	<title><literal>id</literal> on Chapters and
 	  Sections</title>
 
-	<programlisting><![CDATA[<chapter id="introduction">
-  <title>Introduction</title>
+	<programlisting><sgmltag class="starttag">chapter id="introduction"</sgmltag>
+  <sgmltag class="starttag">title</sgmltag>Introduction<sgmltag class="endtag">title</sgmltag>
 
-  <para>This is the introduction.  It contains a subsection,
-    which is identified as well.</para>
+  <sgmltag class="starttag">para</sgmltag>This is the introduction.  It contains a subsection,
+    which is identified as well.<sgmltag class="endtag">para</sgmltag>
 
-  <sect1 id="introduction-moredetails">
-    <title>More Details</title>
+  <sgmltag class="starttag">sect1 id="introduction-moredetails"</sgmltag>
+    <sgmltag class="starttag">title</sgmltag>More Details<sgmltag class="endtag">title</sgmltag>
 
-    <para>This is a subsection.</para>
-  </sect1>
-</chapter>]]></programlisting>
+    <sgmltag class="starttag">para</sgmltag>This is a subsection.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">sect1</sgmltag>
+<sgmltag class="endtag">chapter</sgmltag></programlisting>
       </example>
 
       <para>Use descriptive values for <literal>id</literal> names.
@@ -2043,9 +2080,9 @@ IMAGES=  chapter1/fig1.png
       <example>
 	<title><sgmltag>anchor</sgmltag></title>
 
-	<programlisting><![CDATA[<para>This paragraph has an embedded
-  <anchor id="para1">link target in it.  It will not
-  show up in the document.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>This paragraph has an embedded
+  <sgmltag class="emptytag">anchor id="para1"</sgmltag>link target in it.  It will not
+  show up in the document.<sgmltag class="endtag">para</sgmltag></programlisting>
       </example>
     </sect2>
 
@@ -2066,11 +2103,11 @@ IMAGES=  chapter1/fig1.png
 	  document that includes the <literal>id</literal>
 	  example shown above:</para>
 
-	<programlisting><![CDATA[<para>More information can be found
-  in <xref linkend="introduction"/>.</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag>More information can be found
+  in <sgmltag class="emptytag">xref linkend="introduction"</sgmltag>.<sgmltag class="endtag">para</sgmltag>
 
-<para>More specific information can be found
-  in <xref linkend="introduction-moredetails"/>.</para>]]></programlisting>
+<sgmltag class="starttag">para</sgmltag>More specific information can be found
+  in <sgmltag class="emptytag">xref linkend="introduction-moredetails"</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>The link text will be generated automatically, looking
 	  like (<emphasis>emphasized</emphasis> text indicates the
@@ -2129,11 +2166,12 @@ IMAGES=  chapter1/fig1.png
 	    document that includes the <literal>id</literal>
 	    example.</para>
 
-	  <programlisting><![CDATA[<para>More information can be found in the
-  <link linkend="introduction">sample introduction</link>.</para>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>More information can be found in the
+  <sgmltag class="starttag">link linkend="introduction"</sgmltag>sample introduction<sgmltag class="endtag">link</sgmltag>.<sgmltag class="endtag">para</sgmltag>
 
-<para>More specific information can be found in the
-  <link linkend="introduction-moredetails">sample introduction with more details</link> section.</para>]]></programlisting>
+<sgmltag class="starttag">para</sgmltag>More specific information can be found in the
+  <sgmltag class="starttag">link linkend="introduction-moredetails"</sgmltag>sample introduction with
+    more details<sgmltag class="endtag">link</sgmltag> section.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>This output will be generated
 	    (<emphasis>emphasized</emphasis> text is used to show the
@@ -2181,12 +2219,12 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage for book links:</para>
 
-	  <programlisting><![CDATA[<para>Read the <ulink
-    url="&url.books.handbook;/svn.html#svn-intro">SVN
-    introduction</ulink>, then pick the nearest mirror from
-  the list of <ulink
-    url="&url.books.handbook;/subversion-mirrors.html">Subversion
-    mirror sites</ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Read the <sgmltag class="starttag">ulink
+    url="&url.books.handbook;/svn.html#svn-intro"</sgmltag>SVN
+    introduction<sgmltag class="endtag">ulink</sgmltag>, then pick the nearest mirror from
+  the list of <sgmltag class="starttag">ulink
+    url="&url.books.handbook;/subversion-mirrors.html"</sgmltag>Subversion
+    mirror sites<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2199,9 +2237,10 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage for article links:</para>
 
-	  <programlisting><![CDATA[<para>Read this <ulink url="&url.articles.bsdl-gpl;">article
-    about the BSD license</ulink>, or just the <ulink
-    url="&url.articles.bsdl-gpl;#intro">introduction</ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Read this
+  <sgmltag class="starttag">ulink url="&url.articles.bsdl-gpl;"</sgmltag>article
+    about the BSD license<sgmltag class="endtag">ulink</sgmltag>, or just the
+  <sgmltag class="starttag">ulink url="&url.articles.bsdl-gpl;#intro"</sgmltag>introduction<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2215,9 +2254,8 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage:</para>
 
-	  <programlisting><![CDATA[<para>Of course, you could stop reading this document and
-  go to the <ulink url="&url.base;/index.html">FreeBSD
-  home page</ulink> instead.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Of course, you could stop reading this document and go to the
+  <sgmltag class="starttag">ulink url="&url.base;/index.html"</sgmltag>FreeBSD home page<sgmltag class="endtag">ulink</sgmltag> instead.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2232,10 +2270,10 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage:</para>
 
-	  <programlisting><![CDATA[<para>Wikipedia has an excellent reference on
-  <ulink
-    url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
-    Partition Tables</ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Wikipedia has an excellent reference on
+  <sgmltag class="starttag">ulink
+    url="http://en.wikipedia.org/wiki/GUID_Partition_Table"</sgmltag>GUID
+    Partition Tables<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2247,9 +2285,9 @@ IMAGES=  chapter1/fig1.png
 	  <para>The link text can be omitted to show the actual
 	    URL:</para>
 
-	  <programlisting><![CDATA[<para>Wikipedia has an excellent reference on
-  GUID Partition Tables: <ulink
-    url="http://en.wikipedia.org/wiki/GUID_Partition_Table"></ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Wikipedia has an excellent reference on
+  GUID Partition Tables: <sgmltag class="starttag">ulink
+    url="http://en.wikipedia.org/wiki/GUID_Partition_Table"</sgmltag><sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 

Modified: projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -123,13 +123,6 @@
 	</listitem>
 
 	<listitem>
-	  <para>&os; is a <emphasis>32-bit</emphasis> operating
-	    system (<emphasis>64-bit</emphasis> on the &itanium;,
-	    AMD64, and &ultrasparc;) and was designed as such from
-	    the ground up.</para>
-	</listitem>
-
-	<listitem>
 	  <indexterm>
 	    <primary>X Window System</primary>
 	  </indexterm>

Modified: projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -5768,11 +5768,11 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/subp
 	<title>Basic Usage</title>
 
 	<para>If your port requires <literal>gettext</literal>, set
-	  <literal>USES= gettext</literal>, and your
-	  port will inherit a dependency on <filename
-	    role="package">devel/gettext</filename>. Other values for
-	  <literal>gettext</literal> usage are listed in <xref
-	  linkend="uses-values"/>.</para>
+	  <literal>USES= gettext</literal>, and your port will inherit
+	  a dependency on
+	  <filename role="package">devel/gettext</filename>.  Other
+	  values for <literal>gettext</literal> usage are listed in
+	  <xref linkend="uses-values"/>.</para>
 
 	<para>A rather common case is a port using
 	  <literal>gettext</literal> and <command>configure</command>.
@@ -6297,7 +6297,7 @@ USE_XORG=	x11 xpm</programlisting>
 	</sect3>
 
 	<sect3 id="updating-desktop-database">
-	  <title>Updating desktop database</title>
+	  <title>Updating Desktop Database</title>
 
 	  <para>If a port has a MimeType entry in its
 	    <filename><replaceable>portname</replaceable>.desktop</filename>,
@@ -15743,8 +15743,8 @@ Reference: <http://www.freebsd.org/po
 	      <entry>901501</entry>
 	      <entry>November 11, 2012</entry>
 	      <entry>9.1-STABLE after LIST_PREV() added to queue.h
-	      (rev <svnref>242893</svnref>) and KBI change in USB
-	      serial devices (rev <svnref>240659</svnref>).</entry>
+		(rev <svnref>242893</svnref>) and KBI change in USB
+		serial devices (rev <svnref>240659</svnref>).</entry>
 	    </row>
 
 	    <row>
@@ -16011,8 +16011,8 @@ Reference: <http://www.freebsd.org/po
 	    <row>
 	      <entry>1000028</entry>
 	      <entry>February 13, 2013</entry>
-	      <entry>10-CURRENT after USB moved to the driver structure
-		requiring a rebuild of all USB modules (rev
+	      <entry>10-CURRENT after USB moved to the driver
+		structure requiring a rebuild of all USB modules (rev
 		<svnref>246759</svnref>).</entry>
 	    </row>
 

Modified: projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -19,8 +19,9 @@
 <row>
   <entry><literal>ada</literal></entry>
   <entry>(none)</entry>
-  <entry>Depends on an <application>Ada</application>-capable compiler, and
-    sets <makevar>CC</makevar> accordingly.</entry>
+
+  <entry>Depends on an <application>Ada</application>-capable
+    compiler, and sets <makevar>CC</makevar> accordingly.</entry>
 </row>
 
 <row>
@@ -39,12 +40,12 @@
 <row>
   <entry><literal>charsetfix</literal></entry>
   <entry>(none)</entry>
-  <entry>Prevents the port from installing <filename>charset.alias</filename>.
-    This should be installed only by
-    <filename role="package">converters/libiconv</filename>.
-    <makevar>CHARSETFIX_MAKEFILEIN</makevar> can be set to a path relative
-    to <makevar>WRKSRC</makevar> if <filename>charset.alias</filename> is
-    not installed by
+  <entry>Prevents the port from installing
+    <filename>charset.alias</filename>.  This should be installed only
+    by <filename role="package">converters/libiconv</filename>.
+    <makevar>CHARSETFIX_MAKEFILEIN</makevar> can be set to a path
+    relative to <makevar>WRKSRC</makevar> if
+    <filename>charset.alias</filename> is not installed by
     <makevar>WRKSRC</makevar>/<filename>Makefile.in</filename>.</entry>
 </row>
 
@@ -64,12 +65,12 @@
 
   <entry>Implies that the port uses the
     <application>update-desktop-database</application> from
-    <filename role="package">devel/desktop-file-utils</filename>.
-    This uses will automatically add a post-install step in such a way
-    that the port itself still can specify there own post-install step
-    if needed.  It also insert lines into the plist for package
-    install and removal to run
-    <application>update-desktop-database</application>.</entry>
+    <filename role="package">devel/desktop-file-utils</filename>.  An
+    extra post-install step will be run without interfering with any
+    post-install steps already in the port
+    <filename>Makefile</filename>.  Lines will be inserted into the
+    plist to run <application>update-desktop-database</application> on
+    package install or removal.</entry>
 </row>
 
 <row>
@@ -85,11 +86,12 @@
   <entry><literal>gettext</literal></entry>
   <entry>(none), <literal>lib</literal>, <literal>build</literal>,
     <literal>run</literal></entry>
-  <entry>Implies that the port uses <filename
-      role="package">devel/gettext</filename> in one way or another.  By
-    default, with no arguments or with the <literal>lib</literal>
-    argument, implies <command>gettext</command> with build-time and 
-    run-time dependencies, <literal>build</literal> implies a build-time
+  <entry>Implies that the port uses
+    <filename role="package">devel/gettext</filename> in one way or
+    another.  By default, with no arguments or with the
+    <literal>lib</literal> argument, implies
+    <command>gettext</command> with build-time and run-time
+    dependencies, <literal>build</literal> implies a build-time
     dependency, and <literal>run</literal> implies a run-time
     dependency.</entry>
 </row>
@@ -99,15 +101,16 @@
   <entry>(none)</entry>
   <entry>Implies that the port uses <filename
       role="package">converters/libiconv</filename> as build-time and
-    run-time dependency.
-  </entry>
+    run-time dependency.</entry>
 </row>
 
 <row>
   <entry><literal>ncurses</literal></entry>
-  <entry>(none), <literal>base</literal>, <literal>port</literal></entry>
-  <entry>Implies that the port uses <application>ncurses</application>, and
-    causes some useful variables to be set.</entry>
+  <entry>(none), <literal>base</literal>,
+    <literal>port</literal></entry>
+  <entry>Implies that the port uses
+    <application>ncurses</application>, and causes some useful
+    variables to be set.</entry>
 </row>
 
 <row>
@@ -151,9 +154,10 @@
 <row>
   <entry><literal>readline</literal></entry>
   <entry>(none), port</entry>
-  <entry>Implies that the port uses <application>readline</application> as
-    library dependency, and sets <makevar>CPPFLAGS</makevar> and
-    <makevar>LDFLAGS</makevar> as necessary.</entry>
+  <entry>Implies that the port uses
+    <application>readline</application> as library dependency, and
+    sets <makevar>CPPFLAGS</makevar> and <makevar>LDFLAGS</makevar> as
+    necessary.</entry>
 </row>
 
 <row>
@@ -174,23 +178,26 @@
 <row>
   <entry><literal>shebangfix</literal></entry>
   <entry>(none)</entry>
-  <entry>A lot of software uses incorrect locations for script interpreters,
-    most notably <filename>/usr/bin/perl</filename> and
-    <filename>/bin/bash</filename>.  This fixes shebang lines in scripts
-    listed in <makevar>SHEBANG_FILES</makevar>.  Currently
-    <application>Perl</application>, <application>Python</application>,
+  <entry>A lot of software uses incorrect locations for script
+    interpreters, most notably <filename>/usr/bin/perl</filename> and
+    <filename>/bin/bash</filename>.  This fixes shebang lines in
+    scripts listed in <makevar>SHEBANG_FILES</makevar>.  Currently
+    <application>Perl</application>,
+    <application>Python</application>,
     <application>Bash</application>, <application>Ruby</application>,
-    and <application>PHP</application> are supported by default.
-    To support another interpreter, set <makevar>SHEBANG_LANG</makevar>
-    (for example <literal><makevar>SHEBANG_LANG</makevar>=lua</literal>), then
-    <makevar>lua_OLD_CMD</makevar> and <makevar>lua_CMD</makevar>.</entry>
+    and <application>PHP</application> are supported by default.  To
+    support another interpreter, set <makevar>SHEBANG_LANG</makevar>
+    (for example
+    <literal><makevar>SHEBANG_LANG</makevar>=lua</literal>), then
+    <makevar>lua_OLD_CMD</makevar> and
+    <makevar>lua_CMD</makevar>.</entry>
 </row>
 
 <row>
   <entry><literal>zenoss</literal></entry>
   <entry>(none)</entry>
-  <entry>Implies the port uses <filename
-      role="package">net-mgmt/zenoss</filename> in one way or another,
-    but largely is used for building zenoss related zenpack
+  <entry>Implies the port uses
+    <filename role="package">net-mgmt/zenoss</filename> in one way or
+    another, but largely is used for building zenoss related zenpack
     ports.</entry>
 </row>

Modified: projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -18,7 +18,7 @@
 
     <!-- XXX: keep updating the number of entries -->
     <p>Thanks to all the reporters for the excellent work!  This report
-      contains 14 entries and we hope you enjoy reading it.</p>
+      contains 21 entries and we hope you enjoy reading it.</p>
 
     <!-- XXX: set date for the next set of submissions -->
     <p>The deadline for submissions covering between July and September 2013
@@ -67,6 +67,12 @@
     <description>Documentation</description>
   </category>
 
+  <category>
+    <name>event</name>
+
+    <description>Events</description>
+  </category>
+
   <project cat='proj'>
     <title>PC-BSD</title>
 
@@ -699,7 +705,7 @@
     </help>
   </project>
 
-  <project cat='proj'>
+  <project cat='bin'>
     <title>LLDB Debugger Port</title>
 
     <contact>
@@ -751,4 +757,464 @@
 	system.</task>
     </help>
   </project>
+
+  <project cat='kern'>
+    <title>Native iSCSI Stack</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Edward Tomasz</given>
+	  <common>Napierała</common>
+	</name>
+	<email>trasz at FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://wiki.freebsd.org/Native%20iSCSI%20target"/>
+    </links>
+
+    <body>
+      <p>The native kernel iSCSI target and initiator project progressed
+	well over the April to June period.  The primary focus was to
+	introduce support for iSER (iSCSI over RDMA) in both the
+	initiator and the target.  Prerequisite for this was merging
+	some common parts together and implementing a workaround for the
+	lack of iSER support in userspace.  Apart from that, there were
+	a myriad of smaller improvements.  Such as creating more
+	user-friendly administration utilities, for example
+	<tt>iscsictl(8)</tt> which displays SCSI device nodes for each
+	iSCSI session.  This frees the user from getting the same
+	information through <tt>camcontrol(8)</tt>.  But there are
+	improvements in logging and manual pages as well.</p>
+
+      <p>Once the iSER support becomes stable, the work will focus on
+	performance optimizations.  The plan is to commit both the new
+	initiator and target in August to allow shipping them in 10.0.
+	The project will continue with implementing support for software
+	iWARP stack (useful mostly for testing and development), SCSI
+	passthrough and various other improvements.</p>
+
+	<p>This project is being sponsored by the &os; Foundation.</p>
+    </body>
+
+    <help>
+      <task>Performance optimization.</task>
+      <task>Merge to &os; <tt>head</tt>.</task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Postmaster Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>&os;</given>
+	  <common>Postmaster Team</common>
+	</name>
+	<email>postmaster at FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links/>
+
+    <body>
+      <p>In the second quarter of 2013, the &os; Postmaster Team has
+	implemented the following items that may be interest of the
+	general public:</p>
+
+      <ul>
+	<li>With help from <tt>clusteradm</tt>, found that
+	  <tt>unbound</tt> (the resolver used on <tt>mx1</tt> and
+	  <tt>mx2</tt>) is configured to perform DNSSEC validation which
+	  implies that if a signed zone fails validation,
+	  <tt>unbound</tt> refuses to use the information.  This had
+	  caused one person to be unable to exchange email with
+	  <tt>&os;.org</tt> until the zone signatures were
+	  refreshed.</li>
+
+	<li>Created the <tt>freebsd-dtrace</tt> mailing list per George
+	  Neville-Neil.</li>
+
+	<li>Resurrected the <tt>freebsd-testing</tt> mailing list per
+	  Garrett Cooper.</li>
+
+	<li>Created the <tt>freebsd-tex</tt> mailing list per Hiroki
+	  Sato.</li>
+
+	<li>In response to another comment that our message rejection
+	  message was unclear in the case that greylisting was the
+	  reason, re-worded that message.</li>
+
+	<li>Augmented the allowable MIME types for <tt>secteam</tt> with
+	  the following to permit sending encrypted messages:
+
+	  <ul>
+	    <li><tt>application/pgp-encrypted</tt></li>
+	    <li><tt>application/pkcs7-encrypted</tt></li>
+	    <li><tt>application/x-pkcs7-encrypted</tt></li>
+	    <li><tt>multipart/encrypted</tt></li>
+	  </ul>
+	</li>
+
+	<li>Initiated de-orbit for <tt>freebsd-mozilla</tt> in favor of
+	  <tt>freebsd-gecko</tt>.</li>
+      </ul>
+    </body>
+  </project>
+
+  <project cat='bin'>
+    <title>Capsicum</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Pawel Jakub</given>
+	  <common>Dawidek</common>
+	</name>
+	<email>pjd at FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Capsicum</given>
+	  <common>Mailing List</common>
+	</name>
+	<email>cl-capsicum-discuss at lists.cam.ac.uk</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.cl.cam.ac.uk/research/security/capsicum/"/>
+      <url href="https://lists.cam.ac.uk/mailman/listinfo/cl-capsicum-discuss"/>
+    </links>
+
+    <body>
+      <p>Capsicum (lightweight OS capability and sandbox framework) is
+	being actively worked on.  In the last few months the following
+	tasks have been completed:</p>
+
+      <ul>
+	<li>Committed Capsicum overhaul to &os; <tt>head</tt> (r247602).
+	  This allows to use capability rights in more places, simplifies
+	  kernel code and implements ability to limit <tt>ioctl(2)</tt>
+	  and <tt>fcntl(2)</tt> system calls.</li>
+
+	<li><tt>hastd(8)</tt> is now using Capsicum for sandboxing, as
+	  whitelisting ioctls is possible (r248297).</li>
+
+	<li><tt>auditdistd(8)</tt> is now using Capsicum for sandboxing,
+	  as it is now possible to setup append-only restriction on file
+	  descriptor (available in Perforce).</li>
+
+	<li>Implemented <tt>connectat(2)</tt> and <tt>bindat(2)</tt>
+	  system calls for UNIX domain sockets that are allowed in
+	  capability mode (r247667).</li>
+
+	<li>Implemented <tt>chflagsat(2)</tt> system call
+	  (r248599).</li>
+
+	<li>Revised the Casper daemon for application capabilities.</li>
+
+	<li>Implemented <tt>libcapsicum</tt> for application
+	  capabilities.</li>
+
+	<li>Implemented various Casper services to be able to use more
+	  functionality within a sandbox: <tt>system.dns</tt>,
+	  <tt>system.pwd</tt>, <tt>system.grp</tt>,
+	  <tt>system.random</tt>, <tt>system.filesystem</tt>,
+	  <tt>system.socket</tt>, <tt>system.sysctl</tt>.</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>kdump(1)</tt> (from
+	  r251073 to r251167).  The version in Perforce also supports
+	  sandboxing for the <tt>-r</tt> flag, using Casper
+	  services.</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>dhclient(8)</tt>
+	  (from r252612 to r252697).</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>tcpdump(8)</tt>
+	  (available in Perforce).</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>libmagic(3)</tt>
+	  (available in Perforce).</li>
+
+	<li>Implemented the <tt>libnv</tt> library for name/value pairs
+	  handling in the hope of wider adaptation across &os;.</li>
+      </ul>
+
+      <p>For Capsicum-based sandboxing in the &os; base system, the
+	commits referenced above and the provided code aim to serve as
+	examples.  We would like to see more &os; tools to be sandboxed
+	— every tool that can parse data from untrusted sources,
+	for example.  This requires deep understanding of how the tool
+	in question works, not necessarily only Capsicum.</p>
+
+      <p>This work is being sponsored by the &os; Foundation.</p>
+    </body>
+
+    <help>
+      <task>Get involved, make the Internet finally(!) a secure place.
+	Contact us at the <tt>cl-capsicum-discuss</tt> mailing list,
+	where we can provide guidelines on how to do sandboxing
+	properly.  The fame is there, waiting.</task>
+    </help>
+  </project>
+
+  <project cat='ports'>
+    <title>Xfce/&os;</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>&os; Xfce Team</given>
+	</name>
+	<email>xfce at FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://wiki.freebsd.org/Xfce"/>
+    </links>
+
+    <body>
+      <p>The &os; Xfce Team has updated its ports to the latest stable
+	releases, especially:</p>
+
+      <ul>
+	<li>Core (mostly bugfixes and translation updates):</li>
+
+	<ul>
+	  <li><tt>deskutils/xfce4-tumbler</tt> (0.1.29)</li>
+	  <li><tt>x11-wm/xfce4-panel</tt> (4.10.1)</li>
+	  <li><tt>sysutils/xfce4-settings</tt> (4.10.1)</li>
+	  <li><tt>x11-wm/xfce4-session</tt> (4.10.1)</li>
+	  <li><tt>sysutils/garcon</tt> (0.2.1)</li>
+	  <li><tt>x11/libxfce4util</tt> (4.10.1)</li>
+	  <li><tt>x11-wm/xfce4-wm</tt> (4.10.1)</li>
+	</ul>
+
+	<li>Applications:</li>
+
+	<ul>
+	  <li><tt>multimedia/xfce4-parole</tt> (0.5.1)</li>
+	  <li><tt>www/midori</tt> (0.5.2)</li>
+	  <li><tt>deskutils/xfce4-notifyd</tt> (0.2.4)</li>
+	  <li><tt>misc/xfce4-appfinder</tt> (4.10.1)</li>
+	  <li><tt>x11/xfce4-terminal</tt> (0.6.2)</li>
+	  <li><tt>x11-fm/thunar</tt> (1.6.3)</li>
+	</ul>
+
+	<li>Panel plugins:</li>
+
+	<ul>
+	  <li><tt>deskutils/xfce4-xkb-plugin</tt> (0.5.6)</li>
+	  <li><tt>textproc/xfce4-dict-plugin</tt> (0.7.0)</li>
+	  <li><tt>x11-clocks/xfce4-timer-plugin</tt> (1.5.0)</li>
+	  <li><tt>x11/xfce4-embed-plugin</tt> (new)</li>
+	</ul>
+
+	<li>Thunar plugins:</li>
+
+	<ul>
+	  <li><tt>audio/thunar-media-tags-plugin</tt> (0.2.1)</li>
+	  <li><tt>archivers/thunar-archive-plugin</tt> (0.3.1)</li>
+	</ul>
+
+	<li><tt>x11/xfce4-embed-plugin</tt> can integrate any
+	  application window into the Xfce panel.</li>
+
+	<li>A new plugin is also available which monitors and displays earthquakes,
+	  it is called <a
+	    href="http://people.freebsd.org/~olivierd/xfce4-equake-plugin.shar">xfce4-equake-plugin</a>.</li>
+      </ul>
+    </body>
+
+    <help>
+      <task>Fix CPU issue with <tt>textproc/xfce4-dict-plugin</tt> (<a
+	  href="https://bugzilla.xfce.org/show_bug.cgi?id=10103">bug #10103</a>).</task>
+
+      <task>Investigate why <tt>midori-gtk3</tt> crashes too often.
+	(The port is finished, but some libraries are not present by
+	default in ports tree).</task>
+
+      <task>Fix <tt>x11-themes/gtk-xfce-engine</tt> with Gtk+ >=3.6.</task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Security Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>&os; Security Team</given>
+	</name>
+	<email>secteam at FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links/>
+
+    <body>
+      <p>On April 15th Dag-Erling Smørgrav and Xin Li took over
+	as security officers for the &os; Project, and the team welcomed
+	Qing Li back in the team in June.  This report briefly
+	summarizes the work of the Security Team from April until the
+	end of June.</p>
+
+      <p>The Security Team has released the following advisories:</p>
+
+      <ul>
+	<li><tt>FreeBSD-SA-13:05.nfsserver</tt>: Insufficient input
+	  validation in the NFS server (<tt>nfsd(8)</tt>), reported by
+	  Adam Nowacki.</li>
+
+	<li><tt>FreeBSD-SA-13:06.mmap</tt>: Privilege escalation via
+	  <tt>mmap()</tt>, reported by Konstantin Belousov.</li>
+
+	<li><tt>FreeBSD-EN-13:02.vtnet</tt>: <tt>vtnet(4)</tt>
+	  network interface issue on QEMU 1.4.0 and later in 8.4-RELEASE,
+	  reported by Julian Stecklina.</li>
+
+	<li><tt>FreeBSD-EN-13:01.fxp</tt>: <tt>dhclient(8)</tt> utility
+	  issue on <tt>fxp(4)</tt> network interface in 8.4-RELEASE,
+	  reported by Michael L. Squires.</li>
+      </ul>
+
+      <p>Per request of Baptiste Daroussin, the Security Team has also
+	reviewed the source code of Poudriere, the port build and test
+	system which is planned to be used for producing <tt>pkg(8)</tt>
+	("new-style") packages on the &os; cluster.</p>
+    </body>
+  </project>
+
+  <project cat='event'>
+    <title>BSD-Day 2013</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Gábor</given>
+	  <common>Páli</common>
+	</name>
+	<email>pgj at FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://bsdday.eu/2013">BSD-Day 2013 web site</url>
+      <url
+	href="http://www.youtube.com/playlist?list=PLJJHfhjb5TOjB-sHRwJBGWd8XA7nc1gk_">YouTube playlist of talks</url>
+      <url
+	href="https://picasaweb.google.com/116452848880746560170/BSDDay2013?authkey=Gv1sRgCNvIoMWoxNTRYw">Event photo album</url>
+    </links>
+
+    <body>
+      <p>The BSD-Day is a now recurring excuse for BSD developers and
+	users to meet up in person, share some beers and talk about what
+	they are working on these days.  There was a detour this year to
+	visit the beautiful city of Naples of Italy, the home of pizza.
+	Fortunately, the event has again gained support from numerous
+	and generous sponsors, such as the &os; Foundation, the EMC
+	Corporation, iXsystems, FreeBSDMall, BSD Magazine, and many
+	others which enabled us to cover the costs of travel and
+	accommodation for the speakers.  We are really grateful for
+	this!</p>
+
+      <p>Similarly to the previous years, the whole event started with a
+	common dinner in the downtown (somewhere around the Ireland
+	Irish Pub) on Friday which suddenly turned into a do-it-yourself
+	pizza-fest.  Then it was followed by the Saturday event at the
+	Institute of Biostructures and Bioimaging.  There we had a lot
+	of attendees for the associated BSDA exam in the morning —
+	8 persons!  The event itself had many interesting topics as
+	well, for example moving MCLinker into the BSD world,
+	organization and culture of the &os; Project, the new
+	<tt>callout(9)</tt> framework, building and testing ports with
+	Poudriere and Tinderbox, &os; in the embedded space, or building
+	reliable VPN networks with OpenBSD.  See the links in the report
+	for more.</p>
+    </body>
+  </project>
+
+  <project cat='ports'>
+    <title>xorg on &os;</title>
+
+    <contact>
+      <person>
+	<email>x11 at FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Niclas</given>
+	  <common>Zeising</common>
+	</name>
+	<email>zeising at FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Koop</given>
+	  <common>Mast</common>
+	</name>
+	<email>kwm at FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://wiki.freebsd.org/Xorg"/>
+      <url href="http://trillian.chruetertee.ch/ports/browser/trunk"/>
+    </links>
+
+    <body>
+      <p>During the beginning of this quarter, work focused on making

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-projects mailing list