diff --git a/docs/manual/CoreTasks/conditions.html b/docs/manual/CoreTasks/conditions.html index ac66f63cc..059dc44a1 100644 --- a/docs/manual/CoreTasks/conditions.html +++ b/docs/manual/CoreTasks/conditions.html @@ -114,7 +114,7 @@ the tests succeed.
  • os/2 (for OS/2)
  • tandem (for HP's NonStop Kernel - formerly Tandem)
  • win9x for Microsoft Windows 95 and 98, ME and CE
  • -
  • nt for Microsoft Windows NT-based systems, including Windows 2000, XP and +
  • winnt for Microsoft Windows NT-based systems, including Windows 2000, XP and successors
  • z/os for z/OS and OS/390
  • os/400 for OS/400
  • diff --git a/src/etc/testcases/taskdefs/exec/exec.xml b/src/etc/testcases/taskdefs/exec/exec.xml index 3255c7396..c7c3eb78d 100644 --- a/src/etc/testcases/taskdefs/exec/exec.xml +++ b/src/etc/testcases/taskdefs/exec/exec.xml @@ -344,7 +344,7 @@ + osFamily="winnt"> diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java index de3fa67c8..4ec31981d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -63,7 +63,7 @@ public class Os implements Condition { /** * OS family that can be tested for. {@value} */ - public static final String FAMILY_NT = "nt"; + public static final String FAMILY_NT = "winnt"; /** * OS family that can be tested for. {@value} */