27 files changed, 32 insertions, 26 deletions
diff --git a/distribution/bin/fixVersion.py b/distribution/bin/fixVersion.py
index d1bd4e2e9fe..8387845ba70 100755
--- a/distribution/bin/fixVersion.py
+++ b/distribution/bin/fixVersion.py
@@ -261,3 +261,9 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "eclipse", "java", "Slice2java
 # VS addin Ice.props
 FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "vsaddin", "config", "Ice.props"),
                             [("Ice\s" + FixUtil.vpatMatch, version)])
+
+
+# man pages
+for f in FixUtil.find(["*.1"]):
+    FixUtil.fileMatchAndReplace(f, [("/Ice([0-9]+[0-9]+)/", FixUtil.majorVersion(version) + FixUtil.minorVersion(version))], False)
+    
+\ No newline at end of file
diff --git a/man/man1/dumpdb.1 b/man/man1/dumpdb.1
index ce98c626465..b0b11aec9dc 100644
--- a/man/man1/dumpdb.1
+++ b/man/man1/dumpdb.1
@@ -17,7 +17,7 @@ that shares many of the same XML descriptors as transformdb, enabling
 sophisticated filtering and reporting. Full documentation for dumpdb is 
 available online at: 
 .br
-"https://doc.zeroc.com/display/Ice/Using+dumpdb".
+"https://doc.zeroc.com/display/Ice36/Using+dumpdb".
 
 .SH OPTIONS
 
diff --git a/man/man1/glacier2router.1 b/man/man1/glacier2router.1
index 9c669110d08..0419f6b593e 100644
--- a/man/man1/glacier2router.1
+++ b/man/man1/glacier2router.1
@@ -13,7 +13,7 @@ glacier2router [options]
 Glacier2 is a lightweight firewall traversal solution for Ice applications. 
 Full documentation for Glacier2 is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/Glacier2".
+"https://doc.zeroc.com/display/Ice36/Glacier2".
 
 .SH OPTIONS
 
diff --git a/man/man1/icebox.1 b/man/man1/icebox.1
index 8436863389c..7845cb3effa 100644
--- a/man/man1/icebox.1
+++ b/man/man1/icebox.1
@@ -12,7 +12,7 @@ icebox [options]
 IceBox is an easy-to-use framework for Ice application services. Full
 documentation for IceBox is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/IceBox".
+"https://doc.zeroc.com/display/Ice36/IceBox".
 
 .SH OPTIONS
 
diff --git a/man/man1/iceboxadmin.1 b/man/man1/iceboxadmin.1
index afa920147cf..8cfe84457ea 100644
--- a/man/man1/iceboxadmin.1
+++ b/man/man1/iceboxadmin.1
@@ -15,7 +15,7 @@ iceboxadmin [options] [command...]
 The IceBox administrative utility. Full documentation for iceboxadmin is
 available online at: 
 .br
-"https://doc.zeroc.com/display/Ice/IceBox+Administration".
+"https://doc.zeroc.com/display/Ice36/IceBox+Administration".
 
 .SH OPTIONS
 
diff --git a/man/man1/iceboxnet.1 b/man/man1/iceboxnet.1
index 92f79fc02fb..3ae85e71854 100644
--- a/man/man1/iceboxnet.1
+++ b/man/man1/iceboxnet.1
@@ -12,7 +12,7 @@ iceboxnet [options] --Ice.Config=<file>
 
 The IceBox .NET Server. For detailed usage consult:
 .br
-"https://doc.zeroc.com/display/Ice/Starting+the+IceBox+Server".
+"https://doc.zeroc.com/display/Ice36/Starting+the+IceBox+Server".
 
 .SH SEE ALSO
 
diff --git a/man/man1/iceca.1 b/man/man1/iceca.1
index b3b65a500ee..8a62382a478 100644
--- a/man/man1/iceca.1
+++ b/man/man1/iceca.1
@@ -11,4 +11,4 @@ iceca [--verbose --keep] import sign request init
 
 Full documentation for iceca is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/Setting+up+a+Certificate+Authority".
+"https://doc.zeroc.com/display/Ice36/Setting+up+a+Certificate+Authority".
diff --git a/man/man1/icegridadmin.1 b/man/man1/icegridadmin.1
index 1f219e0ccb0..4e04714d09c 100644
--- a/man/man1/icegridadmin.1
+++ b/man/man1/icegridadmin.1
@@ -15,7 +15,7 @@ domain. Deploying an application with this utility requires an XML file that
 defines the descriptors. Full documentation for icegridadmin is available 
 online at: 
 .br
-"https://doc.zeroc.com/display/Ice/icegridadmin+Command+Line+Tool".
+"https://doc.zeroc.com/display/Ice36/icegridadmin+Command+Line+Tool".
 
 .SH OPTIONS
 
diff --git a/man/man1/icegridnode.1 b/man/man1/icegridnode.1
index bf649b2f3ee..964a21a8ea6 100644
--- a/man/man1/icegridnode.1
+++ b/man/man1/icegridnode.1
@@ -19,7 +19,7 @@ executable. If you wish to run a registry and node in one process,
 icegridnode is the executable you must use. Full documentation for icegridnode
 is available online at: 
 .br
