@@ -89,25 +89,6 @@ func (cli *DockerCli) CmdHelp(args ...string) error {

 	return nil

 }

-// FIXME: 'insert' is deprecated.

-func (cli *DockerCli) CmdInsert(args ...string) error {

-	fmt.Fprintf(os.Stderr, "Warning: 'insert' is deprecated and will be removed in a future version. Please use 'docker build' and 'ADD' instead.\n")

-	cmd := cli.Subcmd("insert", "IMAGE URL PATH", "Insert a file from URL in the IMAGE at PATH")

-	if err := cmd.Parse(args); err != nil {

-		return nil

-	}

-	if cmd.NArg() != 3 {

-		cmd.Usage()

-		return nil

-	}

-

-	v := url.Values{}

-	v.Set("url", cmd.Arg(1))

-	v.Set("path", cmd.Arg(2))

-

-	return cli.stream("POST", "/images/"+cmd.Arg(0)+"/insert?"+v.Encode(), nil, cli.out, nil)

-}

-

 func (cli *DockerCli) CmdBuild(args ...string) error {

 	cmd := cli.Subcmd("build", "[OPTIONS] PATH | URL | -", "Build a new image from the source code at PATH")

 	tag := cmd.String([]string{"t", "-tag"}, "", "Repository name (and optionally a tag) to be applied to the resulting image in case of success")

@@ -309,14 +309,6 @@ _docker_info()

 	return

 }

-_docker_insert()

-{

-	local counter=$(__docker_pos_first_nonflag)

-	if [ $cword -eq $counter ]; then

-		__docker_image_repos_and_tags_and_ids

-	fi

-}

-

 _docker_inspect()

 {

 	case "$prev" in

@@ -120,10 +120,6 @@ complete -c docker -f -n '__fish_docker_no_subcommand' -a import -d 'Create a ne

 # info

 complete -c docker -f -n '__fish_docker_no_subcommand' -a info -d 'Display system-wide information'

-# insert

-complete -c docker -f -n '__fish_docker_no_subcommand' -a insert -d 'Insert a file in an image'

-complete -c docker -A -f -n '__fish_seen_subcommand_from insert' -a '(__fish_print_docker_images)' -d "Image"

-

 # inspect

 complete -c docker -f -n '__fish_docker_no_subcommand' -a inspect -d 'Return low-level information on a container'

 complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s f -l format -d 'Format the output using the given go template.'

@@ -139,11 +139,6 @@ __docker_subcommand () {

         (history)

             _arguments ':images:__docker_images'

             ;;

-        (insert)

-            _arguments '1:containers:__docker_containers' \

-                       '2:URL:(http:// file://)' \

-                       '3:file:_files'

-            ;;

         (kill)

             _arguments '*:containers:__docker_runningcontainers'

             ;;

@@ -117,7 +117,6 @@ func InitServer(job *engine.Job) engine.Status {

 	job.Eng.Hack_SetGlobalVar("httpapi.server", srv)

 	job.Eng.Hack_SetGlobalVar("httpapi.daemon", srv.daemon)

-	// FIXME: 'insert' is deprecated and should be removed in a future version.

 	for name, handler := range map[string]engine.Handler{

 		"export":           srv.ContainerExport,

 		"create":           srv.ContainerCreate,