A final revision making some changes in linktext and making forking

Author: mako
Date: 2001/04/10 13:21:56
A final revision making some changes in linktext and making forking
its own section so it doesn't seem like its just another section on
branching. I changed a little bit of the text of the forking section
to try and reflect this organizational change.

diff --git a/FreeSoftwareDevelopmentHOWTO.sgml b/FreeSoftwareDevelopmentHOWTO.sgml
index d85158d685b630b3e837b5f4fd936ca9b9f2c88e..6d4bd7015cc8bac70d04b13a35641ee252b0e2fc 100644 (file)
--- a/FreeSoftwareDevelopmentHOWTO.sgml
+++ b/FreeSoftwareDevelopmentHOWTO.sgml
@@ -17,6 +17,13 @@
     </address>
    </affiliation>
   </author>
     </address>
    </affiliation>
   </author>

+  <revhistory>
+   <revision>
+    <revnumber>v0.2.1</revnumber>
+    <date>10 April 2001</date>
+    <authorinitials>bch</authorinitials>
+   </revision>
+  </revhistory>

   
   <revhistory>
    <revision>
   
   <revhistory>
    <revision>


@@ -250,6 +257,13 @@
     In this version I have the pleasure of acknowledging:
    </para>
 
     In this version I have the pleasure of acknowledging:
    </para>
 

+   <para>
+    Josh Crawford, Andy King, and Jaime Davila who all read through
+    this beast and gave me feedback that has helped me make changes
+    and improvements to this document. I can't thank you guys enough
+    for your help.
+   </para>
+

    <para>
     <emphasis>Karl Fogel</emphasis>, the author of <emphasis>Open
     Source Development with CVS</emphasis> published by the Coriolis
    <para>
     <emphasis>Karl Fogel</emphasis>, the author of <emphasis>Open
     Source Development with CVS</emphasis> published by the Coriolis


@@ -393,11 +407,10 @@
     <title>Identify and articulate your idea</title>
     <para>
      Eric S. Raymond writes about how free software projects start in
     <title>Identify and articulate your idea</title>
     <para>
      Eric S. Raymond writes about how free software projects start in

-     his essay, <quote>The Cathedral and the Bazaar,</quote> which
-     comes as required reading for any free software developer. It is
-     available <ulink
-     url="http://www.tuxedo.org/~esr/writings/cathedral-bazaar/">online
-     </ulink>.
+     his essay, <ulink
+     url="http://www.tuxedo.org/~esr/writings/cathedral-bazaar/"><quote>The
+     Cathedral and the Bazaar,</quote></ulink> which comes as required
+     reading for any free software developer. It is available online .

     </para>
 
     <para>
     </para>
 
     <para>


@@ -754,8 +767,9 @@
     <para>
      The text of the <acronym>GPL</acronym> offers <ulink
      url="http://www.gnu.org/copyleft/gpl.html#SEC4">a good
     <para>
      The text of the <acronym>GPL</acronym> offers <ulink
      url="http://www.gnu.org/copyleft/gpl.html#SEC4">a good

-     description</ulink> of mechanics of applying a license to a piece
-     of software. My quick checklist for applying a license includes:
+     description of the mechanics of applying a license</ulink> to a
+     piece of software. My quick checklist for applying a license
+     includes:

     </para>
 
     <para>
     </para>
 
     <para>


@@ -1946,18 +1960,19 @@ pages for more information and options.
      freeze in effect.
     </para>
    </sect3>
      freeze in effect.
     </para>
    </sect3>

+  </sect2>

 
 

-   <sect3>
-    <title>Forking</title>
+   <sect2>
+    <title>Forks</title>

     <para>
     <para>

-     Forks are like the most extreme version of a branch. A fork is
-     when a group of developers takes code from a free software
-     project and actually starts a brand new free software
-     project with it. The most famous example of a fork was between Emacs and
-     XEmacs. Both emacsen are based on an identical code-base
-     but for technical, political, and philosophical reasons,
-     development was split into two projects which now compete with
-     each other.
+     I wasn't sure about how I would deal with forking in this
+     document (or if I would deal with forking at all). A fork is when
+     a group of developers takes code from a free software project and
+     actually starts a brand new free software project with it. The
+     most famous example of a fork was between Emacs and XEmacs. Both
+     emacsen are based on an identical code-base but for technical,
+     political, and philosophical reasons, development was split into
+     two projects which now compete with each other.

     </para>
 
     <para>
     </para>
 
     <para>


@@ -1977,7 +1992,6 @@ pages for more information and options.
      absolutely unresolvable, I recommend Fogel's book as a good place
      to start.
     </para>
      absolutely unresolvable, I recommend Fogel's book as a good place
      to start.
     </para>

-   </sect3>

   </sect2>
  </sect1>
 
   </sect2>
  </sect1>
 

diff --git a/FreeSoftwareProjectManagementHOWTO.sgml b/FreeSoftwareProjectManagementHOWTO.sgml
index d85158d685b630b3e837b5f4fd936ca9b9f2c88e..6d4bd7015cc8bac70d04b13a35641ee252b0e2fc 100644 (file)
--- a/FreeSoftwareProjectManagementHOWTO.sgml
+++ b/FreeSoftwareProjectManagementHOWTO.sgml
@@ -17,6 +17,13 @@
     </address>
    </affiliation>
   </author>
     </address>
    </affiliation>
   </author>