-"https://doc.zeroc.com/display/Ice/icegridnode".
+"https://doc.zeroc.com/display/Ice36/icegridnode".
 
 .SH OPTIONS
 
diff --git a/man/man1/icegridregistry.1 b/man/man1/icegridregistry.1
index 7ae714f9546..b30e4805399 100644
--- a/man/man1/icegridregistry.1
+++ b/man/man1/icegridregistry.1
@@ -17,7 +17,7 @@ convenient during development and testing. The registry server is implemented
 by the icegridregistry executable. Full documentation for icegridregistry is
 available online at: 
 .br
-"https://doc.zeroc.com/display/Ice/icegridregistry".
+"https://doc.zeroc.com/display/Ice36/icegridregistry".
 
 .SH OPTIONS
 
diff --git a/man/man1/icepatch2calc.1 b/man/man1/icepatch2calc.1
index ab09a9e39ff..8a374656da4 100644
--- a/man/man1/icepatch2calc.1
+++ b/man/man1/icepatch2calc.1
@@ -13,7 +13,7 @@ icepatch2calc [options] data_dir [file...]
 IcePatch2 tool to compress files and calculate checksums. Full documentation
 for icepatch2calc is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/Using+icepatch2calc".
+"https://doc.zeroc.com/display/Ice36/Using+icepatch2calc".
 
 .SH OPTIONS
 
diff --git a/man/man1/icepatch2client.1 b/man/man1/icepatch2client.1
index a2758345374..6cc504f2025 100644
--- a/man/man1/icepatch2client.1
+++ b/man/man1/icepatch2client.1
@@ -15,7 +15,7 @@ icepatch2client --IcePatch2Client.Proxy="IcePatch2Server/server:tcp -h somehost.
 The IcePatch2 client. Full documentation for icepatch2client is available
 online at:
 .br
-"https://doc.zeroc.com/display/Ice/Running+the+IcePatch2+Client".
+"https://doc.zeroc.com/display/Ice36/Running+the+IcePatch2+Client".
 
 .SH OPTIONS
 
diff --git a/man/man1/icepatch2server.1 b/man/man1/icepatch2server.1
index b3c877542e8..caaf5a221d6 100644
--- a/man/man1/icepatch2server.1
+++ b/man/man1/icepatch2server.1
@@ -13,7 +13,7 @@ icepatch2server <data directory>
 The IcePatch2 server. Full documentation for icepatch2server is available 
 online at:
 .br
-"https://doc.zeroc.com/display/Ice/Running+the+IcePatch2+Server".
+"https://doc.zeroc.com/display/Ice36/Running+the+IcePatch2+Server".
 
 .SH OPTIONS
 
diff --git a/man/man1/icestormadmin.1 b/man/man1/icestormadmin.1
index 1ed6d61ad8e..697b91733b6 100644
--- a/man/man1/icestormadmin.1
+++ b/man/man1/icestormadmin.1
@@ -16,7 +16,7 @@ The IceStorm administration tool is a command-line program that provides
 administrative control of an IceStorm server. Full documentation for
 icestormadmin is available online at: 
 .br
-"https://doc.zeroc.com/display/Ice/IceStorm+Administration".
+"https://doc.zeroc.com/display/Ice36/IceStorm+Administration".
 
 .SH OPTIONS
 
diff --git a/man/man1/icestormmigrate.1 b/man/man1/icestormmigrate.1
index 362d55028aa..6feaf8c5ad2 100644
--- a/man/man1/icestormmigrate.1
+++ b/man/man1/icestormmigrate.1
@@ -14,7 +14,7 @@ The icestormmigrate utility upgrades a 3.1 or 3.2 IceStorm database
 environment to a 3.3 or superior IceStorm database environment.
 For details about icestormmigrate consult:
 .br
-"https://doc.zeroc.com/display/Ice/Upgrading+your+Application+from+Ice+3.2+or+Earlier+Releases".
+"https://doc.zeroc.com/display/Ice36/Upgrading+your+Application+from+Ice+3.2+or+Earlier+Releases".
 
 .SH SEE ALSO
 
diff --git a/man/man1/slice2cpp.1 b/man/man1/slice2cpp.1
index ba41342c6a5..eb994d21915 100644
--- a/man/man1/slice2cpp.1
+++ b/man/man1/slice2cpp.1
@@ -14,7 +14,7 @@ slice2cpp compiles Slice files to C++.
 
 Full documentation for slice2cpp is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/slice2cpp+Command-Line+Options".
+"https://doc.zeroc.com/display/Ice36/slice2cpp+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2cs.1 b/man/man1/slice2cs.1
index 93f5d2a76fa..1900d35a6da 100644
--- a/man/man1/slice2cs.1
+++ b/man/man1/slice2cs.1
@@ -13,7 +13,7 @@ slice2cs [options] [files]
 slice2cs compiles Slice files to .NET C#. Full documentation for slice2cs
 is available online at: 
 .br
