One of the challenges with respect to, particularly, contemporary armed conflicts is that so few are between states. The vast majority of the treaty law is with respect to one state fighting another state. With respect, for instance, to the four Geneva conventions, and in particular Geneva Convention III that deals with POWs and Geneva Convention IV that deals with civilians, there's a set treaty regime. There's Common Article 3 to the four conventions, which will provide for non-international armed conflicts.
There is a treaty—Additional Protocol II to the Geneva conventions—that specifically deals with non-international armed conflict. In terms of customary international law, which relies that assessment on the treaties themselves, that sets a well-established and a high standard of treatment. Certainly the approach of the Canadian Forces is a matter of doctrine: to apply that high standard in terms of anyone they detain, and in that are standards of humanity and care in treating them.