Updated usage and man page of slice compilers

9 files changed, 241 insertions, 166 deletions

diff --git a/man/man1/slice2cpp.1 b/man/man1/slice2cpp.1
index 96339658fda..e7d6bcbc2e2 100644
--- a/man/man1/slice2cpp.1
+++ b/man/man1/slice2cpp.1
@@ -10,11 +10,12 @@ slice2cpp [options] [files]
 
 .SH DESCRIPTION
 
-slice2cpp compiles Slice files to C++.
+slice2cpp compiles Slice files to C++. The macro __SLICE2CPP__
+is defined during this compilation.
 
 Full documentation for slice2cpp is available online at:
 .br
-"https://doc.zeroc.com/display/Ice37/slice2cpp+Command-Line+Options".
+https://doc.zeroc.com/display/Ice37/slice2cpp+Command-Line+Options
 
 .SH OPTIONS
 
@@ -34,7 +35,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -63,15 +64,30 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
+.BR \-\-depend\fR
 .br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
 
 .TP
-.BR \-\-underscore\fR
+.BR \-\-depend\-xml\fR
 .br
-Permit use of underscores in Slice identifiers.
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
+
+.TP
+.BR \-\-depend\-file " " FILE\fR
+.br
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
+
+.TP
+.BR \-\-validate\fR
+.br
+Checks the provided command-line options for correctness, and does not
+generate any code.
 
 .TP
 .BR \-\-header-ext " " EXT\fR
@@ -100,38 +116,29 @@ Modifies #include directives in source files to prepend the path name of each
 header file with the directory DIR.
 
 .TP
-.BR \-\-impl\fR
+.BR \-\-impl\-c++11\fR
 .br
-Generate sample implementation files. This option will not overwrite an 
-existing file.
-
-.TP
-.BR \-\-depend\fR
-Prints makefile dependency information to standard output.
+Generate sample implementation files for the C++11 mapping. This option will
+not overwrite an existing file.
 
 .TP
-.BR \-\-dll-export " " SYMBOL\fR
+.BR \-\-impl\-c++98\fR
 .br
-Use SYMBOL to control DLL exports or imports. This option allows you to
-selectively export or import global symbols in the generated code.
+Generate sample implementation files for the C++98 mapping. This option will
+not overwrite an existing file.
 
 .TP
 .BR \-\-checksum\fR
 .br
 Generate checksums for Slice definitions.
 
