merged 94969 again

6 files changed, 22 insertions, 17 deletions

diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH
index 12676c17212..fd9256ef5b1 100644
--- a/TAO/ChangeLog.BRANCH
+++ b/TAO/ChangeLog.BRANCH
@@ -1,3 +1,12 @@
+Fri Nov  4 16:17:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/tao_idl.1:
+        * docs/compiler.html:
+        * docs/tutorials/Quoter/Simple/Client/index.html:
+        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
+        * tests/Bug_3743_Regression/run_test.pl:
+          Removed references to S.inl files.
+
 Wed Nov 23 10:17:10 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * TAO_IDL/be/be_provides.cpp:
diff --git a/TAO/TAO_IDL/tao_idl.1 b/TAO/TAO_IDL/tao_idl.1
index 002417f5a6f..94f8596bad1 100644
--- a/TAO/TAO_IDL/tao_idl.1
+++ b/TAO/TAO_IDL/tao_idl.1
@@ -16,7 +16,7 @@ is a program that is used to compile
 .I IDL
 source code.  The IDL compiler generates 9 files from each .idl file,
 the file names are obtained by taking the IDL basename and appending
-C.h, C.inl, C.cpp, S.h, S.cpp, S_T.h, S_T.inl, and S_T.cpp; the
+C.h, C.inl, C.cpp, S.h, S.inl, S.cpp, S_T.h, S_T.inl, and S_T.cpp; the
 client stubs are declared in the C.h file, the skeletons in the S.h
 file. Please see the Options list on how to get different suffixes for
 these files.
@@ -165,6 +165,9 @@ Server skeleton file name ending. Default is "S.cpp".
 .B \-sT
 Server template skeleton file name ending. Default is "S_T.cpp".
 .TP
+.B \-si
+Server inline skeleton file name ending. Default is "S.inl".
+.TP
 .B \-st
 Server's template inline file name ending. Default is "S_T.inl".
 .TP
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index bb00c007a0f..a9afc4c9c24 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -53,7 +53,7 @@ these files:) <P>
   <LI> <B><EM>Client stubs</EM></B>, <EM>i.e.</EM>, <tt>*C.h</tt>,
       <tt>*C.inl</tt>, and <tt>*C.cpp</tt>.  Pure client applications
       only need to <code>#include</code> and link with these files.
-  <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>,  <tt>*S.h</tt>, <tt>*S.inl</tt>, and
+  <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>,  <tt>*S.h</tt>, and
       <tt>*S.cpp</tt>.  Servers need to <code>#include</code> and link
       with these files. Generation of these files may be suppressed with the <tt>-SS</tt> option.
   <LI> <B><EM>Server skeleton templates</EM></B>, <EM>i.e.</EM>, <tt>*S_T.h</tt>, <tt>S_T.inl</tt>,
@@ -745,13 +745,6 @@ also receives other options that are specific to it.<p>
     <td>&nbsp;</td>
   </tr>
 
-  <tr><a name="si">
-    <td><tt>-si</tt></td>
-
-    <td>Server inline skeleton file name ending. Default is "S.inl".</td>
-    <td>&nbsp;</td>
-  </tr>
-
   <tr><a name="t">
     <td><tt>-t</tt></td>
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/index.html b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
index 26adb26483b..33a8cca7092 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
@@ -105,7 +105,7 @@ $ $ACE_ROOT/TAO/TAO_IDL/tao_idl Quoter.idl
       generated from <CODE>QuoterC.cpp</CODE>.
     </P>
     <P>
-      Similarly, <CODE>QuoterS.h</CODE>, <CODE>QuoterS.inl</CODE>
+      Similarly, <CODE>QuoterS.h</CODE>,
       and <CODE>QuoterS.cpp</CODE> contain the server-side
       <EM>skeletons</EM>. Servers must link the object files generated
       from <CODE>QuoterS.cpp</CODE> <STRONG>and</STRONG> <CODE>QuoterC.cpp</CODE>.
@@ -149,9 +149,9 @@ int main (int argc, char* argv[])
                        "" /* the ORB name, it can be anything! */);
 </PRE>
     <P>IDL supports variable-length types whose sizes are not known
-      at compile time, hence they must be dynamically allocated at run 
+      at compile time, hence they must be dynamically allocated at run
       time. <CODE>_var</CODE> types relieve us of the explicit memory
-      management of the variable-length types and thus hide the 
+      management of the variable-length types and thus hide the
       differences between fixed and variable-length structured types.
     </P>
     <P>Since the ORB initialization can fail, and in fact, any CORBA
@@ -225,9 +225,9 @@ int main (int argc, char* argv[])
     Quoter::Stock_Factory_var factory =
       Quoter::Stock_Factory::_narrow (factory_object.in ());
 </PRE>
-    <P>The <CODE>_narrow()</CODE> is used to test if a reference 
-      is of the specified type. If the reference is of the specified 
-      type, it returns a non-nil reference, else it returns a nil. 
+    <P>The <CODE>_narrow()</CODE> is used to test if a reference
+      is of the specified type. If the reference is of the specified
+      type, it returns a non-nil reference, else it returns a nil.
     </P>
     <P>There are a few interesting things about TAO:  First, it supports
       the <CODE>file:</CODE> scheme for object references, so the first
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index ddfff9c21e6..fffd0bf4161 100755
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::TestTarget;
 
 $status = 0;
 
-my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp", "testS.inl");
+my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp");
 
 # The location of the IFR_Service binary
 my $ifr_service_bin = "../../IFR_Service";
diff --git a/TAO/tests/Bug_3743_Regression/run_test.pl b/TAO/tests/Bug_3743_Regression/run_test.pl
index d1079904971..1ddd6b7b05c 100755
--- a/TAO/tests/Bug_3743_Regression/run_test.pl
+++ b/TAO/tests/Bug_3743_Regression/run_test.pl
@@ -21,7 +21,7 @@ if (exists $ENV{HOST_ROOT}) {
 my $test_idlfile = $test->LocalFile ("Test.idl");
 
 # Files to delete after test
-my @generated_files = ("TestC.cpp", "TestS.cpp", "TestC.inl", "TestS.inl", "Test.skel.h", "Test.stub.h");
+my @generated_files = ("TestC.cpp", "TestS.cpp", "TestC.inl", "Test.skel.h", "Test.stub.h");
 
 # The IDL compiler
 $TAO_IDL = $test->CreateProcess ("$tao_idl");