-"https://doc.zeroc.com/display/Ice/slice2cs+Command-Line+Options".
+"https://doc.zeroc.com/display/Ice36/slice2cs+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2freeze.1 b/man/man1/slice2freeze.1
index c449c72b741..43d1e592414 100644
--- a/man/man1/slice2freeze.1
+++ b/man/man1/slice2freeze.1
@@ -14,7 +14,7 @@ slice2freeze generates Freeze map and index classes in C++.
 
 Full documentation for slice2freeze is available online at: 
 .br
-"https://doc.zeroc.com/pages/viewpage.action?pageId=5048540".
+"https://doc.zeroc.com/display/Ice36/slice2freeze+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2freezej.1 b/man/man1/slice2freezej.1
index 025bf2e208f..5e7c6fb7eb6 100644
--- a/man/man1/slice2freezej.1
+++ b/man/man1/slice2freezej.1
@@ -14,7 +14,7 @@ slice2java generates Freeze map and index classes in Java.
 
 Full documentation for slice2freezej is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/Using+a+Freeze+Map+in+Java".
+"https://doc.zeroc.com/display/Ice36/slice2freezej+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2html.1 b/man/man1/slice2html.1
index c78648093d4..f134dd7dd9c 100644
--- a/man/man1/slice2html.1
+++ b/man/man1/slice2html.1
@@ -14,7 +14,7 @@ slice2html generates HTML documentation from Slice files.
 
 Full documentation for slice2html is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/Generating+Slice+Documentation".
+"https://doc.zeroc.com/display/Ice36/Generating+Slice+Documentation".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2java.1 b/man/man1/slice2java.1
index 9c184a445cc..0fb0f23bb97 100644
--- a/man/man1/slice2java.1
+++ b/man/man1/slice2java.1
@@ -13,7 +13,7 @@ slice2java [options] [files]
 slice2java compiles Slice files to Java. Full documentation for slice2java is
 available online at:
 .br
-"https://doc.zeroc.com/display/Ice/Using+the+Slice+Compiler+for+Java".
+"https://doc.zeroc.com/display/Ice36/slice2java+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2js.1 b/man/man1/slice2js.1
index c802e9a677b..b19063d81a3 100644
--- a/man/man1/slice2js.1
+++ b/man/man1/slice2js.1
@@ -14,7 +14,7 @@ slice2js compiles Slice files to Javascript.
 
 Full documentation for slice2js is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/slice2js+Command-Line+Options".
+"https://doc.zeroc.com/display/Ice36/slice2js+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2objc.1 b/man/man1/slice2objc.1
index 5ee0c36e5eb..9fb6baeea86 100644
--- a/man/man1/slice2objc.1
+++ b/man/man1/slice2objc.1
@@ -14,7 +14,7 @@ slice2objc compiles Slice files to Objective-C.
 
 Full documentation for slice2objc is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/slice2objc+Command-Line+Options".
+"https://doc.zeroc.com/display/Ice36/slice2objc+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2php.1 b/man/man1/slice2php.1
index 42542ac9ec4..5a9c47d06c9 100644
--- a/man/man1/slice2php.1
+++ b/man/man1/slice2php.1
@@ -11,7 +11,7 @@ slice2php compiles Slice files to PHP.
 
 Full documentation for slice2php is available online at:
 .br
-"https://doc.zeroc.com/display/Ice/slice2php+Command-Line+Options".
+"https://doc.zeroc.com/display/Ice36/slice2php+Command-Line+Options".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2py.1 b/man/man1/slice2py.1
index ce0c86a24d0..a68a99ad6ca 100644
--- a/man/man1/slice2py.1
+++ b/man/man1/slice2py.1
@@ -13,7 +13,7 @@ slice2py [options] [files]
 slice2py compiles Slice files to Python.
 
 Full documentation for slice2py is available online at: 
-"https://doc.zeroc.com/display/Ice/Code+Generation+in+Python".
+"https://doc.zeroc.com/display/Ice36/Code+Generation+in+Python".
 
 .SH OPTIONS
 
diff --git a/man/man1/slice2rb.1 b/man/man1/slice2rb.1
index cd2b84ba902..9ea7a980814 100644
--- a/man/man1/slice2rb.1
+++ b/man/man1/slice2rb.1
@@ -13,7 +13,7 @@ slice2rb [options] [files]
 slice2rb compiles Slice files to Ruby.
 
 Full documentation for slice2rb is available online at: 
-"https://doc.zeroc.com/display/Ice/Code+Generation+in+Ruby".
+"https://doc.zeroc.com/display/Ice36/Code+Generation+in+Ruby".
 
 .SH OPTIONS
 
diff --git a/man/man1/transformdb.1 b/man/man1/transformdb.1
index 502ff8209e1..6900346f6a1 100644
--- a/man/man1/transformdb.1
+++ b/man/man1/transformdb.1
@@ -37,7 +37,7 @@ or evictor. It accomplishes this by comparing the "old" Slice definitions
 ensure that the transformed database is compatible with the new definitions.
 Full documentation for transformdb is available online at: 
 .br
-"https://doc.zeroc.com/display/Ice/Using+transformdb".
+"https://doc.zeroc.com/display/Ice36/Using+transformdb".
 
 .SH OPTIONS