-.TP
-.BR \-\-stream\fR
-.br
-Generate streaming helper functions for Slice types.
 
 .SH SEE ALSO
 
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
+.BR slice2js (1),
 .BR slice2php (1),
 .BR slice2py (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2cs.1 b/man/man1/slice2cs.1
index 1900d35a6da..bb44e0386aa 100644
--- a/man/man1/slice2cs.1
+++ b/man/man1/slice2cs.1
@@ -2,7 +2,7 @@
 
 .SH NAME
 
-slice2cs - The Slice to .NET C# compiler.
+slice2cs - The Slice to C# compiler.
 
 .SH SYNOPSIS
 
@@ -10,10 +10,12 @@ slice2cs [options] [files]
 
 .SH DESCRIPTION
 
-slice2cs compiles Slice files to .NET C#. Full documentation for slice2cs
-is available online at: 
+slice2cpp compiles Slice files to C#. The macro __SLICE2CS__
+is defined during this compilation.
+
+Full documentation for slice2cs is available online at:
 .br
-"https://doc.zeroc.com/display/Ice36/slice2cs+Command-Line+Options".
+https://doc.zeroc.com/display/Ice37/slice2cs+Command-Line+Options
 
 .SH OPTIONS
 
@@ -33,7 +35,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -62,15 +64,30 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
+.BR \-\-depend\fR
+.br
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
+
+.TP
+.BR \-\-depend\-xml\fR
 .br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
 
 .TP
-.BR \-\-underscore\fR
+.BR \-\-depend\-file " " FILE\fR
 .br
-Permit use of underscores in Slice identifiers.
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
+
+.TP
+.BR \-\-validate\fR
+.br
+Checks the provided command-line options for correctness, and does not
+generate any code.
 
 .TP
 .BR \-\-tie\fR
@@ -94,18 +111,13 @@ overwrite an existing file.
 .br
 Generate checksums for Slice definitions.
 
-.TP
-.BR \-\-stream\fR
-.br
-Generate streaming helper functions for Slice types.
 
 .SH SEE ALSO
 
 .BR slice2cpp (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
+.BR slice2js (1),
 .BR slice2php (1),
 .BR slice2py (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2html.1 b/man/man1/slice2html.1
index bf3cd78dff8..8308c0160c4 100644
--- a/man/man1/slice2html.1
+++ b/man/man1/slice2html.1
@@ -10,11 +10,12 @@ slice2html [options] [files]
 
 .SH DESCRIPTION
 
-slice2html generates HTML documentation from Slice files.
+slice2html generates HTML documentation from Slice files. The
+macro __SLICE2HTML__ is defined during this compilation.
 
 Full documentation for slice2html is available online at:
 .br
-"https://doc.zeroc.com/display/Ice37/Generating+Slice+Documentation".
+https://doc.zeroc.com/display/Ice37/Generating+Slice+Documentation
 
 .SH OPTIONS
 
@@ -34,7 +35,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -63,12 +64,6 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
-.br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
-
-.TP
 .BR \-\-hdr " " FILE\fR
 .br
 Prepend FILE to each generated HTML file (except for _sindex.html). This
@@ -100,8 +95,8 @@ with a <body> tag). The default value is the setting of --hdr (if any).
 .BR \-\-indexftr " " FILE\fR
 .br
 Append FILE to the generated sindex.html page. This allows you to add, for
-example, a custom footer to the table of contents, or to invoke a JavaScript. 
-FILE is must end with a </body> tag. The default value is the setting of 
+example, a custom footer to the table of contents, or to invoke a JavaScript.
+FILE is must end with a </body> tag. The default value is the setting of
 --ftr (if any).
 
 .TP
@@ -122,8 +117,8 @@ each page (if --image-dir is specified). The company logo is expected to be in
 .TP
 .BR \-\-search " " ACTION\fR
 .br
-If this option is specified, the generated pages contain a search box that 
-allows you to connect the generated pages to a search engine. On pressing 
+If this option is specified, the generated pages contain a search box that
+allows you to connect the generated pages to a search engine. On pressing
 the "Search" button, the specified ACTION is carried out.
 
 .TP
@@ -146,10 +141,8 @@ a warning.
 
 .BR slice2cpp (1),
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
-.BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
+.BR slice2js (1),
 .BR slice2php (1),
 .BR slice2py (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2java.1 b/man/man1/slice2java.1
index ce7079cf4cf..1d50c3cff13 100644
--- a/man/man1/slice2java.1
+++ b/man/man1/slice2java.1
@@ -10,10 +10,12 @@ slice2java [options] [files]
 
 .SH DESCRIPTION
 
-slice2java compiles Slice files to Java. Full documentation for slice2java is
-available online at:
+slice2java compiles Slice files to Java. The macro __SLICE2JAVA__
+is defined during this compilation.
+
+Full documentation for slice2java is available online at:
 .br
-"https://doc.zeroc.com/display/Ice37/slice2java+Command-Line+Options".
+https://doc.zeroc.com/display/Ice37/slice2java+Command-Line+Options
 
 .SH OPTIONS
 
@@ -33,7 +35,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -62,20 +64,43 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
+.BR \-\-depend\fR
+.br
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
+
+.TP
+.BR \-\-depend\-xml\fR
 .br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
 
 .TP
-.BR \-\-underscore\fR
+.BR \-\-depend\-file " " FILE\fR
 .br
-Permit use of underscores in Slice identifiers.
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
+
+.TP
+.BR \-\-validate\fR
+.br
+Checks the provided command-line options for correctness, and does not
+generate any code.
+
+.TP
+.BR \-\-compat\fR
+.br
+Generate code for the Java Compat mapping. When this option is specified, the
+macro __SLICE2JAVA_COMPAT__ is defined during the compilation. If this
+option is not specified, the default behavior is to generate code for the
+Java mapping.
 
 .TP
 .BR \-\-tie\fR
 .br
-Generate tie classes.
+Generate tie classes. (Java Compat only)
 
 .TP
 .BR \-\-impl\fR
@@ -87,7 +112,7 @@ existing file.
 .BR \-\-impl\-tie
 .br
 Generate sample implementation files using tie classes. This option will not
-overwrite an existing file.
+overwrite an existing file. (Java Compat only)
 
 .TP
 .BR \-\-checksum " " CLASS\fR
@@ -98,11 +123,6 @@ checksums for all of the Slice files being translated by this invocation of
 the compiler.
 
 .TP
-.BR \-\-stream\fR
-.br
-Generate streaming helper functions for Slice types.
-
-.TP
 .BR \-\-meta " " META\fR
 .br
 Define the global metadata directive META. Using this option is equivalent to
@@ -111,13 +131,17 @@ file included by a named Slice file. Global metadata specified with --meta
 overrides any corresponding global metadata directive in the files being
 compiled.
 
+.TP
+.BR \-\-list\-generated\fR
+.br
+Emit a list of generated files in XML format.
+
 .SH SEE ALSO
 
 .BR slice2cpp (1),
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
+.BR slice2js (1),
 .BR slice2php (1),
 .BR slice2py (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2js.1 b/man/man1/slice2js.1
index 07d0896fc34..b4316b9d6ad 100644
--- a/man/man1/slice2js.1
+++ b/man/man1/slice2js.1
@@ -2,7 +2,7 @@
 
 .SH NAME
 
-slice2js - The Slice to Javascript compiler.
+slice2js - The Slice to JavaScript compiler.
 
 .SH SYNOPSIS
 
@@ -10,11 +10,12 @@ slice2js [options] [files]
 
 .SH DESCRIPTION
 
-slice2js compiles Slice files to Javascript.
+slice2js compiles Slice files to JavaScript. The macro __SLICE2JS__
+is defined during this compilation.
 
 Full documentation for slice2js is available online at:
 .br
-"https://doc.zeroc.com/display/Ice37/slice2js+Command-Line+Options".
+https://doc.zeroc.com/display/Ice37/slice2js+Command-Line+Options
 
 .SH OPTIONS
 
@@ -34,7 +35,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -63,24 +64,49 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
+.BR \-\-depend\fR
+.br
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
+
+.TP
+.BR \-\-depend\-xml\fR
+.br
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
+
+.TP
+.BR \-\-depend\-file " " FILE\fR
+.br
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
+
+.TP
+.BR \-\-validate\fR
+.br
+Checks the provided command-line options for correctness, and does not
+generate any code.
+
+.TP
+.BR \-\-stdout\fR
 .br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
+Print generated code to standard output.
 
 .TP
-.BR \-\-underscore\fR
+.BR \-\-depend\-json\fR
 .br
-Permit use of underscores in Slice identifiers.
+Print dependency information in JSON format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
 
 .SH SEE ALSO
 
 .BR slice2cpp (1),
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
 .BR slice2php (1),
 .BR slice2py (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2objc.1 b/man/man1/slice2objc.1
index a2e0075711e..0af8456f826 100644
--- a/man/man1/slice2objc.1
+++ b/man/man1/slice2objc.1
@@ -10,11 +10,12 @@ slice2objc [options] [files]
 
 .SH DESCRIPTION
 
-slice2objc compiles Slice files to Objective-C.
+slice2objc compiles Slice files to Objective-C. The macro __SLICE2OBJC__
+is defined during this compilation.
 
 Full documentation for slice2objc is available online at:
 .br
-"https://doc.zeroc.com/display/Ice37/slice2objc+Command-Line+Options".
+https://doc.zeroc.com/display/Ice37/slice2objc+Command-Line+Options
 
 .SH OPTIONS
 
@@ -34,7 +35,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -63,35 +64,30 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
-.br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
-
-.TP
-.BR \-\-underscore\fR
+.BR \-\-depend\fR
 .br
-Permit use of underscores in Slice identifiers.
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
 
 .TP
-.BR \-\-header-ext " " EXT\fR
+.BR \-\-depend\-xml\fR
 .br
-Changes the file extension for the generated header files from the default h
-to EXT.
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
 
 .TP
-.BR \-\-source-ext " " EXT\fR
+.BR \-\-depend\-file " " FILE\fR
 .br
-Changes the file extension for the generated source files from the default
-m to EXT.
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
 
 .TP
-.BR \-\-add-header " " HDR[,GUARD]
+.BR \-\-validate\fR
 .br
-This option adds an include directive for the specified header at the
-beginning of the generated source file (preceding any other include
-directives). If GUARD is specified, the include directive is protected by the
-specified guard.
+Checks the provided command-line options for correctness, and does not
+generate any code.
 
 .TP
 .BR \-\-include-dir " " DIR\fR
@@ -99,29 +95,13 @@ specified guard.
 Modifies #include directives in source files to prepend the path name of each
 header file with the directory DIR.
 
-.TP
-.BR \-\-impl\fR
-.br
-Generate sample implementation files. This option will not overwrite an 
-existing file.
-
-.TP
-.BR \-\-depend\fR
-Prints makefile dependency information to standard output.
-
-.TP
-.BR \-\-checksum\fR
-.br
-Generate checksums for Slice definitions.
-
 .SH SEE ALSO
 
 .BR slice2cpp (1),
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
+.BR slice2js (1),
 .BR slice2php (1),
 .BR slice2py (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2php.1 b/man/man1/slice2php.1
index 06647be2225..79e6d917288 100644
--- a/man/man1/slice2php.1
+++ b/man/man1/slice2php.1
@@ -7,11 +7,12 @@ slice2php - The Slice to PHP compiler.
 slice2php [options] [files]
 
 .SH DESCRIPTION
-slice2php compiles Slice files to PHP.
+slice2php compiles Slice files to PHP. The macro __SLICE2PHP__
+is defined during this compilation.
 
 Full documentation for slice2php is available online at:
 .br
-"https://doc.zeroc.com/display/Ice37/slice2php+Command-Line+Options".
+https://doc.zeroc.com/display/Ice37/slice2php+Command-Line+Options
 
 .SH OPTIONS
 
@@ -31,7 +32,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -60,15 +61,30 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
+.BR \-\-depend\fR
+.br
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
+
+.TP
+.BR \-\-depend\-xml\fR
+.br
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
+
+.TP
+.BR \-\-depend\-file " " FILE\fR
 .br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
 
 .TP
-.BR \-\-underscore\fR
+.BR \-\-validate\fR
 .br
-Permit use of underscores in Slice identifiers.
+Checks the provided command-line options for correctness, and does not
+generate any code.
 
 .TP
 .BR \-\-all\fR
@@ -76,11 +92,9 @@ Permit use of underscores in Slice identifiers.
 Generate code for all Slice definitions, including those from included files.
 
 .TP
-.BR \-n ", " \-\-namespace\fR
+.BR \-\-no\-namespace\fR
 .br
-Generate code using PHP namespaces. Note that namespaces are only supported
-in PHP 5.3 or later. Also note that the Ice extension for PHP must be built
-with namespace support enabled.
+Generate code without support for PHP namespaces (deprecated).
 
 .TP
 .BR \-\-checksum " " CLASS\fR
@@ -91,9 +105,8 @@ Generate checksums for Slice definitions.
 
 .BR slice2cpp (1),
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
+.BR slice2js (1),
 .BR slice2py (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2py.1 b/man/man1/slice2py.1
index 5ce0bc6729f..7631276c7be 100644
--- a/man/man1/slice2py.1
+++ b/man/man1/slice2py.1
@@ -10,10 +10,12 @@ slice2py [options] [files]
 
 .SH DESCRIPTION
 
-slice2py compiles Slice files to Python.
+slice2py compiles Slice files to Python. The macro __SLICE2PY__
+is defined during this compilation.
 
-Full documentation for slice2py is available online at: 
-"https://doc.zeroc.com/display/Ice37/Code+Generation+in+Python".
+Full documentation for slice2py is available online at:
+.br
+https://doc.zeroc.com/display/Ice37/Code+Generation+in+Python
 
 .SH OPTIONS
 
@@ -33,7 +35,7 @@ Defines the preprocessor symbol NAME.
 
 .TP
 .BR \-DNAME=DEF\fR
-.br 
+.br
 Defines the preprocessor symbol NAME with the value DEF.
 
 .TP
@@ -62,15 +64,24 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
+.BR \-\-depend\fR
+.br
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
+
+.TP
+.BR \-\-depend\-xml\fR
 .br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
 
 .TP
-.BR \-\-underscore\fR
+.BR \-\-depend\-file " " FILE\fR
 .br
-Permit use of underscores in Slice identifiers.
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
 
 .TP
 .BR \-\-all\fR
@@ -91,9 +102,8 @@ Use PREFIX as the prefix for generated file names.
 
 .BR slice2cpp (1),
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
+.BR slice2js (1),
 .BR slice2php (1),
 .BR slice2rb (1)
diff --git a/man/man1/slice2rb.1 b/man/man1/slice2rb.1
index ec259248b19..245ed7847fd 100644
--- a/man/man1/slice2rb.1
+++ b/man/man1/slice2rb.1
@@ -10,10 +10,12 @@ slice2rb [options] [files]
 
 .SH DESCRIPTION
 
-slice2rb compiles Slice files to Ruby.
+slice2rb compiles Slice files to Ruby. The macro __SLICE2RB__ is defined
+during this compilation.
 
 Full documentation for slice2rb is available online at: 
-"https://doc.zeroc.com/display/Ice37/Code+Generation+in+Ruby".
+.br
+https://doc.zeroc.com/display/Ice37/Code+Generation+in+Ruby
 
 .SH OPTIONS
 
@@ -62,15 +64,24 @@ Place the generated files into directory DIR.
 Print debug information showing the operation of the Slice parser.
 
 .TP
-.BR \-\-ice\fR
+.BR \-\-depend\fR
+.br
+Print dependency information to standard output by default, or to the
+file specified by the --depend-file option. No code is generated when
+this option is specified.
+
+.TP
+.BR \-\-depend\-xml\fR
 .br
-Permit use of the normally reserved prefix Ice for identifiers. Use this
-option only when compiling the source code for the Ice run time.
+Print dependency information in XML format to standard output by default,
+or to the file specified by the --depend-file option. No code is generated
+when this option is specified.
 
 .TP
-.BR \-\-underscore\fR
+.BR \-\-depend\-file " " FILE\fR
 .br
-Permit use of underscores in Slice identifiers.
+Directs dependency information to the specified file. The output
+format depends on whether --depend or --depend-xml is also specified.
 
 .TP
 .BR \-\-all\fR
@@ -86,9 +97,8 @@ Generate checksums for Slice definitions.
 
 .BR slice2cpp (1),
 .BR slice2cs (1),
-.BR slice2freeze (1),
-.BR slice2freezej (1),
 .BR slice2html (1),
-.BR slice2java (1), 
+.BR slice2java (1),
+.BR slice2js (1),
 .BR slice2php (1),
 .BR slice2py (1)