+  <revhistory>
+   <revision>
+    <revnumber>v0.2.1</revnumber>
+    <date>10 April 2001</date>
+    <authorinitials>bch</authorinitials>
+   </revision>
+  </revhistory>

   
   <revhistory>
    <revision>
   
   <revhistory>
    <revision>


@@ -250,6 +257,13 @@
     In this version I have the pleasure of acknowledging:
    </para>
 
     In this version I have the pleasure of acknowledging:
    </para>
 

+   <para>
+    Josh Crawford, Andy King, and Jaime Davila who all read through
+    this beast and gave me feedback that has helped me make changes
+    and improvements to this document. I can't thank you guys enough
+    for your help.
+   </para>
+

    <para>
     <emphasis>Karl Fogel</emphasis>, the author of <emphasis>Open
     Source Development with CVS</emphasis> published by the Coriolis
    <para>
     <emphasis>Karl Fogel</emphasis>, the author of <emphasis>Open
     Source Development with CVS</emphasis> published by the Coriolis


@@ -393,11 +407,10 @@
     <title>Identify and articulate your idea</title>
     <para>
      Eric S. Raymond writes about how free software projects start in
     <title>Identify and articulate your idea</title>
     <para>
      Eric S. Raymond writes about how free software projects start in

-     his essay, <quote>The Cathedral and the Bazaar,</quote> which
-     comes as required reading for any free software developer. It is
-     available <ulink
-     url="http://www.tuxedo.org/~esr/writings/cathedral-bazaar/">online
-     </ulink>.
+     his essay, <ulink
+     url="http://www.tuxedo.org/~esr/writings/cathedral-bazaar/"><quote>The
+     Cathedral and the Bazaar,</quote></ulink> which comes as required
+     reading for any free software developer. It is available online .

     </para>
 
     <para>
     </para>
 
     <para>


@@ -754,8 +767,9 @@
     <para>
      The text of the <acronym>GPL</acronym> offers <ulink
      url="http://www.gnu.org/copyleft/gpl.html#SEC4">a good
     <para>
      The text of the <acronym>GPL</acronym> offers <ulink
      url="http://www.gnu.org/copyleft/gpl.html#SEC4">a good

-     description</ulink> of mechanics of applying a license to a piece
-     of software. My quick checklist for applying a license includes:
+     description of the mechanics of applying a license</ulink> to a
+     piece of software. My quick checklist for applying a license
+     includes:

     </para>
 
     <para>
     </para>
 
     <para>


@@ -1946,18 +1960,19 @@ pages for more information and options.
      freeze in effect.
     </para>
    </sect3>
      freeze in effect.
     </para>
    </sect3>

+  </sect2>

 
 

-   <sect3>
-    <title>Forking</title>
+   <sect2>
+    <title>Forks</title>

     <para>
     <para>

-     Forks are like the most extreme version of a branch. A fork is
-     when a group of developers takes code from a free software
-     project and actually starts a brand new free software
-     project with it. The most famous example of a fork was between Emacs and
-     XEmacs. Both emacsen are based on an identical code-base
-     but for technical, political, and philosophical reasons,
-     development was split into two projects which now compete with
-     each other.
+     I wasn't sure about how I would deal with forking in this
+     document (or if I would deal with forking at all). A fork is when
+     a group of developers takes code from a free software project and
+     actually starts a brand new free software project with it. The
+     most famous example of a fork was between Emacs and XEmacs. Both
+     emacsen are based on an identical code-base but for technical,
+     political, and philosophical reasons, development was split into
+     two projects which now compete with each other.

     </para>
 
     <para>
     </para>
 
     <para>


@@ -1977,7 +1992,6 @@ pages for more information and options.
      absolutely unresolvable, I recommend Fogel's book as a good place
      to start.
     </para>
      absolutely unresolvable, I recommend Fogel's book as a good place
      to start.
     </para>

-   </sect3>

   </sect2>
  </sect1>
 
   </sect2>
  </sect1>
 

diff --git a/TODO b/TODO
index 62fe510ae3425e59f7b0b7b6ba76d2b3870dd020..4742e7beaed851fb4e1e19302e8c9f2193fbeec8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,22 +6,14 @@
   person because it is usually used more subtly in other HOWTO's (Josh
   Crawford).
 
   person because it is usually used more subtly in other HOWTO's (Josh
   Crawford).
 

+
+DocBook Issues
+=========================

 * Needs a ToC for navigation (Josh Crawford).
 
 * HTML (split) is weird. "in one place in Interacting w/ Developers,
   it refers to the previous section, Interacting w/ Developers" (Josh
   Crawford).
 
 * Needs a ToC for navigation (Josh Crawford).
 
 * HTML (split) is weird. "in one place in Interacting w/ Developers,
   it refers to the previous section, Interacting w/ Developers" (Josh
   Crawford).
 

-* "other random html bits: in "a good description of mechanics of
-  applying a license to a piece of software", "mechanica of applying a
-  license" would make better link text than "a good desctiption"...
-  your link to cathedral & bazaar would be better on the title than
-  the text "online"" (Josh Crawford).
-
-* The section on forking seems out of place. It might be something to
-  consider when startina project rather than grouping with branches
-  (which are purely organization and a very differe thing) (Josh
-  Crawford).
-

 * Still lots of spelling funk.  Mainly wrong words used places (eg
   thing instead of think) (Josh Crawford).
 * Still lots of spelling funk.  Mainly wrong words used places (eg
   thing instead of think) (Josh Crawford).