[Gzz-commits] manuscripts/UMLLink article.rst

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/15 16:57:57

Modified files:
        UMLLink        : article.rst 

Log message:
        Ouch, conflict... here's my version

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/UMLLink/article.rst.diff?tr1=1.93&tr2=1.94&r1=text&r2=text

Patches:
Index: manuscripts/UMLLink/article.rst
diff -u manuscripts/UMLLink/article.rst:1.93 
manuscripts/UMLLink/article.rst:1.94
--- manuscripts/UMLLink/article.rst:1.93        Sat Feb 15 16:53:09 2003
+++ manuscripts/UMLLink/article.rst     Sat Feb 15 16:57:57 2003
@@ -9,7 +9,7 @@
 .. Alternative title: "Free Software toolchain for bidirectional 
    linking between UML diagrams and Javadoc"
 
-.. :Stamp: $Id: article.rst,v 1.93 2003/02/15 21:53:09 humppake Exp $
+.. :Stamp: $Id: article.rst,v 1.94 2003/02/15 21:57:57 tjl Exp $
 
 .. Points for HT people
    ====================
@@ -462,26 +462,30 @@
    Linking possibilities from items in different kinds of UML diagrams 
    to Javadoc.
 
-   +----------------------+---------------------+--------------------+
-   | Conceptual           | Specification       | Implementation     |
-   +======================+=====================+====================+
-   | probably no links    | can link Java       | can link all       |
-   | to javadoc           | interface and       | classes            |
-   |                      | some classes        |                    |
-   +----------------------+---------------------+--------------------+
-   | the design           | can link Java       | can link all       |
-   | documentation        | interfaces, some    | packages           |
-   | packages could be    | classes and also    |                    |
-   | linked with related  | packages            |                    |
-   | design documents     |                     |                    |
-   |                      |                     |                    |
-   +----------------------+---------------------+--------------------+
-   | concepts could be    |                     |                    |
-   | linked with the      |                     |                    |
-   | classes that         |                     |                    |
-   | eventially           |                     |                    |
-   | implement it         |                     |                    |
-   +----------------------+---------------------+--------------------+
+   +---------------------+---------------------+--------------------+
+   | Conceptual          | Specification       | Implementation     |
+   +=====================+=====================+====================+
+   | probably no links   | can link to Java    | can link to all    |
+   | to javadoc          | interface and       | classes            |
+   |                     | some classes        |                    |
+   +---------------------+---------------------+--------------------+
+   | the design          | can link to Java    | can link to Java   |
+   | documentation       | packages            | packages           |
+   | packages can be     |                     |                    |
+   | linked to      the  |                     |                    |
+   | architectural       |                     |                    |
+   | documents           |                     |                    |
+   | discussing those    |                     |                    |
+   | packages            |                     |                    |
+   +---------------------+---------------------+--------------------+
+
+
+.. XXX  | concepts could be   |                     |                    |
+   | linked with the     |                     |                    |
+   | classes that        |                     |                    |
+   | eventially          |                     |                    |
+   | implement it        |                     |                    |
+   +---------------------+---------------------+--------------------+
 
 The UML diagrams enable navigation in various purposes. Applying
 Trigg's taxonomy of different link types [trigg83link-taxonomy]_, we