Date: Sun, 23 Jun 2013 21:04:17 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r42010 - in projects/sysctl: en_US.ISO8859-1/books/fdp-primer en_US.ISO8859-1/books/fdp-primer/docbook-markup en_US.ISO8859-1/books/fdp-primer/overview en_US.ISO8859-1/books/fdp-primer/... Message-ID: <201306232104.r5NL4Hu8080700@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sun Jun 23 21:04:16 2013 New Revision: 42010 URL: http://svnweb.freebsd.org/changeset/doc/42010 Log: MFH: Merged /head/en_US.ISO8859-1:r41947-42009 Merged /head/ja_JP.eucJP:r41947-42009 Merged /head/share:r41947-42009 Approved by: doceng (implicit) Added: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/docbook-markup/ - copied from r42009, head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/ - copied from r42009, head/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/ Deleted: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/ Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/Makefile projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/chapters.ent projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml projects/sysctl/en_US.ISO8859-1/htdocs/ports/updating.xml projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/relnotes.xml projects/sysctl/en_US.ISO8859-1/htdocs/relnotes/Makefile projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml projects/sysctl/ja_JP.eucJP/share/xml/news.xml projects/sysctl/share/misc/docbook.css projects/sysctl/share/security/advisories/FreeBSD-SA-13:06.mmap.asc projects/sysctl/share/xml/news.xml Directory Properties: projects/sysctl/en_US.ISO8859-1/ (props changed) projects/sysctl/ja_JP.eucJP/ (props changed) projects/sysctl/share/ (props changed) Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/Makefile ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/fdp-primer/Makefile Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/Makefile Sun Jun 23 21:04:16 2013 (r42010) @@ -23,7 +23,8 @@ SRCS= book.xml SRCS+= overview/chapter.xml SRCS+= psgml-mode/chapter.xml SRCS+= see-also/chapter.xml -SRCS+= sgml-markup/chapter.xml +SRCS+= xhtml-markup/chapter.xml +SRCS+= docbook-markup/chapter.xml SRCS+= sgml-primer/chapter.xml SRCS+= stylesheets/chapter.xml SRCS+= structure/chapter.xml Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -57,6 +57,10 @@ <year>2007</year> <year>2008</year> <year>2009</year> + <year>2010</year> + <year>2011</year> + <year>2012</year> + <year>2013</year> <holder role="mailto:doceng@FreeBSD.org">DocEng</holder> </copyright> @@ -70,15 +74,14 @@ <para>Thank you for becoming a part of the FreeBSD Documentation Project. Your contribution is extremely valuable.</para> - <para>This primer covers everything you will need to know in - order to start contributing to the FreeBSD Documentation - Project, from the tools and software you will be using (both + <para>This primer covers details needed + to start contributing to the FreeBSD Documentation + Project, from the tools and software (both mandatory and recommended) to the philosophy behind the Documentation Project.</para> - <para>This document is a work in progress, and is not complete. - Sections that are known to be incomplete are indicated with a - <literal>*</literal> in their name.</para> + <para>This document is a work in progress. Corrections and + additions are welcomed.</para> </abstract> </bookinfo> @@ -245,7 +248,8 @@ Password:</screen></entry> &chap.overview; &chap.tools; &chap.xml-primer; - &chap.xml-markup; + &chap.xhtml-markup; + &chap.docbook-markup; &chap.stylesheets; &chap.structure; &chap.doc-build; Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/chapters.ent ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/fdp-primer/chapters.ent Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/chapters.ent Sun Jun 23 21:04:16 2013 (r42010) @@ -13,7 +13,8 @@ <!ENTITY chap.overview SYSTEM "overview/chapter.xml"> <!ENTITY chap.xml-primer SYSTEM "sgml-primer/chapter.xml"> <!ENTITY chap.tools SYSTEM "tools/chapter.xml"> -<!ENTITY chap.xml-markup SYSTEM "sgml-markup/chapter.xml"> +<!ENTITY chap.xhtml-markup SYSTEM "xhtml-markup/chapter.xml"> +<!ENTITY chap.docbook-markup SYSTEM "docbook-markup/chapter.xml"> <!ENTITY chap.stylesheets SYSTEM "stylesheets/chapter.xml"> <!ENTITY chap.structure SYSTEM "structure/chapter.xml"> <!ENTITY chap.the-website SYSTEM "the-website/chapter.xml"> Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -211,7 +211,8 @@ to the tags which surround the text or the entities that represent that text in the <acronym>XML</acronym> file. A reference to the commonly used tags and entities can be - found in <xref linkend="xml-markup"/>.</para> + found in <xref linkend="xhtml-markup"/> and + <xref linkend="docbook-markup"/>.</para> </step> <step> @@ -291,4 +292,4 @@ </step> </procedure> </sect1> - </chapter> \ No newline at end of file + </chapter> Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -34,142 +34,230 @@ <chapter id="writing-style"> <title>Writing Style</title> - <para>In order to promote consistency between the myriad authors of - the FreeBSD documentation, some guidelines have been drawn up for - authors to follow.</para> - - <variablelist> - <varlistentry> - <term>Use American English Spelling</term> - - <listitem> - <para>There are several variants of English, with different - spellings for the same word. Where spellings differ, use - the American English variant. <quote>color</quote>, not - <quote>colour</quote>, <quote>rationalize</quote>, not - <quote>rationalise</quote>, and so on.</para> - - <note> - <para>The use of British English may be accepted in the case - of a contributed article, however the spelling must be - consistent within the whole document. The other documents - such as books, web site, manual pages, etc. will have to - use American English.</para> - </note> - </listitem> - </varlistentry> - - <varlistentry> - <term>Do not use contractions</term> - - <listitem> - <para>Do not use contractions. Always spell the phrase out in - full. <quote>Don't use contractions</quote> would be - wrong.</para> - - <para>Avoiding contractions makes for a more formal tone, is - more precise, and is slightly easier for translators.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Use the serial comma</term> - - <listitem> - <para>In a list of items within a paragraph, separate each - item from the others with a comma. Separate the last item - from the others with a comma and the word - <quote>and</quote>.</para> - - <para>For example, look at the following:</para> - - <blockquote> - <para>This is a list of one, two and three items.</para> - </blockquote> - - <para>Is this a list of three items, <quote>one</quote>, - <quote>two</quote>, and <quote>three</quote>, or a list of - two items, <quote>one</quote> and <quote>two and - three</quote>?</para> - - <para>It is better to be explicit and include a serial - comma:</para> - - <blockquote> - <para>This is a list of one, two, and three items.</para> - </blockquote> - </listitem> - </varlistentry> - - <varlistentry> - <term>Avoid redundant phrases</term> - - <listitem> - <para>Try not to use redundant phrases. In particular, - <quote>the command</quote>, <quote>the file</quote>, and - <quote>man command</quote> are probably redundant.</para> + <sect1 id="writing-style-tips"> + <title>Tips</title> - <para>These two examples show this for commands. The second - example is preferred.</para> + <para>Technical documentation can be improved by consistent use of + several principes. Most of these can be classified into three + goals: <emphasis>be clear</emphasis>, + <emphasis>be complete</emphasis>, and + <emphasis>be concise</emphasis>. These goals can conflict with + each other. Good writing consists of a balance between + them.</para> + + <sect2 id="writing-style-be-clear"> + <title>Be Clear</title> + + <para>Clarity is extremely important. The reader may be a + novice, or reading the document in a second language. Strive + for simple, uncomplicated text that clearly explains the + concepts.</para> - <informalexample> - <para>Use the command <command>svn</command> to update - your sources.</para> - </informalexample> + <para>Avoid flowery or embellished speech, jokes, or colloquial + expressions. Write as simply and clearly as possible. Simple + text is easier to understand and translate.</para> - <informalexample> - <para>Use <command>svn</command> to update your - sources.</para> - </informalexample> + <para>Keep explanations as short, simple, and clear as possible. + Avoid empty phrases like <quote>in order to</quote>, which + usually just means <quote>to</quote>. Avoid potentially + patronizing words like <quote>basically</quote>. Avoid Latin + terms like <quote>i.e.</quote> or <quote>cf.</quote>, which + may be unknown outside of academic or scientific + groups.</para> - <para>These two examples show this for filenames. The second - example is preferred.</para> + <para>Write in a formal style. Avoid addressing the reader + as <quote>you</quote>. For example, say + <quote>copy the file to <filename>/tmp</filename></quote> + rather than <quote>you can copy the file to + <filename>/tmp</filename></quote>.</para> - <informalexample> - <para>… in the filename - <filename>/etc/rc.local</filename>…</para> - </informalexample> + <para>Give clear, correct examples. A trivial example is better + than no example, but a good example is better yet. Do not + give bad examples, identifiable by apologies or sentences like + <quote>but really it should never be done that way</quote>. + Bad examples are worse than no examples. Give good examples, + because <emphasis>even when warned not to use the example + as shown</emphasis>, the reader will usually just use the + example as shown.</para> - <informalexample> - <para>… in - <filename>/etc/rc.local</filename>…</para> - </informalexample> + <para>Avoid <emphasis>weasel words</emphasis> like + <quote>should</quote>, <quote>might</quote>, + <quote>try</quote>, or <quote>could</quote>. These words + imply that the speaker is unsure of the facts, and + create doubt in the reader.</para> - <para>These two examples show this for manual references. The - second example is preferred (the second example uses - <sgmltag>citerefentry</sgmltag>).</para> + <para>Similarly, give instructions as imperative commands: not + <quote>you should do this</quote>, but merely + <quote>do this</quote>.</para> + </sect2> - <informalexample> - <para>See <command>man csh</command> for more - information.</para> - </informalexample> + <sect2 id="writing-style-be-complete"> + <title>Be Complete</title> - <informalexample> - <para>See &man.csh.1;.</para> - </informalexample> - </listitem> - </varlistentry> - <varlistentry> - <term>Two spaces at the end of sentences</term> - - <listitem> - <para>Always use two spaces at the end of sentences, as this - improves readability, and eases use of tools such as - <application>Emacs</application>.</para> - - <para>While it may be argued that a capital letter following - a period denotes a new sentence, this is not the case, - especially in name usage. <quote>Jordan K. Hubbard</quote> - is a good example; it has a capital <literal>H</literal> - following a period and a space, and there certainly is not a - new sentence there.</para> - </listitem> - </varlistentry> - </variablelist> - - <para>For more information about writing style, see <ulink - url="http://www.bartleby.com/141/">Elements of - Style</ulink>, by William Strunk.</para> + <para>Do not make assumptions about the reader's abilities or + skill level. Tell them what they need to know. Give links to + other documents to provide background information without + having to recreate it. Put yourself in the reader's place, + anticipate the questions they will ask, and answer + them.</para> + </sect2> + + <sect2 id="writing-style-be-concise"> + <title>Be Concise</title> + + <para>While features should be documented completely, sometimes + there is so much information that the reader cannot easily + find the specific detail needed. The balance between being + complete and being concise is a challenge. One approach is to + have an introduction, then a <quote>quick start</quote> + section that describes the most common situation, followed by + an in-depth reference section.</para> + </sect2> + </sect1> + + <sect1 id="writing-style-guidelines"> + <title>Guidelines</title> + + <para>To promote consistency between the myriad authors of the + FreeBSD documentation, some guidelines have been drawn up for + authors to follow.</para> + + <variablelist> + <varlistentry> + <term>Use American English Spelling</term> + + <listitem> + <para>There are several variants of English, with different + spellings for the same word. Where spellings differ, use + the American English variant. <quote>color</quote>, not + <quote>colour</quote>, <quote>rationalize</quote>, not + <quote>rationalise</quote>, and so on.</para> + + <note> + <para>The use of British English may be accepted in the + case of a contributed article, however the spelling must + be consistent within the whole document. The other + documents such as books, web site, manual pages, etc. + will have to use American English.</para> + </note> + </listitem> + </varlistentry> + + <varlistentry> + <term>Do not use contractions</term> + + <listitem> + <para>Do not use contractions. Always spell the phrase out + in full. <quote>Don't use contractions</quote> would be + wrong.</para> + + <para>Avoiding contractions makes for a more formal tone, is + more precise, and is slightly easier for + translators.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>Use the serial comma</term> + + <listitem> + <para>In a list of items within a paragraph, separate each + item from the others with a comma. Separate the last item + from the others with a comma and the word + <quote>and</quote>.</para> + + <para>For example, look at the following:</para> + + <blockquote> + <para>This is a list of one, two and three items.</para> + </blockquote> + + <para>Is this a list of three items, <quote>one</quote>, + <quote>two</quote>, and <quote>three</quote>, or a list of + two items, <quote>one</quote> and <quote>two and + three</quote>?</para> + + <para>It is better to be explicit and include a serial + comma:</para> + + <blockquote> + <para>This is a list of one, two, and three items.</para> + </blockquote> + </listitem> + </varlistentry> + + <varlistentry> + <term>Avoid redundant phrases</term> + + <listitem> + <para>Try not to use redundant phrases. In particular, + <quote>the command</quote>, <quote>the file</quote>, and + <quote>man command</quote> are probably redundant.</para> + + <para>These two examples show this for commands. The second + example is preferred.</para> + + <informalexample> + <para>Use the command <command>svn</command> to update + your sources.</para> + </informalexample> + + <informalexample> + <para>Use <command>svn</command> to update your + sources.</para> + </informalexample> + + <para>These two examples show this for filenames. The + second example is preferred.</para> + + <informalexample> + <para>… in the filename + <filename>/etc/rc.local</filename>…</para> + </informalexample> + + <informalexample> + <para>… in + <filename>/etc/rc.local</filename>…</para> + </informalexample> + + <para>These two examples show this for manual references. + The second example is preferred (the second example uses + <sgmltag>citerefentry</sgmltag>).</para> + + <informalexample> + <para>See <command>man csh</command> for more + information.</para> + </informalexample> + + <informalexample> + <para>See &man.csh.1;.</para> + </informalexample> + </listitem> + </varlistentry> + + <varlistentry> + <term>Two spaces at the end of sentences</term> + + <listitem> + <para>Always use two spaces at the end of sentences, as this + improves readability, and eases use of tools such as + <application>Emacs</application>.</para> + + <para>While it may be argued that a capital letter following + a period denotes a new sentence, this is not the case, + especially in name usage. + <quote>Jordan K. Hubbard</quote> is a good example; it has + a capital <literal>H</literal> following a period and a + space, and there certainly is not a new sentence + there.</para> + </listitem> + </varlistentry> + </variablelist> + + <para>For more information about writing style, see <ulink + url="http://www.bartleby.com/141/">Elements of + Style</ulink>, by William Strunk.</para> + </sect1> <sect1 id="writing-style-guide"> <title>Style Guide</title> @@ -212,61 +300,6 @@ mouseovers to be rendered with the fully expanded term.</para> </sect2> - <sect2 id="writing-style-beformal"> - <title>Be Formal</title> - - <para>Write in a formal style. Avoid addressing the reader - as <quote>you</quote>. For example, say - <quote>copy the file to <filename>/tmp</filename></quote> - rather than <quote>you can copy the file to - <filename>/tmp</filename></quote>.</para> - </sect2> - - <sect2 id="writing-style-confident"> - <title>Be Confident</title> - - <para>Avoid <emphasis>weasel words</emphasis> like - <quote>should</quote>, <quote>might</quote>, - <quote>try</quote>, or <quote>could</quote>. These words - imply that the speaker is unsure of the facts, and - create doubt in the reader.</para> - </sect2> - - <sect2 id="writing-style-imperative"> - <title>Be Imperative</title> - - <para>Give instructions as an imperative command: not - <quote>you should do this</quote>, but merely - <quote>do this</quote>.</para> - </sect2> - - <sect2 id="writing-style-simple"> - <title>Be Simple</title> - - <para>Avoid flowery or embellished speech, jokes, or colloquial - expressions. Write as simply and clearly as possible. Simple - text is easier to understand and makes the job of translation - easier.</para> - - <para>Keep explanations as short, simple, and clear as possible. - Avoid empty phrases like <quote>in order to</quote>, which - usually just means <quote>to</quote>. Avoid potentially - patronizing words like <quote>basically</quote>. Avoid Latin - terms like <quote>i.e.</quote> or <quote>cf.</quote>, which - may be unknown outside of academic or scientific - groups.</para> - </sect2> - - <sect2 id="writing-style-threecs"> - <title>Use the <quote>Three C</quote> Approach</title> - - <para>Writing must be <emphasis>clear</emphasis>, - <emphasis>complete</emphasis>, and - <emphasis>concise</emphasis>. These goals can conflict with - each other. Good writing consists of a balance between - them.</para> - </sect2> - <sect2> <title>Indentation</title> @@ -459,7 +492,7 @@ GB. Hardware compression …</lite <para>This list of words shows the correct spelling and capitalization when used in FreeBSD Documentation. If a word is - not on this list, ask about that word on the &a.doc;.</para> + not on this list, ask about it on the &a.doc;.</para> <informaltable frame="none" pgwide="0"> <tgroup cols="2"> @@ -473,12 +506,12 @@ GB. Hardware compression …</lite <tbody> <row> <entry>CD-ROM</entry> - <entry><![CDATA[<acronym>CD-ROM</acronym>]]></entry> + <entry><literal><acronym>CD-ROM</acronym></literal></entry> </row> <row> <entry>DoS (Denial of Service)</entry> - <entry><![CDATA[<acronym>DoS</acronym>]]></entry> + <entry><literal><acronym>DoS</acronym></literal></entry> </row> <row> @@ -511,6 +544,7 @@ GB. Hardware compression …</lite <row> <entry>Ports Collection</entry> + <entry>Ports&nbsp;Collection</entry> </row> <row> @@ -523,7 +557,7 @@ GB. Hardware compression …</lite <row> <entry>&unix;</entry> - <entry><![CDATA[&unix;]]></entry> + <entry><literal>&unix;</literal></entry> </row> <row> Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -222,7 +222,7 @@ <para>A file system is created on the new blank disk:</para> - <screen>&prompt.root; <userinput>newfs -U /dev/ada1</userinput></screen> + <screen>&prompt.root; <userinput>newfs -U /dev/ada1p1</userinput></screen> <para>An empty directory is created as a <emphasis>mountpoint</emphasis>, a location for mounting the new @@ -234,7 +234,7 @@ <filename>/etc/fstab</filename> so the new disk will be mounted automatically at startup:</para> - <programlisting>/dev/ada1 /newdisk ufs rw 2 2</programlisting> + <programlisting>/dev/ada1p1 /newdisk ufs rw 2 2</programlisting> <para>The new disk can be mounted manually, without restarting the system:</para> Modified: projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -18,7 +18,7 @@ <corpauthor>The FreeBSD Documentation Project</corpauthor> </authorgroup> - <pubdate>April 2000</pubdate> + <pubdate>$FreeBSD$</pubdate> <copyright> <year>2000</year> Modified: projects/sysctl/en_US.ISO8859-1/htdocs/ports/updating.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/htdocs/ports/updating.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/htdocs/ports/updating.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -27,9 +27,9 @@ where that might seem counterintuitive ( </p> <p>Changes that affect the entire port system are now documented in the -<a href="http://cvsweb.FreeBSD.org/ports/CHANGES">CHANGES</a>; file. +<a href="http://svnweb.FreeBSD.org/ports/head/CHANGES?view=markup">CHANGES</a>; file. Changes that affect individual ports are now documented in the -<a href="http://cvsweb.FreeBSD.org/ports/UPDATING">UPDATING</a>; file. +<a href="http://svnweb.FreeBSD.org/ports/head/UPDATING?view=markup">UPDATING</a>; file. </p> <p>For more information about new, changed or removed ports/packages, Modified: projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -65,7 +65,7 @@ <h2><a name="freeze" id="freeze">Code-Freeze Status</a></h2> <p>The following table lists the code freeze status for the major - branches of the <tt>src/</tt> subtree of the FreeBSD CVS + branches of the <tt>src/</tt> subtree of the FreeBSD Subversion repository. Commits to any branch listed as "frozen" must first be reviewed and approved by the relevant contact party. The status of other subtrees such as <tt>ports/</tt> and <tt>doc/</tt>, Modified: projects/sysctl/en_US.ISO8859-1/htdocs/relnotes.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/htdocs/relnotes.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/htdocs/relnotes.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -75,7 +75,7 @@ <li><a href="&base;/relnotes/CURRENT/errata/index.html">Errata</a></li> </ul> - <!-- + <h3>FreeBSD 9-STABLE Release Documentation</h3> <ul> @@ -87,7 +87,7 @@ <li><a href="&base;/relnotes/9-STABLE/errata/index.html">Errata</a></li> </ul> - --> + <h3>FreeBSD 8-STABLE Release Documentation</h3> <ul> @@ -100,50 +100,6 @@ <li><a href="&base;/relnotes/8-STABLE/errata/index.html">Errata</a></li> </ul> - <h3>FreeBSD 7-STABLE Release Documentation</h3> - - <ul> - <li><a href="&base;/relnotes/7-STABLE/readme/index.html">README</a></li> - - <li><a href="&base;/relnotes/7-STABLE/relnotes/index.html">Release Notes</a></li> - - <li><a href="&base;/relnotes/7-STABLE/hardware/index.html">Hardware Notes</a></li> - - <li><a href="&base;/relnotes/7-STABLE/errata/index.html">Errata</a></li> - </ul> - - <h3>FreeBSD 6-STABLE Release Documentation</h3> - - <ul> - <li><a href="&base;/relnotes/6-STABLE/readme/index.html">README</a></li> - - <li>Release Notes: - <a href="&base;/relnotes/6-STABLE/relnotes/alpha/index.html">alpha</a>, - <a href="&base;/relnotes/6-STABLE/relnotes/amd64/index.html">amd64</a>, - <a href="&base;/relnotes/6-STABLE/relnotes/i386/index.html">i386</a>, - <a href="&base;/relnotes/6-STABLE/relnotes/ia64/index.html">ia64</a>, - <a href="&base;/relnotes/6-STABLE/relnotes/pc98/index.html">pc98</a>, - <a href="&base;/relnotes/6-STABLE/relnotes/sparc64/index.html">sparc64</a></li> - - <li>Hardware Notes: - <a href="&base;/relnotes/6-STABLE/hardware/alpha/index.html">alpha</a>, - <a href="&base;/relnotes/6-STABLE/hardware/amd64/index.html">amd64</a>, - <a href="&base;/relnotes/6-STABLE/hardware/i386/index.html">i386</a>, - <a href="&base;/relnotes/6-STABLE/hardware/ia64/index.html">ia64</a>, - <a href="&base;/relnotes/6-STABLE/hardware/pc98/index.html">pc98</a>, - <a href="&base;/relnotes/6-STABLE/hardware/sparc64/index.html">sparc64</a></li> - - <li>Installation Instructions: - <a href="&base;/relnotes/6-STABLE/installation/alpha/index.html">alpha</a>, - <a href="&base;/relnotes/6-STABLE/installation/amd64/index.html">amd64</a>, - <a href="&base;/relnotes/6-STABLE/installation/i386/index.html">i386</a>, - <a href="&base;/relnotes/6-STABLE/installation/ia64/index.html">ia64</a>, - <a href="&base;/relnotes/6-STABLE/installation/pc98/index.html">pc98</a>, - <a href="&base;/relnotes/6-STABLE/installation/sparc64/index.html">sparc64</a></li> - - <li><a href="&base;/relnotes/6-STABLE/errata/index.html">Errata</a></li> - </ul> - <h2>Other Sites</h2> <p>Single-file HTML, PDF, and text renderings of the release Modified: projects/sysctl/en_US.ISO8859-1/htdocs/relnotes/Makefile ============================================================================== --- projects/sysctl/en_US.ISO8859-1/htdocs/relnotes/Makefile Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/en_US.ISO8859-1/htdocs/relnotes/Makefile Sun Jun 23 21:04:16 2013 (r42010) @@ -13,6 +13,8 @@ .include "../Makefile.inc" .endif -RELNOTES?= CURRENT ${DOC_PREFIX}/../relnotes/doc/${LANGCODE} +RELNOTES?= CURRENT ${DOC_PREFIX}/../relnotes/doc/${LANGCODE} \ + 9-STABLE ${DOC_PREFIX}/../relnotes9/doc/${LANGCODE} \ + 8-STABLE ${DOC_PREFIX}/../relnotes8/doc/${LANGCODE} .include "Makefile.inc" Modified: projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml ============================================================================== --- projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -6,7 +6,7 @@ ]> <!-- $FreeBSD$ --> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r41801 --> +<!-- Original revision: r41946 --> <html xmlns="http://www.w3.org/1999/xhtml">; <head> @@ -79,6 +79,13 @@ <td>最終リリース後 2 年</td> </tr> <tr> + <td>RELENG_8_4</td> + <td>8.4-RELEASE</td> + <td>Extended</td> + <td>2013 年 6 月 9 日</td> + <td>2015 年 6 月 30 日</td> + </tr> + <tr> <td>RELENG_8_3</td> <td>8.3-RELEASE</td> <td>Extended</td> Modified: projects/sysctl/ja_JP.eucJP/share/xml/news.xml ============================================================================== --- projects/sysctl/ja_JP.eucJP/share/xml/news.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/ja_JP.eucJP/share/xml/news.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -20,7 +20,7 @@ the contents of <title> will be preferred over <p>. $FreeBSD$ - Original revision: r41851 + Original revision: r41991 --> <news> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">; @@ -34,6 +34,38 @@ <name>6</name> <day> + <name>19</name> + + <event> + <title>誕生日おめでとう &os;!</title> + + <p>本日、&os; は + <a href="http://FreeBSD.org/news/1993/freebsd-coined.html">20 + 歳</a> を迎えました。 + 1993 年 6 月 19 日、Jordan Hubbard, Rod Grimes および + David Greenman は、BSD 4.3 + オペレーティングシステムから新しいプロジェクトがスタートしたことを世界にアナウンスしました。</p> + + <p>&os; は、Bill と Lynne Jolitz の 386BSD 0.1 + リリースから派生し、1993 年の 11 月に 1.0 がリリースされました。 + 最初の目標は、高速、安全でかつ信頼性の高い + i386 システムのサーバ用オペレーティングシステムを作成することでした。</p> + + <p>それ以降、数えきれないほどのプロダクトのバックボーンに採用され、 + 64 ビットシステム、組み込みデバイスおよびデスクトプをサポートするまでに成長しました。</p> + </event> + </day> + + <day> + <name>11</name> + + <event> + <p>新コミッタ就任: + <a href="mailto:vg@FreeBSD.org">Veniamin Gvozdikov</a> (ports)</p> + </event> + </day> + + <day> <name>7</name> <event> Modified: projects/sysctl/share/misc/docbook.css ============================================================================== --- projects/sysctl/share/misc/docbook.css Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/share/misc/docbook.css Sun Jun 23 21:04:16 2013 (r42010) @@ -321,7 +321,7 @@ div.programlisting { margin-right: 0; } -.note p, .tip p, .important p, .warning p, .caution p, .example p { +.note p, .tip p, .important p, .warning p, .caution p, { display: inline; } Modified: projects/sysctl/share/security/advisories/FreeBSD-SA-13:06.mmap.asc ============================================================================== --- projects/sysctl/share/security/advisories/FreeBSD-SA-13:06.mmap.asc Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/share/security/advisories/FreeBSD-SA-13:06.mmap.asc Sun Jun 23 21:04:16 2013 (r42010) @@ -13,14 +13,20 @@ Announced: 2013-06-18 Credits: Konstantin Belousov Alan Cox Affects: FreeBSD 9.0 and later -Corrected: 2013-06-18 09:04:19 UTC (stable/9, 9.1-STABLE) - 2013-06-18 09:05:51 UTC (releng/9.1, 9.1-RELEASE-p4) +Corrected: 2013-06-18 07:04:19 UTC (stable/9, 9.1-STABLE) + 2013-06-18 07:05:51 UTC (releng/9.1, 9.1-RELEASE-p4) CVE Name: CVE-2013-2171 For general information regarding FreeBSD Security Advisories, including descriptions of the fields above, security branches, and the following sections, please visit <URL:http://security.FreeBSD.org/>. +0. Revision History + +v1.0 2013-06-18 Initial release. +v1.1 2013-06-21 Corrected correction date. + Added workaround information. + I. Background The FreeBSD virtual memory system allows files to be memory-mapped. @@ -51,7 +57,23 @@ arbitrary code with user privileges on t IV. Workaround -No workaround is available. +Systems that do not allow unprivileged users to use the ptrace(2) +system call are not vulnerable, this can be accomplished by setting +the sysctl variable security.bsd.unprivileged_proc_debug to zero. +Please note that this will also prevent debugging tools, for instance +gdb, truss, procstat, as well as some built-in debugging facilities in +certain scripting language like PHP, etc., from working for unprivileged +users. + +The following command will set the sysctl accordingly and works until the +next reboot of the system: + + sysctl security.bsd.unprivileged_proc_debug=0 + +To make this change persistent across reboot, the system administrator +should also add the setting into /etc/sysctl.conf: + + echo 'security.bsd.unprivileged_proc_debug=0' >> /etc/sysctl.conf V. Solution @@ -112,16 +134,13 @@ Or visit the following URL, replacing XX VII. References -<other info on vulnerability> - <URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-2171>; The latest revision of this advisory is available at <URL:http://security.FreeBSD.org/advisories/FreeBSD-SA-13:06.mmap.asc>; -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.13 (FreeBSD) -iEYEARECAAYFAlHAB+YACgkQFdaIBMps37IjFACdFSoiYO1YkcPunLh7Zw4TC6MF -X9MAnjjVWB2uEl60Rl3K4WOuJ71AVNlP -=8309 +iEYEARECAAYFAlHExy0ACgkQFdaIBMps37L8PwCdGXatzPm7OWjZu+GmbbXQC16/ +8sgAoJ0LEmREO8Mp7f4YcLHAEwgnJtjT +=WRZD -----END PGP SIGNATURE----- Modified: projects/sysctl/share/xml/news.xml ============================================================================== --- projects/sysctl/share/xml/news.xml Sun Jun 23 20:28:38 2013 (r42009) +++ projects/sysctl/share/xml/news.xml Sun Jun 23 21:04:16 2013 (r42010) @@ -34,6 +34,29 @@ <name>6</name> <day> + <name>19</name> + + <event> + <title>Happy Birthday &os;!</title> + + <p>&os; celebrated its + <a href="http://FreeBSD.org/news/1993/freebsd-coined.html">20th birthday</a> + today. On June 19, 1993, Jordan Hubbard, Rod Grimes, and + David Greenman announced to the world the creation of + their new fork of the BSD 4.3 operating system.</p> + + <p>&os; was derived from the 386BSD 0.1 release from Bill and + Lynne Jolitz with its 1.0 release in Nov 1993. Its + stated goals were to create a fast, stable, reliable + server OS for i386 systems.</p> + + <p>Since then, it has become the backbone of countless + products and has grown to supporting 64bit computing, + embedded devices, and desktop users.</p> + </event> + </day> + + <day> <name>11</name> <event>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306232104.r5NL4Hu8080700>