--- a/matlab.org	Wed May 11 10:42:47 2011 +0530
+++ b/matlab.org	Wed May 11 10:54:08 2011 +0530
@@ -74,6 +74,6 @@
 
 ** Learning Resources for Octave
    - http://www.gnu.org/software/octave/
-
+   - http://en.wikibooks.org/wiki/Octave_Programming_Tutorial/Getting_started
 ** Where Octave is used/Octave Support
    - yet to be added

--- a/software.org	Wed May 11 10:42:47 2011 +0530
+++ b/software.org	Wed May 11 10:54:08 2011 +0530
@@ -22,8 +22,8 @@
 | Commercial Software                                  | Recommended FOSS Equivalent | Other Packages |
 |------------------------------------------------------+-----------------------------+----------------|
 | MATLAB                                               | [[file:matlab.org::sec-1][Scilab]]                      | [[file:matlab.org::sec-2][Octave]]         |
-| AutoCad                                              |                             | KiCad          |
-|                                                      |                             | Freecad        |
+| AutoCad                                              |                             | [[file:autocad.org::sec-1][KiCAD]]          |
+|                                                      |                             | [[file:autocad.org::sec-2][Freecad]]        |
 | Mathematica                                          | Sage                        | Maxima         |
 | Maple                                                | Sage                        | Maxima         |
 | Turbo C                                              | GCC                         |                |